2025-04-15T17:24:23

2025-04-15 17:24:25 +08:00 · 2025-04-15 17:24:25 +08:00 · c5cbeec3bb
commit c5cbeec3bb
parent 4b8027eb49
33 changed files with 41 additions and 2 deletions
--- a/bin/AnalysTool.exe
+++ b/bin/AnalysTool.exe
--- a/bin/D3Dcompiler_47.dll
+++ b/bin/D3Dcompiler_47.dll
--- a/bin/Qt5Core.dll
+++ b/bin/Qt5Core.dll
--- a/bin/Qt5Gui.dll
+++ b/bin/Qt5Gui.dll
--- a/bin/Qt5PrintSupport.dll
+++ b/bin/Qt5PrintSupport.dll
--- a/bin/Qt5SerialPort.dll
+++ b/bin/Qt5SerialPort.dll
--- a/bin/Qt5Svg.dll
+++ b/bin/Qt5Svg.dll
--- a/bin/Qt5Widgets.dll
+++ b/bin/Qt5Widgets.dll
--- a/bin/iconengines/qsvgicon.dll
+++ b/bin/iconengines/qsvgicon.dll
--- a/bin/imageformats/qgif.dll
+++ b/bin/imageformats/qgif.dll
--- a/bin/imageformats/qicns.dll
+++ b/bin/imageformats/qicns.dll
--- a/bin/imageformats/qico.dll
+++ b/bin/imageformats/qico.dll
--- a/bin/imageformats/qjpeg.dll
+++ b/bin/imageformats/qjpeg.dll
--- a/bin/imageformats/qsvg.dll
+++ b/bin/imageformats/qsvg.dll
--- a/bin/imageformats/qtga.dll
+++ b/bin/imageformats/qtga.dll
--- a/bin/imageformats/qtiff.dll
+++ b/bin/imageformats/qtiff.dll
--- a/bin/imageformats/qwbmp.dll
+++ b/bin/imageformats/qwbmp.dll
--- a/bin/imageformats/qwebp.dll
+++ b/bin/imageformats/qwebp.dll
--- a/bin/libEGL.dll
+++ b/bin/libEGL.dll
--- a/bin/libGLESv2.dll
+++ b/bin/libGLESv2.dll
--- a/bin/libgcc_s_seh-1.dll
+++ b/bin/libgcc_s_seh-1.dll
--- a/bin/libstdc++-6.dll
+++ b/bin/libstdc++-6.dll
--- a/bin/libwinpthread-1.dll
+++ b/bin/libwinpthread-1.dll
--- a/bin/myeasylog.log
+++ b/bin/myeasylog.log
@ -0,0 +1,34 @@
+2025-04-15 16:25:15,306 DEBUG [default] main...
+2025-04-15 16:25:15,558 DEBUG [default] setEventHandlerEnable...0
+2025-04-15 16:25:15,558 DEBUG [default] xMax:5
+2025-04-15 16:25:19,903 DEBUG [default] peakPoint:186.879,2.2
+2025-04-15 16:25:20,731 DEBUG [default] peakPoint:33.156,-2.366
+2025-04-15 16:25:21,296 DEBUG [default] peakPoint:136.386,-3.03
+2025-04-15 17:09:54,935 DEBUG [default] main...
+2025-04-15 17:09:54,952 DEBUG [default] setEventHandlerEnable...0
+2025-04-15 17:09:54,953 DEBUG [default] xMax:5
+2025-04-15 17:10:04,848 DEBUG [default] peakPoint:186.879,2.2
+2025-04-15 17:10:05,521 DEBUG [default] peakPoint:33.156,-2.366
+2025-04-15 17:10:06,448 DEBUG [default] peakPoint:136.386,-3.03
+2025-04-15 17:10:09,876 DEBUG [default] context menu...
+2025-04-15 17:10:09,876 DEBUG [default] selected...
+2025-04-15 17:10:11,336 DEBUG [default] slotBaseLine...
+2025-04-15 17:10:11,342 DEBUG [default] index:0
+2025-04-15 17:10:12,838 DEBUG [default] context menu...
+2025-04-15 17:10:12,838 DEBUG [default] selected...
+2025-04-15 17:10:14,440 DEBUG [default] index:1
+2025-04-15 17:10:15,719 DEBUG [default] context menu...
+2025-04-15 17:10:15,719 DEBUG [default] selected...
+2025-04-15 17:10:17,216 DEBUG [default] index:2
+2025-04-15 17:10:25,154 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:28,909 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:30,014 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:33,063 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:33,241 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:33,424 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:33,595 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:33,782 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:33,952 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:45,031 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:45,194 DEBUG [default] Base,standard,sample not selected.
+2025-04-15 17:10:45,371 DEBUG [default] Base,standard,sample not selected.
--- a/bin/opengl32sw.dll
+++ b/bin/opengl32sw.dll
--- a/bin/platforms/qwindows.dll
+++ b/bin/platforms/qwindows.dll
--- a/bin/printsupport/windowsprintersupport.dll
+++ b/bin/printsupport/windowsprintersupport.dll
--- a/bin/styles/qwindowsvistastyle.dll
+++ b/bin/styles/qwindowsvistastyle.dll
--- a/experiment_data/analysis_state/基线.xlsx
+++ b/experiment_data/analysis_state/基线.xlsx
--- a/experiment_data/analysis_state/标样.xlsx
+++ b/experiment_data/analysis_state/标样.xlsx
--- a/experiment_data/analysis_state/样品.xlsx
+++ b/experiment_data/analysis_state/样品.xlsx
--- a/src/data/xlsxhandler.cpp
+++ b/src/data/xlsxhandler.cpp
@ -38,6 +38,7 @@ int XlsxHandler::readFile(const QString sourceFilePath, Global::CurveFileData &c
        return 3;
    }

+#if 0
    // 获取工作表的行数和列数
    int rowCount = workSheet->dimension().rowCount();
    int colCount = workSheet->dimension().columnCount();
@ -45,6 +46,7 @@ int XlsxHandler::readFile(const QString sourceFilePath, Global::CurveFileData &c

    logde << "0:" << workSheet->cellAt(1, 1)->value().toString().toStdString();
    qDebug() << workSheet->cellAt(1, 1)->value().toString();
+#endif

    //
    int index = 2;
--- a/src/ui/centralwidget.cpp
+++ b/src/ui/centralwidget.cpp
@ -3,6 +3,7 @@
 #include <cmath>
 #include <limits>
 #include <qcustomplot.h>
+#include <QMessageBox>

 #include "centralwidget.h"
 #include "filemanager.h"
@ -166,7 +167,10 @@ void CentralWidget::slotRecvAnalysisFileName(const QString &fileName)

    // todo.禁止重复文件添加。
    Global::CurveFileData cfd;
-    XlsxHandler::readFile(fileName,cfd);
+    if(XlsxHandler::readFile(fileName,cfd) != 0){
+       QMessageBox::warning((QWidget*)this->parent(), "warnning", "File parse error.");
+       return;
+    }

    for(int i = 0;i < cfd.phaseTotalVtr.size();i++){
        Global::PhaseTotalInfo& pti = cfd.phaseTotalVtr[i];
@ -577,7 +581,6 @@ void CentralWidget::drawText(const QPointF point, const QString text)
    _customPlot->replot();
 }

-
 void CentralWidget::fillGraph(const double x1, const double x2)
 {
    //todo.未寻找x1\x2之间最大值。