rtang/FSUDAQ_Qt6
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

added green color for active tab in DigiPanel; bug fix;

Browse Source
This commit is contained in:
carina@hades 2024-02-20 14:23:29 -05:00
parent ccfe99fb02
commit c6eabca9d1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DigiSettingsPanel.cpp
View File

@ -43,6 +43,9 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer ** digi, unsigned int nDigi, QStr
tabWidget = new QTabWidget(this); tabWidget = new QTabWidget(this);
setCentralWidget(tabWidget); setCentralWidget(tabWidget);
tabWidget->tabBar()->setStyleSheet("QTabBar::tab::selected {background-color: #00c110}");
//@===================================== tab //@===================================== tab
for( unsigned int iDigi = 0 ; iDigi < this->nDigi; iDigi ++ ){ for( unsigned int iDigi = 0 ; iDigi < this->nDigi; iDigi ++ ){
@ -317,6 +320,7 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer ** digi, unsigned int nDigi, QStr
ID = index; ID = index;
//if( digi[ID]->GetDPPType() == V1730_DPP_PHA_CODE ) UpdatePanelFromMemory(); //if( digi[ID]->GetDPPType() == V1730_DPP_PHA_CODE ) UpdatePanelFromMemory();
UpdatePanelFromMemory(); UpdatePanelFromMemory();
} }
}); });
@ -3557,7 +3561,7 @@ void DigiSettingsPanel::SyncAllChannelsTab_PHA(){
SyncSpinBox(sbTrapScaling); SyncSpinBox(sbTrapScaling);
SyncSpinBox(sbPeaking); SyncSpinBox(sbPeaking);
SyncSpinBox(sbPeakingHoldOff); SyncSpinBox(sbPeakingHoldOff);
SyncSpinBox(sbFineGain); // SyncSpinBox(sbFineGain);
SyncSpinBox(sbNumEventAgg); SyncSpinBox(sbNumEventAgg);
SyncSpinBox(sbVetoWidth); SyncSpinBox(sbVetoWidth);
@ -3608,7 +3612,7 @@ void DigiSettingsPanel::UpdateSettings_PHA(){
UpdateSpinBox(sbTrapScaling[ID][ch], DPP::PHA::DPPAlgorithmControl2_G, ch); UpdateSpinBox(sbTrapScaling[ID][ch], DPP::PHA::DPPAlgorithmControl2_G, ch);
UpdateSpinBox(sbPeaking[ID][ch], DPP::PHA::PeakingTime, ch); UpdateSpinBox(sbPeaking[ID][ch], DPP::PHA::PeakingTime, ch);
UpdateSpinBox(sbPeakingHoldOff[ID][ch], DPP::PHA::PeakHoldOff, ch); UpdateSpinBox(sbPeakingHoldOff[ID][ch], DPP::PHA::PeakHoldOff, ch);
UpdateSpinBox(sbFineGain[ID][ch], DPP::PHA::FineGain, ch); // UpdateSpinBox(sbFineGain[ID][ch], DPP::PHA::FineGain, ch);
UpdateSpinBox(sbNumEventAgg[ID][ch], DPP::NumberEventsPerAggregate_G, ch); UpdateSpinBox(sbNumEventAgg[ID][ch], DPP::NumberEventsPerAggregate_G, ch);
UpdateSpinBox(sbVetoWidth[ID][ch], DPP::VetoWidth, ch); UpdateSpinBox(sbVetoWidth[ID][ch], DPP::VetoWidth, ch);

2
DigiSettingsPanel.h
View File

@ -229,7 +229,7 @@ private:
RComboBox * cbPeakAvg[MaxNDigitizer][MaxRegChannel + 1]; RComboBox * cbPeakAvg[MaxNDigitizer][MaxRegChannel + 1];
QCheckBox * chkActiveBaseline[MaxNDigitizer][MaxRegChannel + 1]; QCheckBox * chkActiveBaseline[MaxNDigitizer][MaxRegChannel + 1];
QCheckBox * chkBaselineRestore[MaxNDigitizer][MaxRegChannel + 1]; QCheckBox * chkBaselineRestore[MaxNDigitizer][MaxRegChannel + 1];
RSpinBox * sbFineGain[MaxNDigitizer][MaxRegChannel + 1]; // RSpinBox * sbFineGain[MaxNDigitizer][MaxRegChannel + 1];
QCheckBox * chkEnableRollOver[MaxNDigitizer][MaxRegChannel + 1]; QCheckBox * chkEnableRollOver[MaxNDigitizer][MaxRegChannel + 1];
QCheckBox * chkEnablePileUp[MaxNDigitizer][MaxRegChannel + 1]; QCheckBox * chkEnablePileUp[MaxNDigitizer][MaxRegChannel + 1];