Batch Log Enable is added

developHw.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2022-11-16T09:07:55. -->
+<!-- Written by QtCreator 4.10.0, 2022-11-23T14:11:26. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

mainwindow.cpp

@@ -3489,9 +3489,28 @@ void MainWindow::on_chk_scenFrameAdcLog_clicked(bool checked)
         chk->setEnabled(!checked);
     }
 
-    ui->tb_adcLogCount->setEnabled(false);
     ui->tb_syncCount->setEnabled(!checked);
     ui->cb_syncMode->setEnabled(!checked);
+
+    if(checked)
+    {
+        if(ui->chk_batchLogEn->isChecked())
+            ui->tb_adcLogCount->setEnabled(checked);
+    }
+    else
+        ui->tb_adcLogCount->setEnabled(false);
+}
+
+/*************************************************************************************************/
+void MainWindow::on_chk_batchLogEn_clicked(bool checked)
+{
+    if(checked)
+    {
+        if(ui->chk_scenFrameAdcLog->isChecked())
+            ui->tb_adcLogCount->setEnabled(checked);
+    }
+    else
+        ui->tb_adcLogCount->setEnabled(false);
 }
 
 /*************************************************************************************************/
@@ -3538,6 +3557,7 @@ void MainWindow::catchAdcLog()
     {
         QString str;
         QColor color;
+        QDir dir;
 
         QString adcLoggerPath = ui->tb_adcLogPath->text();
 
@@ -3686,15 +3706,43 @@ void MainWindow::catchAdcLog()
             color = Qt::red;
             emit labelState(ui->l_adcLogDone, str, color);
 
+            quint32 iter(1);
+            if(ui->chk_batchLogEn->isChecked())
+            {
+                iter = adcLogCnt;
+            }
+
+            for(quint32 i = 0; i < iter; i++)
+            {
+                qApp->processEvents();
+                QString logFolder = QString::number(i + 1);
+                QString updatePath = adcLoggerPath + "/" + logFolder;
+                ui->tb_adcLogPath->setText(updatePath);
+
+                qApp->processEvents();
+                if(!dir.exists(updatePath))
+                {
+                    dir.mkpath(updatePath);
+                }
+                else
+                {
+                    dir.cd(updatePath);
+                    dir.removeRecursively();
+                    dir.mkpath(updatePath);
+                }
+
                 for(quint16 var = startIdx; var <= endIdx; var++)
                 {
                     capConfig.syncCount = var;
+                    capConfig.sampleCount = sampleCnt + i * 2048;
+                    ui->tb_sampleCount->setText(QString::number(sampleCnt));
+
                     _trx.adcCaptureConfig(capConfig);
                     _trx.adcCaptureStart();
                     _trx.scenPlayerStart(true);
                     _trx.adcCaptureDone();
                     _trx.scenPlayerStop(true);
-                _trx.adcLoggerStart(adcLoggerPath, "scenIndx(" + QString::number(var) + ")");
+                    _trx.adcLoggerStart(updatePath, "scenIndx(" + QString::number(var) + ")");
 
                     ui->lcd_adcCounter->display((var - startIdx) + 1);
                     qApp->processEvents();
@@ -3705,6 +3753,12 @@ void MainWindow::catchAdcLog()
                         break;
                     }
                 }
+                if(_discardAdcLog)
+                {
+                    _discardAdcLog = false;
+                    break;
+                }
+            }
 
             str = "done";
             color = Qt::green;
@@ -4789,4 +4843,3 @@ void MainWindow::on_btn_discard_clicked(void)
 {
     _discardTempTest = true;
 }
-

mainwindow.h

@@ -417,6 +417,8 @@ private slots:
 
     void on_btn_seRead_clicked();
 
+    void on_chk_batchLogEn_clicked(bool checked);
+
 signals:
     void showMessage(QString message);
     void threeDReady();

mainwindow.ui

@@ -42,7 +42,7 @@
      <string/>
     </property>
     <property name="currentIndex">
-     <number>0</number>
+     <number>5</number>
     </property>
     <widget class="QWidget" name="tab_0">
      <attribute name="title">
@@ -3007,7 +3007,7 @@
       <widget class="QCheckBox" name="chk_syncAdcLog">
        <property name="geometry">
         <rect>
-         <x>420</x>
+         <x>390</x>
          <y>30</y>
          <width>112</width>
          <height>21</height>
@@ -3028,7 +3028,7 @@
         <rect>
          <x>190</x>
          <y>30</y>
-         <width>224</width>
+         <width>191</width>
          <height>60</height>
         </rect>
        </property>
@@ -3098,7 +3098,7 @@
       <widget class="QCheckBox" name="chk_scenFrameAdcLog">
        <property name="geometry">
         <rect>
-         <x>420</x>
+         <x>390</x>
          <y>60</y>
          <width>168</width>
          <height>21</height>
@@ -3117,7 +3117,7 @@
       <widget class="QComboBox" name="cb_syncMode">
        <property name="geometry">
         <rect>
-         <x>540</x>
+         <x>500</x>
          <y>30</y>
          <width>81</width>
          <height>23</height>
@@ -3267,7 +3267,7 @@
       <widget class="QCheckBox" name="chk_txdacEn">
        <property name="geometry">
         <rect>
-         <x>420</x>
+         <x>390</x>
          <y>90</y>
          <width>113</width>
          <height>21</height>
@@ -3305,6 +3305,25 @@
         <set>QDialogButtonBox::Discard</set>
        </property>
       </widget>
+      <widget class="QCheckBox" name="chk_batchLogEn">
+       <property name="geometry">
+        <rect>
+         <x>560</x>
+         <y>60</y>
+         <width>90</width>
+         <height>23</height>
+        </rect>
+       </property>
+       <property name="font">
+        <font>
+         <weight>50</weight>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Batch En</string>
+       </property>
+      </widget>
      </widget>
     </widget>
     <widget class="QWidget" name="tab_5">