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:
anxinglong 2026-03-26 17:36:43 +08:00
commit 7219460e45
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/EnergyCountPlotView/EnergyCountPlotView.cpp
View File

@ -63,8 +63,15 @@ void EnergyCountPlotView::setupPlot()
QwtPlotCanvas* canvas = qobject_cast<QwtPlotCanvas*>(_plot->canvas()); QwtPlotCanvas* canvas = qobject_cast<QwtPlotCanvas*>(_plot->canvas());
canvas->setFrameStyle(QFrame::NoFrame); canvas->setFrameStyle(QFrame::NoFrame);
_plot->setAxisTitle(QwtPlot::xBottom, QString(QStringLiteral(u"能量(KeV)"))); QFont font = this->font();
_plot->setAxisTitle(QwtPlot::yLeft, QString(QStringLiteral(u"计数"))); font.setBold(false);
QwtText energy_label = QStringLiteral(u"能量(KeV)");
energy_label.setFont(font);
QwtText count_label = QStringLiteral(u"计数");
count_label.setFont(font);
_plot->setAxisTitle(QwtPlot::xBottom, energy_label);
_plot->setAxisTitle(QwtPlot::yLeft, count_label);
// set axis auto scale // set axis auto scale
_plot->setAxisAutoScale(QwtPlot::xBottom, true); _plot->setAxisAutoScale(QwtPlot::xBottom, true);
_plot->setAxisAutoScale(QwtPlot::yLeft, true); _plot->setAxisAutoScale(QwtPlot::yLeft, true);

9
src/MainWindow.cpp
View File

@ -130,7 +130,7 @@ void MainWindow::initMainWindow()
_tree_measure_analysis = new MeasureAnalysisTreeView; _tree_measure_analysis = new MeasureAnalysisTreeView;
_dockw_measure_analysis_tree = new ads::CDockWidget(QStringLiteral(u"测量分析工作空间")); _dockw_measure_analysis_tree = new ads::CDockWidget(QStringLiteral(u"测量分析工作空间"));
_dockw_measure_analysis_tree->setWidget(_tree_measure_analysis); _dockw_measure_analysis_tree->setWidget(_tree_measure_analysis);
_dockw_measure_analysis_tree->setMinimumSizeHintMode(ads::CDockWidget::MinimumSizeHintFromContentMinimumSize); _dockw_measure_analysis_tree->setMinimumSizeHintMode(ads::CDockWidget::MinimumSizeHintFromContent);
_dock_manager->addDockWidget(ads::DockWidgetArea::LeftDockWidgetArea, _dockw_measure_analysis_tree); _dock_manager->addDockWidget(ads::DockWidgetArea::LeftDockWidgetArea, _dockw_measure_analysis_tree);
ui->menu_view->addAction(_dockw_measure_analysis_tree->toggleViewAction()); ui->menu_view->addAction(_dockw_measure_analysis_tree->toggleViewAction());
@ -144,7 +144,7 @@ void MainWindow::initMainWindow()
_plain_edit_info_output->setLineWidth(0); _plain_edit_info_output->setLineWidth(0);
ads::CDockWidget* dockw_info_output = new ads::CDockWidget(QStringLiteral(u"信息输出")); ads::CDockWidget* dockw_info_output = new ads::CDockWidget(QStringLiteral(u"信息输出"));
dockw_info_output->setWidget(_plain_edit_info_output); dockw_info_output->setWidget(_plain_edit_info_output);
dockw_info_output->setMinimumSizeHintMode(ads::CDockWidget::MinimumSizeHintFromContentMinimumSize); dockw_info_output->setMinimumSizeHintMode(ads::CDockWidget::MinimumSizeHintFromContent);
_dock_manager->addDockWidget(ads::DockWidgetArea::BottomDockWidgetArea, dockw_info_output); _dock_manager->addDockWidget(ads::DockWidgetArea::BottomDockWidgetArea, dockw_info_output);
ui->menu_view->addAction(dockw_info_output->toggleViewAction()); ui->menu_view->addAction(dockw_info_output->toggleViewAction());
} }
@ -166,7 +166,6 @@ void MainWindow::initAction()
count_task->SetEveryChannelCountResultDir(every_ch_count_dir); count_task->SetEveryChannelCountResultDir(every_ch_count_dir);
count_task->SetFinishedNotifier(project_list_model, "onChannelAddressCountProcessFinished", project_model->GetProjectName()); count_task->SetFinishedNotifier(project_list_model, "onChannelAddressCountProcessFinished", project_model->GetProjectName());
count_task->StartTask(); count_task->StartTask();
auto coincidence_process_task = new DataProcessWorkPool::CoincidenceEventAnalysisTask; auto coincidence_process_task = new DataProcessWorkPool::CoincidenceEventAnalysisTask;
coincidence_process_task->SetFinishedNotifier(project_list_model, "onCoincidenceProcessFinished", project_model->GetProjectName()); coincidence_process_task->SetFinishedNotifier(project_list_model, "onCoincidenceProcessFinished", project_model->GetProjectName());
coincidence_process_task->StartTask(); coincidence_process_task->StartTask();
@ -188,7 +187,6 @@ void MainWindow::initAction()
if (model->LoadProjectModel(filename)) { if (model->LoadProjectModel(filename)) {
ProjectList::Instance()->AddProjectModel(model); ProjectList::Instance()->AddProjectModel(model);
} }
}); });
connect(ui->action_save_measurement_analysis, &QAction::triggered, [](){ connect(ui->action_save_measurement_analysis, &QAction::triggered, [](){
MeasureAnalysisProjectModel* project_model = ProjectList::Instance()->GetCurrentProjectModel(); MeasureAnalysisProjectModel* project_model = ProjectList::Instance()->GetCurrentProjectModel();
@ -261,8 +259,9 @@ void MainWindow::initAction()
} }
if ( !view_exist ) { if ( !view_exist ) {
ads::CDockWidget* dock_widget = new ads::CDockWidget(view->GetViewName()); ads::CDockWidget* dock_widget = new ads::CDockWidget(view->GetViewName());
view->setMinimumSize(320, 280);
dock_widget->setWidget(view); dock_widget->setWidget(view);
dock_widget->setMinimumSizeHintMode(ads::CDockWidget::MinimumSizeHintFromDockWidget); dock_widget->setMinimumSizeHintMode(ads::CDockWidget::MinimumSizeHintFromContent);
if (view->IsDeleteOnClose()) { if (view->IsDeleteOnClose()) {
// dock_widget->setFeatures(dock_widget->features() | ads::CDockWidget::DockWidgetDeleteOnClose); // dock_widget->setFeatures(dock_widget->features() | ads::CDockWidget::DockWidgetDeleteOnClose);
dock_widget->setFeatures(dock_widget->features() | ads::CDockWidget::CustomCloseHandling); dock_widget->setFeatures(dock_widget->features() | ads::CDockWidget::CustomCloseHandling);

11
src/ParticleCountPlotView/ParticleCountPlotView.cpp
View File

@ -158,8 +158,15 @@ void ParticleCountPlotView::setupPlot()
QwtPlotCanvas* canvas = qobject_cast<QwtPlotCanvas*>(_plot->canvas()); QwtPlotCanvas* canvas = qobject_cast<QwtPlotCanvas*>(_plot->canvas());
canvas->setFrameStyle(QFrame::NoFrame); canvas->setFrameStyle(QFrame::NoFrame);
_plot->setAxisTitle(QwtPlot::xBottom, QString(QStringLiteral(u"道址"))); QFont font = this->font();
_plot->setAxisTitle(QwtPlot::yLeft, QString(QStringLiteral(u"计数"))); font.setBold(false);
QwtText addr_label = QStringLiteral(u"道址");
addr_label.setFont(font);
QwtText count_label = QStringLiteral(u"计数");
count_label.setFont(font);
_plot->setAxisTitle(QwtPlot::xBottom, addr_label);
_plot->setAxisTitle(QwtPlot::yLeft, count_label);
// set axis auto scale // set axis auto scale
_plot->setAxisAutoScale(QwtPlot::xBottom, true); _plot->setAxisAutoScale(QwtPlot::xBottom, true);
_plot->setAxisAutoScale(QwtPlot::yLeft, true); _plot->setAxisAutoScale(QwtPlot::yLeft, true);