Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev
This commit is contained in:
commit
7219460e45
|
|
@ -63,8 +63,15 @@ void EnergyCountPlotView::setupPlot()
|
|||
QwtPlotCanvas* canvas = qobject_cast<QwtPlotCanvas*>(_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);
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
}
|
||||
|
|
@ -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,8 +259,9 @@ 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::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);
|
||||
|
|
|
|||
|
|
@ -158,8 +158,15 @@ void ParticleCountPlotView::setupPlot()
|
|||
QwtPlotCanvas* canvas = qobject_cast<QwtPlotCanvas*>(_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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user