src/NewMeasureAnalysisDlg.cpp

@@ -5,7 +5,6 @@
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <QTimer>
 #include "DataProcessWorkPool.h"
 
 NewMeasureAnalysisDlg::NewMeasureAnalysisDlg(QWidget *parent)
@@ -14,15 +13,6 @@ NewMeasureAnalysisDlg::NewMeasureAnalysisDlg(QWidget *parent)
 {
     ui->setupUi(this);
     initialization();
-
-    this->_task_wait_timer = new QTimer(this);
-    this->_task_wait_timer->setInterval(200);
-    connect(this->_task_wait_timer, &QTimer::timeout, [this](){
-        int progress = ui->progressBar->value();
-        if ( progress >= ui->progressBar->maximum() )
-            progress = 0;
-        ui->progressBar->setValue(progress + 10);
-    });
 }
 
 NewMeasureAnalysisDlg::~NewMeasureAnalysisDlg()
@@ -161,18 +151,15 @@ void NewMeasureAnalysisDlg::onNewProjectFromFileFinished(bool ok, const QString&
         }
     } else {
         project_dir.removeRecursively();
+
+        ui->stackedWidget->setEnabled(false);
+        ui->btn_previous_step->setEnabled(false);
+        ui->btn_next_step->setEnabled(false);
+        ui->btn_ok->setEnabled(false);
+
         const QString& data_file_path = ui->lineEdit_filename->property("data_file_path").toString();
         QMessageBox::warning(this, QStringLiteral(u"警告"), QStringLiteral(u"粒子数据%1异常,创建测量分析项目失败!").arg(data_file_path));
     }
-    this->_task_wait_timer->stop();
-    ui->progressBar->setVisible(false);
-
-    ui->stackedWidget->setEnabled(true);
-    ui->label_note->setEnabled(true);
-    ui->plainTextEdit_description->setEnabled(true);
-    ui->btn_previous_step->setEnabled(true);
-    ui->btn_next_step->setEnabled(true);
-    ui->btn_ok->setEnabled(true);
 }
 
 void NewMeasureAnalysisDlg::on_btn_ok_clicked()
@@ -202,19 +189,14 @@ void NewMeasureAnalysisDlg::on_btn_ok_clicked()
         separate_task->SetSortedResultDir(project_dir_path);
         separate_task->SetFinishedNotifier(this, "onNewProjectFromFileFinished", project_name);
         separate_task->StartTask();
-
-        ui->stackedWidget->setEnabled(false);
-        ui->label_note->setEnabled(false);
-        ui->plainTextEdit_description->setEnabled(false);
-        ui->btn_previous_step->setEnabled(false);
-        ui->btn_next_step->setEnabled(false);
-        ui->btn_ok->setEnabled(false);
-
         ui->progressBar->setVisible(true);
-        this->_task_wait_timer->start();
     } else {
         this->newProject();
     }
+    ui->stackedWidget->setEnabled(false);
+    ui->btn_previous_step->setEnabled(false);
+    ui->btn_next_step->setEnabled(false);
+    ui->btn_ok->setEnabled(false);
 
     // const QString& result_data_dir = QDir(project_model->GetProjectDir()).filePath("EveryChannelParticleData");
     // auto separate_task = new DataProcessWorkPool::EveryChannelParticleDataSeparateTask;

src/NewMeasureAnalysisDlg.h

@@ -3,8 +3,6 @@
 
 #include <QDialog>
 
-class QTimer;
-
 namespace Ui {
 class NewMeasureAnalysisDlg;
 }
@@ -27,7 +25,6 @@ private slots:
 
 private:
     Ui::NewMeasureAnalysisDlg *ui;
-    QTimer* _task_wait_timer = nullptr;
 };
 
 #endif // NEWMEASUREANALYSISDLG_H

src/NewMeasureAnalysisDlg.ui

@@ -36,7 +36,7 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
-          <widget class="QLabel" name="label_project_name">
+          <widget class="QLabel" name="label">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -68,7 +68,7 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
-          <widget class="QLabel" name="label_spec_type">
+          <widget class="QLabel" name="label_2">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -501,7 +501,7 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_8">
      <item>
-      <widget class="QLabel" name="label_note">
+      <widget class="QLabel" name="label_8">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
          <horstretch>0</horstretch>
@@ -551,23 +551,14 @@
         </size>
        </property>
        <property name="value">
-        <number>0</number>
+        <number>24</number>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
        </property>
        <property name="textVisible">
-        <bool>true</bool>
+        <bool>false</bool>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
        </property>
        <property name="invertedAppearance">
         <bool>false</bool>
        </property>
-       <property name="format">
-        <string>数据加载中······</string>
-       </property>
       </widget>
      </item>
      <item>