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

补充提交

src/CountRateAnalysisView/CountRateAnalysisView.cpp

@@ -0,0 +1,177 @@
+#include "CountRateAnalysisView.h"
+#include "ui_CountRateAnalysisView.h"
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QMessageBox>
+#include <QwtPlotCurve>
+#include <QwtPlotMarker>
+#include <QwtPlotZoneItem>
+#include <QwtPlotCanvas>
+#include <QwtLegend>
+#include <QwtText>
+#include <cmath>
+#include <QtMath>
+#include "CustomQwtPlot.h"
+#include <QDebug>
+#include <GlobalDefine.h>
+
+CountRateAnalysisView::CountRateAnalysisView(QWidget *parent) :
+    MeasureAnalysisView(parent),
+    ui(new Ui::CountRateAnalysisView)
+{
+    ui->setupUi(this);
+    InitUi();
+
+}
+
+CountRateAnalysisView::~CountRateAnalysisView()
+{
+    delete ui;
+}
+
+void CountRateAnalysisView::InitViewWorkspace(const QString &project_name)
+{
+
+}
+
+void CountRateAnalysisView::SetAnalyzeDataFilename(const QMap<QString, QVariant> &data_files_set)
+{
+    if(!data_files_set.isEmpty())
+    {
+        m_AllData = getParticleInjectTimeData(data_files_set.first().toString());
+        setData(m_AllData);
+    }
+}
+
+void CountRateAnalysisView::setData(QVector<ParticleInjectTime> data)
+{
+    int energyStart = ui->label_energyStart->text().toInt();
+    int energyEnd = ui->label_energyEnd->text().toInt();
+    int nInv = 1;
+    constexpr qint64 NS_PER_SECOND = 1000000000; // 纳秒转秒的基数
+
+    if (data.isEmpty()) return; // 添加空列表保护
+    QVector<double> x;
+    QVector<double> y;
+
+    const ParticleInjectTime& lostdt = data.last();
+    const qint64 totalNanoseconds = lostdt.dTime * 5;
+    const int nAllS = static_cast<int>(totalNanoseconds / NS_PER_SECOND) + 1;
+    const int nVecSize = nAllS / nInv;
+    QVector<double> vec(nVecSize); // 默认初始化为0
+
+
+    double minValue = 0;
+    double maxValue = 0;
+    for(auto info : data)
+    {
+        const qint64 ns = (info.dTime * 5) / NS_PER_SECOND;
+            const int nidx = static_cast<int>(ns / nInv); // 整数除法，速度快
+            if (nidx < nVecSize)
+                ++vec[nidx]; // 使用 ++ 而非 vec[nidx]++
+    }
+
+    QVector<double> vecXpt(vec.size());
+    for (int i = 0; i < vec.size(); ++i)
+        vecXpt[i] = static_cast<double>(i);
+
+    // 创建曲线并设置数据
+    QwtPlotCurve *curve = new QwtPlotCurve();
+    curve->setSamples(vecXpt, vec);
+    // 将曲线添加到 CustomQwtPlot 中（会自动分配颜色）
+    plot->AddCurve(curve);
+    // 设置坐标轴范围和标题
+//    plot->setAxisScale(QwtPlot::xBottom, 0, x.last());
+//    plot->setAxisScale(QwtPlot::yLeft,minValue , maxValue);
+
+    LOG_INFO(QStringLiteral(u"%1数据读取完毕.").arg(this->GetViewName()));
+
+    // 刷新绘图
+    plot->replot();
+
+}
+
+QVector<ParticleInjectTime> CountRateAnalysisView::getParticleInjectTimeData(QString path)
+{
+   QVector<ParticleInjectTime> records;
+   QFile file(path);
+
+   if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+       qWarning() << "无法打开文件：" << file.errorString();
+       return records;
+   }
+   QTextStream stream(&file);
+   stream.setCodec("UTF-8");
+   int lineNumber = 0;
+   while (!stream.atEnd())
+   {
+        QString line = stream.readLine().trimmed();
+        lineNumber++;
+
+        // 跳过空行
+        if (line.isEmpty())
+            continue;
+
+        // 按逗号分割
+        QStringList fields = line.split(',');
+
+        // 检查字段数量是否正确（应该为4）
+        if (fields.size() != 4) {
+            qWarning() << "行" << lineNumber << "字段数量不正确，跳过:" << line;
+            continue;
+        }
+
+        //获取板卡号通道号
+        int bd = fields[0].toInt();
+        int ch = fields[1].toInt();
+        int detector = bd + ch * 8;
+        if(detector >= 32)
+        {
+            continue;
+        }
+
+        bool ok;
+        ParticleInjectTime rec;
+        rec.bd = bd;
+        rec.ch = ch;
+        rec.index = lineNumber;
+        rec.dEnergy   = fields[2].toDouble(&ok);
+        rec.dTime = fields[3].toLongLong(&ok);
+        records.append(rec);
+    }
+
+    file.close();
+
+    return records;
+}
+
+void CountRateAnalysisView::InitUi()
+{
+    plot = new CustomQwtPlot();
+    plot->SetXaxisDragScale(true);
+    setupPlot();
+    ui->verticalLayout_2->addWidget(plot);
+}
+
+void CountRateAnalysisView::setupPlot()
+{
+    plot->setCanvasBackground(Qt::white);
+    QwtPlotCanvas* canvas = qobject_cast<QwtPlotCanvas*>(plot->canvas());
+    canvas->setFrameStyle(QFrame::NoFrame);
+
+    plot->setAxisTitle(QwtPlot::xBottom, QStringLiteral(u"时间"));
+    plot->setAxisTitle(QwtPlot::yLeft, QStringLiteral(u"计数"));
+    // set axis auto scale
+    plot->setAxisAutoScale(QwtPlot::xBottom, true);
+    plot->setAxisAutoScale(QwtPlot::yLeft, true);
+    // 启用网格线
+    plot->enableAxis(QwtPlot::xBottom);
+    plot->enableAxis(QwtPlot::yLeft);
+
+    // 设置QWT图例
+//    QwtLegend* legend = new QwtLegend();
+//    legend->setDefaultItemMode(QwtLegendData::ReadOnly);
+//    plot->insertLegend(legend, QwtPlot::RightLegend);
+
+    plot->SetXaxisDragScale(true);
+}

src/CountRateAnalysisView/CountRateAnalysisView.h

@@ -0,0 +1,42 @@
+#ifndef COUNTRATEANALYSISVIEW_H
+#define COUNTRATEANALYSISVIEW_H
+
+#include <QWidget>
+#include "qwt.h"
+#include "CustomQwtPlot.h"
+#include <QFile>
+#include <QTextStream>
+#include "MeasureAnalysisView.h"
+
+
+
+namespace Ui {
+class CountRateAnalysisView;
+}
+
+class CountRateAnalysisView : public MeasureAnalysisView
+{
+    Q_OBJECT
+
+public:
+    explicit CountRateAnalysisView(QWidget *parent = nullptr);
+    virtual ~CountRateAnalysisView();
+
+    virtual void InitViewWorkspace(const QString& project_name) override final;
+    virtual void SetAnalyzeDataFilename(const QMap<QString, QVariant>& data_files_set);
+
+    void setData(QVector<ParticleInjectTime> data);
+
+    //获取数据
+    QVector<ParticleInjectTime>  getParticleInjectTimeData(QString path);
+private:
+    void InitUi();
+    void setupPlot();
+
+private:
+    Ui::CountRateAnalysisView *ui;
+    CustomQwtPlot *plot;
+    QVector<ParticleInjectTime> m_AllData;//存储的所有的粒子入射时间数据
+};
+
+#endif //COUNTRATEANALYSIS_H

src/CountRateAnalysisView/CountRateAnalysisView.ui

@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CountRateAnalysisView</class>
+ <widget class="QWidget" name="CountRateAnalysisView">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>997</width>
+    <height>307</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>ParticleInjectTimeAnalysis</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>统计时间间隔：</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_energyStart">
+       <property name="text">
+        <string>1</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>s</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>    统计目标：</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>特征峰</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>    特征峰能量：</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_energyEnd">
+       <property name="text">
+        <string>45</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>KeV</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton">
+       <property name="text">
+        <string>计数率统计时间设置</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout_2"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>

src/MeasureAnalysisProjectModel.h

@@ -97,7 +97,7 @@ public:
     bool SaveProjectModel();
 private:
     QString _project_filename;
-
+    QMutex _save_mutex;
 };
 
 

src/MeasureAnalysisView.cpp

@@ -2,8 +2,8 @@
 #include <QMap>
 #include "MeasureAnalysisDataTableView.h"
 #include "ParticleCountPlotView.h"
-#include "ParticleInjectTimeAnalysis.h"
+#include "ParticleInjectTimeAnalysisView.h"
-#include "CountRateAnalysis.h"
+#include "CountRateAnalysisView.h"
 #include "EnergyCountPlotView.h"
 
 MeasureAnalysisView *MeasureAnalysisView::NewAnalyzeView(AnalysisType view_type)
@@ -67,7 +67,7 @@ MeasureAnalysisView *MeasureAnalysisView::NewAnalyzeView(AnalysisType view_type)
         // new_view->setDeleteOnClose(false);
     } break;
     case AnalysisType::CountingRateView: {
-         new_view = new CountRateAnalysis;
+         new_view = new CountRateAnalysisView;
          new_view->setDeleteOnClose(false);
     } break;
     case AnalysisType::EnergyPeakFitView: {
@@ -79,7 +79,7 @@ MeasureAnalysisView *MeasureAnalysisView::NewAnalyzeView(AnalysisType view_type)
         // new_view->setDeleteOnClose(false);
     } break;
     case AnalysisType::ParticleInTimeView: {
-        new_view = new ParticleInjectTimeAnalysis;
+        new_view = new ParticleInjectTimeAnalysisView;
         new_view->setDeleteOnClose(false);
     } break;
     case AnalysisType::ParticleTimeDiffView: {

src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.cpp

@@ -0,0 +1,165 @@
+#include "ParticleInjectTimeAnalysisView.h"
+#include "ui_ParticleInjectTimeAnalysisView.h"
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QMessageBox>
+#include <QwtPlotCurve>
+#include <QwtPlotMarker>
+#include <QwtPlotZoneItem>
+#include <QwtPlotCanvas>
+#include <QwtLegend>
+#include <QwtText>
+#include <cmath>
+#include <QtMath>
+#include "CustomQwtPlot.h"
+#include <QDebug>
+#include <GlobalDefine.h>
+
+ParticleInjectTimeAnalysisView::ParticleInjectTimeAnalysisView(QWidget *parent) :
+    MeasureAnalysisView(parent),
+    ui(new Ui::ParticleInjectTimeAnalysisView)
+{
+    ui->setupUi(this);
+    InitUi();
+
+}
+
+ParticleInjectTimeAnalysisView::~ParticleInjectTimeAnalysisView()
+{
+    delete ui;
+}
+
+void ParticleInjectTimeAnalysisView::InitViewWorkspace(const QString &project_name)
+{
+
+}
+
+void ParticleInjectTimeAnalysisView::SetAnalyzeDataFilename(const QMap<QString, QVariant> &data_files_set)
+{
+    if(!data_files_set.isEmpty())
+    {
+        m_AllData = getParticleInjectTimeData(data_files_set.first().toString());
+        setData(m_AllData);
+    }
+}
+
+void ParticleInjectTimeAnalysisView::setData(QVector<ParticleInjectTime> data)
+{
+    int energyStart = ui->label_energyStart->text().toInt();
+    int energyEnd = ui->label_energyEnd->text().toInt();
+
+    QVector<double> x;
+    QVector<double> y;
+
+    double minValue = 0;
+    double maxValue = 0;
+    for(auto info : data)
+    {
+        if(info.dEnergy <= energyStart || info.dEnergy >= energyEnd)
+        {
+            continue;
+        }
+        x.append(info.index);
+        y.append(info.dTime);
+        minValue = qMin(minValue, info.dTime);
+        maxValue = qMax(maxValue, info.dTime);
+    }
+
+    // 创建曲线并设置数据
+    QwtPlotCurve *curve = new QwtPlotCurve();
+    curve->setSamples(x, y);
+    // 将曲线添加到 CustomQwtPlot 中（会自动分配颜色）
+    plot->AddCurve(curve);
+    // 设置坐标轴范围和标题
+//    plot->setAxisScale(QwtPlot::xBottom, 0, x.last());
+//    plot->setAxisScale(QwtPlot::yLeft,minValue , maxValue);
+
+    LOG_INFO(QStringLiteral(u"%1数据读取完毕.").arg(this->GetViewName()));
+
+    // 刷新绘图
+    plot->replot();
+
+}
+
+QVector<ParticleInjectTime> ParticleInjectTimeAnalysisView::getParticleInjectTimeData(QString path)
+{
+   QVector<ParticleInjectTime> records;
+   QFile file(path);
+
+   if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+       qWarning() << "无法打开文件：" << file.errorString();
+       return records;
+   }
+   QTextStream stream(&file);
+   stream.setCodec("UTF-8");
+   int lineNumber = 0;
+   while (!stream.atEnd())
+   {
+        QString line = stream.readLine().trimmed();
+        lineNumber++;
+
+        // 跳过空行
+        if (line.isEmpty())
+            continue;
+
+        // 按逗号分割
+        QStringList fields = line.split(',');
+
+        // 检查字段数量是否正确（应该为4）
+        if (fields.size() != 4) {
+            qWarning() << "行" << lineNumber << "字段数量不正确，跳过:" << line;
+            continue;
+        }
+
+        //获取板卡号通道号
+        int bd = fields[0].toInt();
+        int ch = fields[1].toInt();
+        int detector = bd + ch * 8;
+        if(detector >= 32)
+        {
+            continue;
+        }
+
+        bool ok;
+        ParticleInjectTime rec;
+        rec.index = lineNumber;
+        rec.dEnergy   = fields[2].toDouble(&ok);
+        rec.dTime = fields[3].toLongLong(&ok);
+        records.append(rec);
+    }
+
+    file.close();
+
+    return records;
+}
+
+void ParticleInjectTimeAnalysisView::InitUi()
+{
+    plot = new CustomQwtPlot();
+    plot->SetXaxisDragScale(true);
+    setupPlot();
+    ui->verticalLayout_2->addWidget(plot);
+}
+
+void ParticleInjectTimeAnalysisView::setupPlot()
+{
+    plot->setCanvasBackground(Qt::white);
+    QwtPlotCanvas* canvas = qobject_cast<QwtPlotCanvas*>(plot->canvas());
+    canvas->setFrameStyle(QFrame::NoFrame);
+
+    plot->setAxisTitle(QwtPlot::xBottom, QStringLiteral(u"粒子序号"));
+    plot->setAxisTitle(QwtPlot::yLeft, QStringLiteral(u"粒子时间"));
+    // set axis auto scale
+    plot->setAxisAutoScale(QwtPlot::xBottom, true);
+    plot->setAxisAutoScale(QwtPlot::yLeft, true);
+    // 启用网格线
+    plot->enableAxis(QwtPlot::xBottom);
+    plot->enableAxis(QwtPlot::yLeft);
+
+//    // 设置QWT图例
+//    QwtLegend* legend = new QwtLegend();
+//    legend->setDefaultItemMode(QwtLegendData::ReadOnly);
+//    plot->insertLegend(legend, QwtPlot::RightLegend);
+
+    plot->SetXaxisDragScale(true);
+}

src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.h

@@ -0,0 +1,41 @@
+#ifndef PARTICLEINJECTTIMEANALYSISVIEW_H
+#define PARTICLEINJECTTIMEANALYSISVIEW_H
+
+#include <QWidget>
+#include "qwt.h"
+#include "CustomQwtPlot.h"
+#include <QFile>
+#include <QTextStream>
+#include "MeasureAnalysisView.h"
+
+
+namespace Ui {
+class ParticleInjectTimeAnalysisView;
+}
+
+class ParticleInjectTimeAnalysisView : public MeasureAnalysisView
+{
+    Q_OBJECT
+
+public:
+    explicit ParticleInjectTimeAnalysisView(QWidget *parent = nullptr);
+    virtual ~ParticleInjectTimeAnalysisView();
+
+    virtual void InitViewWorkspace(const QString& project_name) override final;
+    virtual void SetAnalyzeDataFilename(const QMap<QString, QVariant>& data_files_set);
+
+    void setData(QVector<ParticleInjectTime> data);
+
+    //获取数据
+    QVector<ParticleInjectTime>  getParticleInjectTimeData(QString path);
+private:
+    void InitUi();
+    void setupPlot();
+
+private:
+    Ui::ParticleInjectTimeAnalysisView *ui;
+    CustomQwtPlot *plot;
+    QVector<ParticleInjectTime> m_AllData;//存储的所有的粒子入射时间数据
+};
+
+#endif // PARTICLEINJECTTIMEANALYSIS_H

src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.ui

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ParticleInjectTimeAnalysisView</class>
+ <widget class="QWidget" name="ParticleInjectTimeAnalysisView">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>997</width>
+    <height>307</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>ParticleInjectTimeAnalysis</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>粒子入射设置</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>起始能量：</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_energyStart">
+       <property name="text">
+        <string>50</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>KeV</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>~</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>终止能量：</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_energyEnd">
+       <property name="text">
+        <string>100</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>KeV</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton">
+       <property name="text">
+        <string>感兴趣区域(ROI)选择</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout_2"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>

src/src.pro

@@ -35,17 +35,18 @@ INCLUDEPATH += \
     $${PWD}/ParticleCountPlotView \
     $${PWD}/ParticleInjectTimeView \
     $${PWD}/EnergyCountPlotView \
-    $${PWD}/CountRateAnalysis
+    $${PWD}/CountRateAnalysisView
 
 DEPENDPATH += \
     $${PWD}/MeasureAnalysisParticleCountPlotView \
     $${PWD}/ParticleCountPlotView \
     $${PWD}/ParticleInjectTimeView\
     $${PWD}/EnergyCountPlotView \
-    $${PWD}/CountRateAnalysis
+    $${PWD}/CountRateAnalysisView
 
 SOURCES += \
     AboutDlg.cpp \
+    CountRateAnalysisView/CountRateAnalysisView.cpp \
     CustomQwtPlot.cpp \
     DataProcessWorkPool.cpp \
     EnergyCountPlotView/EnergyCountPlotView.cpp \
@@ -62,17 +63,17 @@ SOURCES += \
     MeasureDeviceParamsCfgForm.cpp \
     NewMeasureAnalysisDlg.cpp \
     MeasureAnalysisProjectModel.cpp \
+    ParticleInjectTimeView/ParticleInjectTimeAnalysisView.cpp \
     VirtualTable/CsvDataSource.cpp \
     VirtualTable/SampleDataSource.cpp \
     VirtualTable/VirtualTableModel.cpp \
     VirtualTable/VirtualTableView.cpp \
-    ParticleInjectTimeView/ParticleInjectTimeAnalysis.cpp\
-    CountRateAnalysis/CountRateAnalysis.cpp\
     main.cpp
 
 HEADERS += \
     AboutDlg.h \
     AnalysisTypeDefine.h \
+    CountRateAnalysisView/CountRateAnalysisView.h \
     CustomQwtPlot.h \
     DataProcessWorkPool.h \
     EnergyCountPlotView/EnergyCountPlotView.h \
@@ -90,25 +91,24 @@ HEADERS += \
     MeasureDeviceParamsCfgForm.h \
     NewMeasureAnalysisDlg.h \
     MeasureAnalysisProjectModel.h \
+    ParticleInjectTimeView/ParticleInjectTimeAnalysisView.h \
     VirtualTable/CsvDataSource.h \
     VirtualTable/DataSource.h \
     VirtualTable/SampleDataSource.h \
     VirtualTable/VirtualTableModel.h \
-    VirtualTable/VirtualTableView.h \
+    VirtualTable/VirtualTableView.h
-    ParticleInjectTimeView/ParticleInjectTimeAnalysis.h\
-    CountRateAnalysis/CountRateAnalysis.h
 
 
 FORMS += \
     AboutDlg.ui \
+    CountRateAnalysisView/CountRateAnalysisView.ui \
     EnergyScaleForm.ui \
     MainWindow.ui \
     MeasureAnalysisHistoryForm.ui \
     ParticleCountPlotView/BatchEnergyScaleDialog.ui \
     MeasureDeviceParamsCfgForm.ui \
-    NewMeasureAnalysisDlg.ui\
+    NewMeasureAnalysisDlg.ui \
-    ParticleInjectTimeView/ParticleInjectTimeAnalysis.ui\
+    ParticleInjectTimeView/ParticleInjectTimeAnalysisView.ui
-    CountRateAnalysis/CountRateAnalysis.ui