speed optimization

src/multicolorled.h

@@ -60,7 +60,7 @@ public:
     void SetLight ( const int iNewStatus );
 
 protected:
-    enum ELightColor { RL_GREY, RL_RED, RL_GREEN, RL_YELLOW };
+    enum ELightColor { RL_GREY, RL_GREEN, RL_YELLOW, RL_RED };
     ELightColor eColorFlag;
 
     void UpdateColor();

src/multicolorledbar.cpp

@@ -30,11 +30,7 @@
 
 /* Implementation *************************************************************/
 CMultiColorLEDBar::CMultiColorLEDBar ( QWidget* parent, Qt::WindowFlags f )
-    : QFrame ( parent, f ),
+    : QFrame ( parent, f )
-    BitmCubeRoundGrey   ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDGreySmall.png" ) ),
-    BitmCubeRoundGreen  ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDGreenSmall.png" ) ),
-    BitmCubeRoundYellow ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDYellowSmall.png" ) ),
-    BitmCubeRoundRed    ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDRedSmall.png" ) )
 {
     // set total number of LEDs
     iNumLEDs = NUM_STEPS_INP_LEV_METER;
@@ -47,65 +43,103 @@ CMultiColorLEDBar::CMultiColorLEDBar ( QWidget* parent, Qt::WindowFlags f )
 
     // create LEDs
     vecpLEDs.Init ( iNumLEDs );
-    for ( int i = 0; i < iNumLEDs; i++ )
+    for ( int iLEDIdx = 0; iLEDIdx < iNumLEDs; iLEDIdx++ )
     {
-        // create LED label
+        // create LED object
-        vecpLEDs[i] = new QLabel ( "", parent );
+        vecpLEDs[iLEDIdx] = new cLED ( parent );
 
         // add LED to layout with spacer
         pMainLayout->addStretch();
-        pMainLayout->addWidget ( vecpLEDs[i] );
+        pMainLayout->addWidget ( vecpLEDs[iLEDIdx]->getLabelPointer() );
+    }
+}
 
-        // set initial bitmap
+CMultiColorLEDBar::~CMultiColorLEDBar()
-        vecpLEDs[i]->setPixmap ( BitmCubeRoundGrey );
+{
-
+    // clean up the LED objects
-        // bitmap defines minimum size of the label
+    for ( int iLEDIdx = 0; iLEDIdx < iNumLEDs; iLEDIdx++ )
-        vecpLEDs[i]->setMinimumSize (
+    {
-            BitmCubeRoundGrey.width(), BitmCubeRoundGrey.height() );
+        delete vecpLEDs[iLEDIdx];
     }
 }
 
 void CMultiColorLEDBar::setValue ( const int value )
 {
-
-// TODO speed optimiation: only change bitmaps of LEDs which
-// actually have to be changed
-
     // update state of all LEDs for current level value
-    for ( int i = 0; i < iNumLEDs; i++ )
+    for ( int iLEDIdx = 0; iLEDIdx < iNumLEDs; iLEDIdx++ )
     {
-        // set active if value is above current LED index
+        // set active LED color if value is above current LED index
-        SetLED ( i, i < value );
+        if ( iLEDIdx < value )
-    }
-}
-
-void CMultiColorLEDBar::SetLED ( const int iLEDIdx, const bool bActive )
-{
-    if ( bActive )
-    {
-        // check which color we should use (green, yellow or red)
-        if ( iLEDIdx < YELLOW_BOUND_INP_LEV_METER )
         {
-            // green region
+            // check which color we should use (green, yellow or red)
-            vecpLEDs[iLEDIdx]->setPixmap ( BitmCubeRoundGreen );
+            if ( iLEDIdx < YELLOW_BOUND_INP_LEV_METER )
-        }
-        else
-        {
-            if ( iLEDIdx < RED_BOUND_INP_LEV_METER )
             {
-                // yellow region
+                // green region
-                vecpLEDs[iLEDIdx]->setPixmap ( BitmCubeRoundYellow );
+                vecpLEDs[iLEDIdx]->setColor ( cLED::RL_GREEN );
             }
             else
             {
-                // red region
+                if ( iLEDIdx < RED_BOUND_INP_LEV_METER )
-                vecpLEDs[iLEDIdx]->setPixmap ( BitmCubeRoundRed );
+                {
+                    // yellow region
+                    vecpLEDs[iLEDIdx]->setColor ( cLED::RL_YELLOW );
+                }
+                else
+                {
+                    // red region
+                    vecpLEDs[iLEDIdx]->setColor ( cLED::RL_RED );
+                }
             }
         }
-    }
+        else
-    else
+        {
-    {
+            // we use grey LED for inactive state
-        // we use grey LED for inactive state
+            vecpLEDs[iLEDIdx]->setColor ( cLED::RL_GREY );
-        vecpLEDs[iLEDIdx]->setPixmap ( BitmCubeRoundGrey );
+        }
+    }
+}
+
+CMultiColorLEDBar::cLED::cLED ( QWidget* parent ) :
+    BitmCubeRoundGrey   ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDGreySmall.png" ) ),
+    BitmCubeRoundGreen  ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDGreenSmall.png" ) ),
+    BitmCubeRoundYellow ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDYellowSmall.png" ) ),
+    BitmCubeRoundRed    ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDRedSmall.png" ) )
+{
+    // create LED label
+    pLEDLabel = new QLabel ( "", parent );
+
+    // bitmap defines minimum size of the label
+    pLEDLabel->setMinimumSize (
+        BitmCubeRoundGrey.width(), BitmCubeRoundGrey.height() );
+
+    // set initial bitmap
+    pLEDLabel->setPixmap ( BitmCubeRoundGrey );
+    eCurLightColor = RL_GREY;
+}
+
+void CMultiColorLEDBar::cLED::setColor ( const ELightColor eNewColor )
+{
+    // only update LED if color has changed
+    if ( eNewColor != eCurLightColor )
+    {
+        switch ( eNewColor )
+        {
+        case RL_GREY:
+            pLEDLabel->setPixmap ( BitmCubeRoundGrey );
+            break;
+
+        case RL_GREEN:
+            pLEDLabel->setPixmap ( BitmCubeRoundGreen );
+            break;
+
+        case RL_YELLOW:
+            pLEDLabel->setPixmap ( BitmCubeRoundYellow );
+            break;
+
+        case RL_RED:
+            pLEDLabel->setPixmap ( BitmCubeRoundRed );
+            break;
+        }
+        eCurLightColor = eNewColor;
     }
 }

src/multicolorledbar.h

@@ -40,21 +40,34 @@ class CMultiColorLEDBar : public QFrame
 
 public:
     CMultiColorLEDBar ( QWidget* parent = 0, Qt::WindowFlags f = 0 );
+    virtual ~CMultiColorLEDBar();
 
     void setValue ( const int value );
 
 protected:
-    void SetLED ( const int iLEDIdx, const bool bActive = true );
+    class cLED
+    {
+    public:
+        enum ELightColor { RL_GREY, RL_GREEN, RL_YELLOW, RL_RED };
 
-    QPixmap          BitmCubeRoundGrey;
+        cLED ( QWidget* parent );
-    QPixmap          BitmCubeRoundGreen;
+        void setColor ( const ELightColor eNewColor );
-    QPixmap          BitmCubeRoundYellow;
+        QLabel* getLabelPointer() { return pLEDLabel; }
-    QPixmap          BitmCubeRoundRed;
+
+    protected:
+        QPixmap     BitmCubeRoundGrey;
+        QPixmap     BitmCubeRoundGreen;
+        QPixmap     BitmCubeRoundYellow;
+        QPixmap     BitmCubeRoundRed;
+
+        ELightColor eCurLightColor;
+        QLabel*     pLEDLabel;
+    };
 
     QHBoxLayout*     pMainLayout;
 
     int              iNumLEDs;
-    CVector<QLabel*> vecpLEDs;
+    CVector<cLED*>   vecpLEDs;
 };
 
 #endif // _MULTCOLORLEDBAR_H__FD6B49B5_87DF_48DD_E1606C2AC__INCLUDED_