- cleaned up

- removed Timer

git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@109 b431acfa-c32f-4a4a-93f1-934dc6c82436

Source/ControlComponent.cpp

@@ -668,8 +668,6 @@ ControlComponent::ControlComponent (ReceiverInterface *pReceiverControlListener,
 
 
     //[Constructor] You can add your own custom stuff here..
-	startTimer (1000 / 1);
-
 	addChangeListener(this);
 
 	// Texteditor Listeners
@@ -1451,11 +1449,6 @@ void ControlComponent::mouseDown (const MouseEvent& e)
 
 
 //[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
-void ControlComponent::timerCallback()
-{
-	receiverStatusChanged(m_pReceiverControlListener);
-}
-
 void ControlComponent::textEditorTextChanged (TextEditor &textEditor)
 {
 	m_userParamEntryinProgress = textEditor.isTextInputActive();
@@ -1679,7 +1672,7 @@ void ControlComponent::changeListenerCallback(juce::ChangeBroadcaster* source)
 BEGIN_JUCER_METADATA
 
 <JUCER_COMPONENT documentType="Component" className="ControlComponent" componentName=""
-                 parentClasses="public Component, public TextEditor::Listener, public ChangeBroadcaster, public ChangeListener, public ButtonListener, public ReceiverStatusListener, public Timer"
+                 parentClasses="public Component, public TextEditor::Listener, public ChangeBroadcaster, public ChangeListener, public ButtonListener, public ReceiverStatusListener"
                  constructorParams="ReceiverInterface *pReceiverControlListener, TransmitterInterface *pTransmitterControlListener"
                  variableInitialisers="m_pReceiverControlListener(pReceiverControlListener),  m_pTransmitterControlListener(pTransmitterControlListener)"
                  snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"

Source/ControlComponent.h

@@ -42,7 +42,6 @@ class ControlComponent  : public Component,
                           public ChangeListener,
                           public ButtonListener,
                           public ReceiverStatusListener,
-                          public Timer,
                           public SliderListener,
                           public ComboBoxListener
 {
@@ -78,7 +77,6 @@ private:
 	void textEditorReturnKeyPressed (TextEditor &textEditor);
 	bool m_userParamEntryinProgress;
 	ScopedPointer<TooltipWindow> m_tooltipWindow;
-	void timerCallback();
     //[/UserVariables]
 
     //==============================================================================

Source/IQPlaneComponent.cpp

@@ -19,7 +19,7 @@
 
 //[Headers] You can add your own extra header files here...
 //[/Headers]
-#include <cmath>
+
 #include "IQPlaneComponent.h"
 
 
@@ -123,7 +123,6 @@ void IQPlaneComponent::receiverStatusChanged(ReceiverInterface *pReceiver)
 	params = pReceiver->getParams();
 
 	m_numConst = (uint32_t)pow(2.0, params.numBitsPerSymbol);
-	repaint();
 }
 
 void IQPlaneComponent::trackerPointEnable(uint32_t id, juce::Colour color, cpx_t pos, float size)

Source/IQPoint.cpp

@@ -94,43 +94,12 @@ void IQPoint::drawPlusSign(Graphics& g)
 	(void)g;
 }
 
-void IQPoint::start()
-{
-	m_alpha = 1.0f;
-	startTimer (1000 / 20);
-	setVisible(true);
-    repaint();
-}
-
-void IQPoint::stop()
-{
-	stopTimer ();
-	setVisible(false);
-	m_alpha = 1.0f;
-    repaint();
-}
-
 void IQPoint::setColor(Colour color)
 {
 	m_color = color;
     repaint();
 }
 
-void IQPoint::timerCallback()
-{
-    // Reduce the alpha level of the flash slightly so it fades out
-    m_alpha -= 0.06f*m_alpha;
-
-    if (m_alpha < 0.05f)
-    {
-		stop();
-		sendChangeMessage();
-        // Once we've finsihed flashing send a change message to trigger the next component to flash
-    }
-
-    repaint();
-}
-
 //[/MiscUserCode]
 
 
@@ -144,10 +113,10 @@ void IQPoint::timerCallback()
 BEGIN_JUCER_METADATA
 
 <JUCER_COMPONENT documentType="Component" className="IQPoint" componentName=""
-                 parentClasses="public Component, public ChangeBroadcaster, public Timer"
+                 parentClasses="public Component" constructorParams="uint32 id"
-                 constructorParams="uint32 id" variableInitialisers="m_id(id)"
+                 variableInitialisers="m_id(id)" snapPixels="8" snapActive="1"
-                 snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
+                 snapShown="1" overlayOpacity="0.330" fixedSize="0" initialWidth="10"
-                 fixedSize="0" initialWidth="10" initialHeight="10">
+                 initialHeight="10">
   <BACKGROUND backgroundColour="ffffff"/>
 </JUCER_COMPONENT>
 

Source/IQPoint.h

@@ -34,9 +34,7 @@
     Describe your class and how it works here!
                                                                     //[/Comments]
 */
-class IQPoint  : public Component,
+class IQPoint  : public Component
-                 public ChangeBroadcaster,
-                 public Timer
 {
 public:
     //==============================================================================
@@ -47,8 +45,6 @@ public:
     //[UserMethods]     -- You can add your own custom methods in this section.
 	LinkedListPointer<IQPoint> nextListItem;
 
-	void start();
-	void stop();
 	void setColor(Colour color);
 	void drawCross(Graphics& g);
     //[/UserMethods]
@@ -64,7 +60,6 @@ private:
 	Colour m_color;
 	int m_pos_x;
 	int m_pos_y;
-	void timerCallback() override;
 	float m_alpha;
 	void drawPoint(Graphics& g);
 	void drawPlusSign(Graphics& g);