From 20f3375742b92cfd0d558a40cf510e3fa92738af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B5=B7?= Date: Thu, 26 Mar 2026 15:41:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9dock=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MainWindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 487f553..61cbfbb 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -130,7 +130,7 @@ void MainWindow::initMainWindow() _tree_measure_analysis = new MeasureAnalysisTreeView; _dockw_measure_analysis_tree = new ads::CDockWidget(QStringLiteral(u"测量分析工作空间")); _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); ui->menu_view->addAction(_dockw_measure_analysis_tree->toggleViewAction()); @@ -144,7 +144,7 @@ void MainWindow::initMainWindow() _plain_edit_info_output->setLineWidth(0); ads::CDockWidget* dockw_info_output = new ads::CDockWidget(QStringLiteral(u"信息输出")); 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); ui->menu_view->addAction(dockw_info_output->toggleViewAction()); } @@ -262,7 +262,7 @@ void MainWindow::initAction() if ( !view_exist ) { ads::CDockWidget* dock_widget = new ads::CDockWidget(view->GetViewName()); dock_widget->setWidget(view); - dock_widget->setMinimumSizeHintMode(ads::CDockWidget::MinimumSizeHintFromDockWidget); + dock_widget->setMinimumSizeHintMode(ads::CDockWidget::MinimumSizeHintFromContent); if (view->IsDeleteOnClose()) { // dock_widget->setFeatures(dock_widget->features() | ads::CDockWidget::DockWidgetDeleteOnClose); dock_widget->setFeatures(dock_widget->features() | ads::CDockWidget::CustomCloseHandling); From d95c1d9caa52c7158329b5f52982a2571e0aa644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B5=B7?= Date: Thu, 26 Mar 2026 17:01:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96plot=20=E8=BD=B4=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/EnergyCountPlotView/EnergyCountPlotView.cpp | 11 +++++++++-- src/MainWindow.cpp | 3 +-- src/ParticleCountPlotView/ParticleCountPlotView.cpp | 11 +++++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/EnergyCountPlotView/EnergyCountPlotView.cpp b/src/EnergyCountPlotView/EnergyCountPlotView.cpp index 5f1cfa7..f7cb0dd 100644 --- a/src/EnergyCountPlotView/EnergyCountPlotView.cpp +++ b/src/EnergyCountPlotView/EnergyCountPlotView.cpp @@ -63,8 +63,15 @@ void EnergyCountPlotView::setupPlot() QwtPlotCanvas* canvas = qobject_cast(_plot->canvas()); canvas->setFrameStyle(QFrame::NoFrame); - _plot->setAxisTitle(QwtPlot::xBottom, QString(QStringLiteral(u"能量(KeV)"))); - _plot->setAxisTitle(QwtPlot::yLeft, QString(QStringLiteral(u"计数"))); + QFont font = this->font(); + 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 _plot->setAxisAutoScale(QwtPlot::xBottom, true); _plot->setAxisAutoScale(QwtPlot::yLeft, true); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 61cbfbb..27ebfbe 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -166,7 +166,6 @@ void MainWindow::initAction() count_task->SetEveryChannelCountResultDir(every_ch_count_dir); count_task->SetFinishedNotifier(project_list_model, "onChannelAddressCountProcessFinished", project_model->GetProjectName()); count_task->StartTask(); - auto coincidence_process_task = new DataProcessWorkPool::CoincidenceEventAnalysisTask; coincidence_process_task->SetFinishedNotifier(project_list_model, "onCoincidenceProcessFinished", project_model->GetProjectName()); coincidence_process_task->StartTask(); @@ -188,7 +187,6 @@ void MainWindow::initAction() if (model->LoadProjectModel(filename)) { ProjectList::Instance()->AddProjectModel(model); } - }); connect(ui->action_save_measurement_analysis, &QAction::triggered, [](){ MeasureAnalysisProjectModel* project_model = ProjectList::Instance()->GetCurrentProjectModel(); @@ -261,6 +259,7 @@ void MainWindow::initAction() } if ( !view_exist ) { ads::CDockWidget* dock_widget = new ads::CDockWidget(view->GetViewName()); + view->setMinimumSize(320, 280); dock_widget->setWidget(view); dock_widget->setMinimumSizeHintMode(ads::CDockWidget::MinimumSizeHintFromContent); if (view->IsDeleteOnClose()) { diff --git a/src/ParticleCountPlotView/ParticleCountPlotView.cpp b/src/ParticleCountPlotView/ParticleCountPlotView.cpp index 1b7e590..0d1b4d6 100644 --- a/src/ParticleCountPlotView/ParticleCountPlotView.cpp +++ b/src/ParticleCountPlotView/ParticleCountPlotView.cpp @@ -158,8 +158,15 @@ void ParticleCountPlotView::setupPlot() QwtPlotCanvas* canvas = qobject_cast(_plot->canvas()); canvas->setFrameStyle(QFrame::NoFrame); - _plot->setAxisTitle(QwtPlot::xBottom, QString(QStringLiteral(u"道址"))); - _plot->setAxisTitle(QwtPlot::yLeft, QString(QStringLiteral(u"计数"))); + QFont font = this->font(); + 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 _plot->setAxisAutoScale(QwtPlot::xBottom, true); _plot->setAxisAutoScale(QwtPlot::yLeft, true);