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

入射粒子时间集成，修改显示大小问题
2026-03-25 09:36:22 +08:00 · 2026-03-25 09:35:56 +08:00 · 2026-03-24 15:39:20 +08:00 · 2026-03-24 15:38:36 +08:00
6 changed files with 397 additions and 5 deletions
--- a/src/MeasureAnalysisTreeView.cpp
+++ b/src/MeasureAnalysisTreeView.cpp
@ -122,6 +122,15 @@ void MeasureAnalysisTreeView::onNodeDoubleClicked(const QModelIndex& index)
                }
            }
        } break;
+        case AnalysisType::ParticleInTimeView: {
+            MeasureAnalysisProjectModel* project_model = _model->GetProjectModel(project_name);
+            if (project_model) {
+                auto file_name = project_model->GetParticleEnergyDataFilename();
+                if ( !file_name.isEmpty() ) {
+                    data_files_set[QStringLiteral(u"粒子能量数据")] = file_name;
+                }
+            }
+        } break;
        default:
            break;
        }
--- a/src/MeasureAnalysisView.cpp
+++ b/src/MeasureAnalysisView.cpp
@ -2,6 +2,7 @@
 #include <QMap>
 #include "MeasureAnalysisDataTableView.h"
 #include "MeasureAnalysisParticleCountPlotView.h"
+#include "ParticleInjectTimeAnalysis.h"

 MeasureAnalysisView *MeasureAnalysisView::NewAnalyzeView(AnalysisType view_type)
 {
@ -76,7 +77,7 @@ MeasureAnalysisView *MeasureAnalysisView::NewAnalyzeView(AnalysisType view_type)
        // new_view->setDeleteOnClose(false);
    } break;
    case AnalysisType::ParticleInTimeView: {
-        new_view = new MeasureAnalysisDataTableView;
+        new_view = new ParticleInjectTimeAnalysis;
        new_view->setDeleteOnClose(false);
    } break;
    case AnalysisType::ParticleTimeDiffView: {
--- a/src/ParticleInjectTimeView/ParticleInjectTimeAnalysis.cpp
+++ b/src/ParticleInjectTimeView/ParticleInjectTimeAnalysis.cpp
@ -0,0 +1,170 @@
+#include "ParticleInjectTimeAnalysis.h"
+#include "ui_ParticleInjectTimeAnalysis.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>
+
+ParticleInjectTimeAnalysis::ParticleInjectTimeAnalysis(QWidget *parent) :
+    MeasureAnalysisView(parent),
+    ui(new Ui::ParticleInjectTimeAnalysis)
+{
+    ui->setupUi(this);
+    InitUi();
+
+}
+
+ParticleInjectTimeAnalysis::~ParticleInjectTimeAnalysis()
+{
+    delete ui;
+}
+
+void ParticleInjectTimeAnalysis::InitViewWorkspace(const QString &project_name)
+{
+
+}
+
+void ParticleInjectTimeAnalysis::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 ParticleInjectTimeAnalysis::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);
+    plot->setAxisTitle(QwtPlot::xBottom, "粒子序号");
+    plot->setAxisTitle(QwtPlot::yLeft, "粒子时间");
+    LOG_INFO(QStringLiteral(u"%1数据读取完毕.").arg(this->GetViewName()));
+
+    // 刷新绘图
+    plot->replot();
+
+}
+
+QVector<ParticleInjectTime> ParticleInjectTimeAnalysis::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);
+        if (!ok) { qWarning() << "道址格式错误，行" << rec.dEnergy << lineNumber; continue; }
+        rec.dTime = fields[3].toLongLong(&ok);
+
+        if (!ok) { qWarning() << "时间计数格式错误，行" << fields[3] << rec.dTime <<lineNumber; continue; }
+
+        records.append(rec);
+    }
+
+    file.close();
+
+    return records;
+}
+
+void ParticleInjectTimeAnalysis::InitUi()
+{
+    plot = new CustomQwtPlot();
+    plot->SetXaxisDragScale(true);
+    setupPlot();
+    ui->verticalLayout_2->addWidget(plot);
+}
+
+void ParticleInjectTimeAnalysis::setupPlot()
+{
+    plot->setCanvasBackground(Qt::white);
+    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"计数")));
+    // 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);
+}
--- a/src/ParticleInjectTimeView/ParticleInjectTimeAnalysis.h
+++ b/src/ParticleInjectTimeView/ParticleInjectTimeAnalysis.h
@ -0,0 +1,49 @@
+#ifndef PARTICLEINJECTTIMEANALYSIS_H
+#define PARTICLEINJECTTIMEANALYSIS_H
+
+#include <QWidget>
+#include "qwt.h"
+#include "CustomQwtPlot.h"
+#include <QFile>
+#include <QTextStream>
+#include "MeasureAnalysisView.h"
+
+typedef struct ParticleInjectTime
+{
+    int bd;
+    int ch;
+    double dTime;
+    int index;
+    double dEnergy;
+} PARTICLEINJECTTIME;
+
+namespace Ui {
+class ParticleInjectTimeAnalysis;
+}
+
+class ParticleInjectTimeAnalysis : public MeasureAnalysisView
+{
+    Q_OBJECT
+
+public:
+    explicit ParticleInjectTimeAnalysis(QWidget *parent = nullptr);
+    virtual ~ParticleInjectTimeAnalysis();
+
+    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::ParticleInjectTimeAnalysis *ui;
+    CustomQwtPlot *plot;
+    QVector<ParticleInjectTime> m_AllData;//存储的所有的粒子入射时间数据
+};
+
+#endif // PARTICLEINJECTTIMEANALYSIS_H
--- a/src/ParticleInjectTimeView/ParticleInjectTimeAnalysis.ui
+++ b/src/ParticleInjectTimeView/ParticleInjectTimeAnalysis.ui
@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ParticleInjectTimeAnalysis</class>
+ <widget class="QWidget" name="ParticleInjectTimeAnalysis">
+  <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>
--- a/src/src.pro
+++ b/src/src.pro
@ -31,10 +31,12 @@ MOC_DIR  = $${BUILD_MOC}/$${TARGET}/moc
 UI_DIR  = $${BUILD_UI}/$${TARGET}/ui

 INCLUDEPATH += \
-    $${PWD}/MeasureAnalysisParticleCountPlotView
+    $${PWD}/MeasureAnalysisParticleCountPlotView \
+    $${PWD}/ParticleInjectTimeView

 DEPENDPATH += \
-    $${PWD}/MeasureAnalysisParticleCountPlotView
+    $${PWD}/MeasureAnalysisParticleCountPlotView \
+    $${PWD}/ParticleInjectTimeView

 SOURCES += \
    AboutDlg.cpp \
@ -57,6 +59,7 @@ SOURCES += \
    VirtualTable/SampleDataSource.cpp \
    VirtualTable/VirtualTableModel.cpp \
    VirtualTable/VirtualTableView.cpp \
+    ParticleInjectTimeView/ParticleInjectTimeAnalysis.cpp\
    main.cpp

 HEADERS += \
@ -82,7 +85,8 @@ HEADERS += \
    VirtualTable/DataSource.h \
    VirtualTable/SampleDataSource.h \
    VirtualTable/VirtualTableModel.h \
-    VirtualTable/VirtualTableView.h
+    VirtualTable/VirtualTableView.h \
+    ParticleInjectTimeView/ParticleInjectTimeAnalysis.h

 FORMS += \
    AboutDlg.ui \
@ -91,5 +95,7 @@ FORMS += \
    MeasureAnalysisHistoryForm.ui \
    MeasureAnalysisParticleCountPlotView/BatchEnergyScaleDialog.ui \
    MeasureDeviceParamsCfgForm.ui \
-    NewMeasureAnalysisDlg.ui
+    NewMeasureAnalysisDlg.ui\
+    ParticleInjectTimeView/ParticleInjectTimeAnalysis.ui
+
Author	SHA1	Message	Date
anxinglong	3db1425737	Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_axl	2026-03-25 09:36:22 +08:00
anxinglong	364f4e6c1a	入射粒子时间集成，修改显示大小问题	2026-03-25 09:35:56 +08:00
anxinglong	209be2b040	Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_axl	2026-03-24 15:39:20 +08:00
anxinglong	a61e8d8263	添加粒子入射时间视图类文件	2026-03-24 15:38:36 +08:00