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

fix display for 32 channels model on the scaler

Browse Source
This commit is contained in:
Ryan@fischam 2025-05-06 11:33:27 -05:00
parent bc73eaa91d
commit 8dd9023b68
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mainwindow.cpp
View File

@ -736,6 +736,8 @@ void MainWindow::OpenDigitizers(){
nDigiConnected ++; nDigiConnected ++;
if( maxNumChannelAcrossDigitizer < digi[i]->GetNChannels()) maxNumChannelAcrossDigitizer = digi[i]->GetNChannels();
for( int ch = 0; ch < (int) digi[i]->GetNChannels(); ch++) { for( int ch = 0; ch < (int) digi[i]->GetNChannels(); ch++) {
oldTimeStamp[i][ch] = 0; oldTimeStamp[i][ch] = 0;
oldSavedCount[i][ch] = 0; oldSavedCount[i][ch] = 0;
@ -1145,7 +1147,7 @@ void MainWindow::OpenScaler(){
void MainWindow::SetUpScalar(){ 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 = new QLabel("Last update : ", scalar);
lbLastUpdateTime->setAlignment(Qt::AlignCenter); lbLastUpdateTime->setAlignment(Qt::AlignCenter);
@ -1163,7 +1165,8 @@ void MainWindow::SetUpScalar(){
///==== create the 1st row ///==== create the 1st row
int rowID = 5; int rowID = 5;
for( int ch = 0; ch < MaxNumberOfChannel; ch++){
for( int ch = 0; ch < maxNumChannelAcrossDigitizer; ch++){
if( ch == 0 ){ if( ch == 0 ){
QLabel * lbCH_H = new QLabel("Ch", scalar); QLabel * lbCH_H = new QLabel("Ch", scalar);

1
mainwindow.h
View File

@ -98,6 +98,7 @@ private:
static Digitizer2Gen ** digi; static Digitizer2Gen ** digi;
unsigned short nDigi; unsigned short nDigi;
unsigned short nDigiConnected = 0; unsigned short nDigiConnected = 0;
int maxNumChannelAcrossDigitizer = 0;
//@----- log msg //@----- log msg
QPlainTextEdit * logInfo; QPlainTextEdit * logInfo;