From 08dd0cb4f480f92d022f20c333449fb2e9ebf1c2 Mon Sep 17 00:00:00 2001
From: "Ryan@WorkStation" <rtang@fsu.edu>
Date: Wed, 22 Feb 2023 12:48:54 -0500
Subject: [PATCH] add ACQ on off status in scalar

---
 mainwindow.cpp | 12 ++++++++++--
 mainwindow.h   | 15 ++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1ff8d69..5e11469 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -340,6 +340,7 @@ void MainWindow::StartACQ(){
   }
 
   if( !scalar->isVisible() ) scalar->show();
+  lbScalarACQStatus->setText("<font style=\"color: green;\"><b>ACQ On</b></font>");
   scalarThread->start();
 
   bnStartACQ->setEnabled(false);
@@ -433,6 +434,9 @@ void MainWindow::StopACQ(){
         + "======================";
     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->isFinished()) printf("Scalar Thread finsihed.\n");
 
@@ -581,8 +585,12 @@ void MainWindow::SetUpScalar(){
   lbLastUpdateTime->setAlignment(Qt::AlignCenter);
   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
-  int rowID = 2;
+  int rowID = 3;
   for( int ch = 0; ch < MaxNumberOfChannel; ch++){
 
     if( ch == 0 ){
@@ -599,7 +607,7 @@ void MainWindow::SetUpScalar(){
   leTrigger = new QLineEdit**[nDigi];
   leAccept = new QLineEdit**[nDigi];
   for( int iDigi = 0; iDigi < nDigi; iDigi++){
-    rowID = 1;
+    rowID = 2;
     leTrigger[iDigi] = new QLineEdit *[digi[iDigi]->GetNChannels()];
     leAccept[iDigi] = new QLineEdit *[digi[iDigi]->GetNChannels()];
     for( int ch = 0; ch < MaxNumberOfChannel; ch++){
diff --git a/mainwindow.h b/mainwindow.h
index 7aa9928..4b76261 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -96,14 +96,15 @@ private:
   QPushButton * bnOpenScope;
 
   //@----- scalar;
-  QMainWindow * scalar;
-  QPushButton * bnOpenScalar;
-  QLineEdit *** leTrigger; // need to delete manually
-  QLineEdit *** leAccept; // need to delete manually
-  QGridLayout * scalarLayout;
+  QMainWindow  * scalar;
+  QPushButton  * bnOpenScalar;
+  QLineEdit  *** leTrigger; // need to delete manually
+  QLineEdit  *** leAccept; // need to delete manually
+  QGridLayout  * scalarLayout;
   ScalarThread * scalarThread;
-  QLabel      * lbLastUpdateTime;
-  InfluxDB   * influx;
+  QLabel       * lbLastUpdateTime;
+  QLabel       * lbScalarACQStatus;
+  InfluxDB     * influx;
 
   //@------ ACQ things
   QPushButton * bnStartACQ;