diff --git a/mainwindow.cpp b/mainwindow.cpp index 9560e94..fe3b10d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -736,6 +736,8 @@ void MainWindow::OpenDigitizers(){ nDigiConnected ++; + if( maxNumChannelAcrossDigitizer < digi[i]->GetNChannels()) maxNumChannelAcrossDigitizer = digi[i]->GetNChannels(); + for( int ch = 0; ch < (int) digi[i]->GetNChannels(); ch++) { oldTimeStamp[i][ch] = 0; oldSavedCount[i][ch] = 0; @@ -1145,7 +1147,7 @@ void MainWindow::OpenScaler(){ void MainWindow::SetUpScalar(){ - scalar->setGeometry(0, 0, 10 + nDigi * 230, 1500); + scalar->setGeometry(0, 0, 10 + nDigi * 230, (maxNumChannelAcrossDigitizer + 5) * 26 ); lbLastUpdateTime = new QLabel("Last update : ", scalar); lbLastUpdateTime->setAlignment(Qt::AlignCenter); @@ -1163,7 +1165,8 @@ void MainWindow::SetUpScalar(){ ///==== create the 1st row int rowID = 5; - for( int ch = 0; ch < MaxNumberOfChannel; ch++){ + + for( int ch = 0; ch < maxNumChannelAcrossDigitizer; ch++){ if( ch == 0 ){ QLabel * lbCH_H = new QLabel("Ch", scalar); diff --git a/mainwindow.h b/mainwindow.h index 5724e4a..715f4c3 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -98,6 +98,7 @@ private: static Digitizer2Gen ** digi; unsigned short nDigi; unsigned short nDigiConnected = 0; + int maxNumChannelAcrossDigitizer = 0; //@----- log msg QPlainTextEdit * logInfo;