2025-04-13T16:15:53

src/.vscode/settings.json

@@ -3,6 +3,8 @@
     "files.associations": {
         "array": "cpp",
         "string": "cpp",
-        "string_view": "cpp"
+        "string_view": "cpp",
+        "deque": "cpp",
+        "vector": "cpp"
     }
 }

src/data/xlsxhandler.cpp

@@ -51,16 +51,16 @@ void XlsxHandler::readFile(const QString sourceFilePath)
     ei.operatorName = workSheet->cellAt(index++, 2)->value().toString();
     ei.phaseSize    = workSheet->cellAt(index++, 2)->value().toInt();
 
-    QVector<Phase> phaseVtr;
+    QVector<PhaseTotalInfo> phaseTotalVtr;
     for(int i = 0;i < ei.phaseSize;i++){
-        Phase phase;
-        readPhaseData(workSheet,phase);
-        phaseVtr.push_back(phase);
+        PhaseTotalInfo phaseTotoal;
+        readPhaseData(workSheet,phaseTotoal);
+        phaseTotalVtr.push_back(phaseTotoal);
     }
 
 }
 
-void XlsxHandler::readPhaseData(QXlsx::Worksheet *workSheet, Phase &phase)
+void XlsxHandler::readPhaseData(QXlsx::Worksheet *workSheet,const int index, PhaseTotalInfo &phase)
 {
     const int startIndex = 9;
 #if 0

src/data/xlsxhandler.h

@@ -9,7 +9,7 @@
 namespace XlsxHandler {
     void test();
     void readFile(const QString filePath);
-    void readPhaseData(QXlsx::Worksheet*,Phase&);
+    void readPhaseData(QXlsx::Worksheet*,const int index,PhaseTotalInfo&);
 }
 
 #endif // XLSX_H

src/global.h

@@ -53,6 +53,11 @@ public:
         QString operatorName;
         int phaseSize;
     };
+    struct PhaseTotalInfo{
+        int phaseIndex;
+        Phase phase;
+        QVector<ExperimentData> dataVtr;
+    };
 
     QVector<QPair<QCPCurve*,QVector<Global::ExperimentData>>> _curveDataVtr;