xuhai_cpp/EnergySpectrumAnalyer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev

Browse Source
This commit is contained in:
徐海 2026-03-20 16:21:36 +08:00
commit dbb0bc7cd2
4 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/NewMeasureAnalysisDlg.cpp
View File

@ -5,6 +5,7 @@
#include <QMessageBox>
#include <QFileDialog>
#include <QFileInfo>
#include <QTimer>
#include "DataProcessWorkPool.h"
NewMeasureAnalysisDlg::NewMeasureAnalysisDlg(QWidget *parent)
@ -13,6 +14,15 @@ 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()
@ -151,15 +161,18 @@ 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()
@ -189,15 +202,20 @@ void NewMeasureAnalysisDlg::on_btn_ok_clicked()
separate_task->SetSortedResultDir(project_dir_path);
separate_task->SetFinishedNotifier(this, "onNewProjectFromFileFinished", project_name);
separate_task->StartTask();
ui->progressBar->setVisible(true);
} else {
this->newProject();
}
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();
}
// const QString& result_data_dir = QDir(project_model->GetProjectDir()).filePath("EveryChannelParticleData");
// auto separate_task = new DataProcessWorkPool::EveryChannelParticleDataSeparateTask;
// separate_task->SetAllChannelParticleDataFilename(project_model->GetAllChannelParticleDataFilename());

3
src/NewMeasureAnalysisDlg.h
View File

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

19
src/NewMeasureAnalysisDlg.ui
View File

@ -36,7 +36,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label">
<widget class="QLabel" name="label_project_name">
<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_2">
<widget class="QLabel" name="label_spec_type">
<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_8">
<widget class="QLabel" name="label_note">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
@ -551,14 +551,23 @@
</size>
</property>
<property name="value">
<number>24</number>
<number>0</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="textVisible">
<bool>false</bool>
<bool>true</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>