eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bug fix with the clip LED

Browse source
This commit is contained in:
Volker Fischer 2020-06-22 18:31:30 +02:00
parent 96f6eff92b
commit 992875e9ad
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/levelmeter.cpp
View file

@ -54,7 +54,7 @@ CLevelMeter::CLevelMeter ( QWidget* parent, Qt::WindowFlags f ) :
pLEDLayout->addStretch(); pLEDLayout->addStretch();
} }
pLEDLayout->addWidget ( vecpLEDs[iLEDIdx]->getLabelPointer() ); pLEDLayout->addWidget ( vecpLEDs[iLEDIdx]->GetLabelPointer() );
} }
// initialize bar meter // initialize bar meter
@ -119,7 +119,7 @@ void CLevelMeter::SetLevelMeterType ( const ELevelMeterType eNType )
// set all LEDs to disabled, otherwise we would not get our desired small width // set all LEDs to disabled, otherwise we would not get our desired small width
for ( int iLEDIdx = 0; iLEDIdx < NUM_LEDS_INCL_CLIP_LED; iLEDIdx++ ) for ( int iLEDIdx = 0; iLEDIdx < NUM_LEDS_INCL_CLIP_LED; iLEDIdx++ )
{ {
vecpLEDs[iLEDIdx]->setColor ( cLED::RL_DISABLED ); vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_DISABLED );
} }
pStackedLayout->setCurrentIndex ( 1 ); pStackedLayout->setCurrentIndex ( 1 );
@ -150,35 +150,39 @@ void CLevelMeter::SetValue ( const double dValue )
if ( iLEDIdx < YELLOW_BOUND_LED_BAR ) if ( iLEDIdx < YELLOW_BOUND_LED_BAR )
{ {
// green region // green region
vecpLEDs[iLEDIdx]->setColor ( cLED::RL_GREEN ); vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_GREEN );
} }
else else
{ {
if ( iLEDIdx < RED_BOUND_LED_BAR ) if ( iLEDIdx < RED_BOUND_LED_BAR )
{ {
// yellow region // yellow region
vecpLEDs[iLEDIdx]->setColor ( cLED::RL_YELLOW ); vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_YELLOW );
} }
else else
{ {
// red region // red region
vecpLEDs[iLEDIdx]->setColor ( cLED::RL_RED ); vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_RED );
} }
} }
} }
else else
{ {
// we use grey LED for inactive state // we use black LED for inactive state
vecpLEDs[iLEDIdx]->setColor ( cLED::RL_BLACK ); vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_BLACK );
} }
} }
// clip LED management // clip LED management
if ( dValue > LEV_METER_CLIP_LIMIT_RATIO * NUM_STEPS_LED_BAR) if ( dValue > LEV_METER_CLIP_LIMIT_RATIO * NUM_STEPS_LED_BAR)
{ {
vecpLEDs[NUM_STEPS_LED_BAR]->setColor ( cLED::RL_RED ); vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_RED );
TimerClip.start(); TimerClip.start();
} }
else if ( vecpLEDs[NUM_STEPS_LED_BAR]->GetColor() != cLED::RL_RED )
{
vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_BLACK );
}
break; break;
case MT_BAR: case MT_BAR:
@ -193,7 +197,7 @@ void CLevelMeter::ClipReset()
{ {
if ( eLevelMeterType == MT_LED ) if ( eLevelMeterType == MT_LED )
{ {
vecpLEDs[NUM_STEPS_LED_BAR]->setColor ( cLED::RL_BLACK ); vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_BLACK );
} }
} }
@ -212,7 +216,7 @@ CLevelMeter::cLED::cLED ( QWidget* parent ) :
eCurLightColor = RL_BLACK; eCurLightColor = RL_BLACK;
} }
void CLevelMeter::cLED::setColor ( const ELightColor eNewColor ) void CLevelMeter::cLED::SetColor ( const ELightColor eNewColor )
{ {
// only update LED if color has changed // only update LED if color has changed
if ( eNewColor != eCurLightColor ) if ( eNewColor != eCurLightColor )

6
src/levelmeter.h
View file

@ -73,8 +73,10 @@ protected:
}; };
cLED ( QWidget* parent ); cLED ( QWidget* parent );
void setColor ( const ELightColor eNewColor );
QLabel* getLabelPointer() { return pLEDLabel; } void SetColor ( const ELightColor eNewColor );
ELightColor GetColor() { return eCurLightColor; };
QLabel* GetLabelPointer() { return pLEDLabel; }
protected: protected:
QPixmap BitmCubeRoundBlack; QPixmap BitmCubeRoundBlack;