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

add ACQ on off status in scalar

Browse Source
This commit is contained in:
Ryan Tang 2023-02-22 12:48:54 -05:00
parent 848aef2b73
commit 08dd0cb4f4
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mainwindow.cpp
View File

@ -340,6 +340,7 @@ void MainWindow::StartACQ(){
} }
if( !scalar->isVisible() ) scalar->show(); if( !scalar->isVisible() ) scalar->show();
lbScalarACQStatus->setText("<font style=\"color: green;\"><b>ACQ On</b></font>");
scalarThread->start(); scalarThread->start();
bnStartACQ->setEnabled(false); bnStartACQ->setEnabled(false);
@ -433,6 +434,9 @@ void MainWindow::StopACQ(){
+ "======================"; + "======================";
AppendElog(msg, chromeWindowID); AppendElog(msg, chromeWindowID);
} }
lbScalarACQStatus->setText("<font style=\"color: red;\"><b>ACQ Off</b></font>");
//if( scalarThread->isRunning()) printf("Scalar Thread still running.\n"); //if( scalarThread->isRunning()) printf("Scalar Thread still running.\n");
//if( scalarThread->isFinished()) printf("Scalar Thread finsihed.\n"); //if( scalarThread->isFinished()) printf("Scalar Thread finsihed.\n");
@ -581,8 +585,12 @@ void MainWindow::SetUpScalar(){
lbLastUpdateTime->setAlignment(Qt::AlignCenter); lbLastUpdateTime->setAlignment(Qt::AlignCenter);
scalarLayout->addWidget(lbLastUpdateTime, 0, 1, 1, 1 + nDigi); scalarLayout->addWidget(lbLastUpdateTime, 0, 1, 1, 1 + nDigi);
lbScalarACQStatus = new QLabel("ACQ status");
lbScalarACQStatus->setAlignment(Qt::AlignCenter);
scalarLayout->addWidget(lbScalarACQStatus, 1, 1, 1, 1 + nDigi);
///==== create the 1st row ///==== create the 1st row
int rowID = 2; int rowID = 3;
for( int ch = 0; ch < MaxNumberOfChannel; ch++){ for( int ch = 0; ch < MaxNumberOfChannel; ch++){
if( ch == 0 ){ if( ch == 0 ){
@ -599,7 +607,7 @@ void MainWindow::SetUpScalar(){
leTrigger = new QLineEdit**[nDigi]; leTrigger = new QLineEdit**[nDigi];
leAccept = new QLineEdit**[nDigi]; leAccept = new QLineEdit**[nDigi];
for( int iDigi = 0; iDigi < nDigi; iDigi++){ for( int iDigi = 0; iDigi < nDigi; iDigi++){
rowID = 1; rowID = 2;
leTrigger[iDigi] = new QLineEdit *[digi[iDigi]->GetNChannels()]; leTrigger[iDigi] = new QLineEdit *[digi[iDigi]->GetNChannels()];
leAccept[iDigi] = new QLineEdit *[digi[iDigi]->GetNChannels()]; leAccept[iDigi] = new QLineEdit *[digi[iDigi]->GetNChannels()];
for( int ch = 0; ch < MaxNumberOfChannel; ch++){ for( int ch = 0; ch < MaxNumberOfChannel; ch++){

15
mainwindow.h
View File

@ -96,14 +96,15 @@ private:
QPushButton * bnOpenScope; QPushButton * bnOpenScope;
//@----- scalar; //@----- scalar;
QMainWindow * scalar; QMainWindow * scalar;
QPushButton * bnOpenScalar; QPushButton * bnOpenScalar;
QLineEdit *** leTrigger; // need to delete manually QLineEdit *** leTrigger; // need to delete manually
QLineEdit *** leAccept; // need to delete manually QLineEdit *** leAccept; // need to delete manually
QGridLayout * scalarLayout; QGridLayout * scalarLayout;
ScalarThread * scalarThread; ScalarThread * scalarThread;
QLabel * lbLastUpdateTime; QLabel * lbLastUpdateTime;
InfluxDB * influx; QLabel * lbScalarACQStatus;
InfluxDB * influx;
//@------ ACQ things //@------ ACQ things
QPushButton * bnStartACQ; QPushButton * bnStartACQ;