diff --git a/bin/AnalysTool.exe b/bin/AnalysTool.exe new file mode 100644 index 0000000..8f42f71 Binary files /dev/null and b/bin/AnalysTool.exe differ diff --git a/bin/D3Dcompiler_47.dll b/bin/D3Dcompiler_47.dll new file mode 100644 index 0000000..56512f5 Binary files /dev/null and b/bin/D3Dcompiler_47.dll differ diff --git a/bin/Qt5Core.dll b/bin/Qt5Core.dll new file mode 100644 index 0000000..5ec58e1 Binary files /dev/null and b/bin/Qt5Core.dll differ diff --git a/bin/Qt5Gui.dll b/bin/Qt5Gui.dll new file mode 100644 index 0000000..d75c183 Binary files /dev/null and b/bin/Qt5Gui.dll differ diff --git a/bin/Qt5PrintSupport.dll b/bin/Qt5PrintSupport.dll new file mode 100644 index 0000000..e44de6f Binary files /dev/null and b/bin/Qt5PrintSupport.dll differ diff --git a/bin/Qt5SerialPort.dll b/bin/Qt5SerialPort.dll new file mode 100644 index 0000000..286dac1 Binary files /dev/null and b/bin/Qt5SerialPort.dll differ diff --git a/bin/Qt5Svg.dll b/bin/Qt5Svg.dll new file mode 100644 index 0000000..4087736 Binary files /dev/null and b/bin/Qt5Svg.dll differ diff --git a/bin/Qt5Widgets.dll b/bin/Qt5Widgets.dll new file mode 100644 index 0000000..84511cc Binary files /dev/null and b/bin/Qt5Widgets.dll differ diff --git a/bin/iconengines/qsvgicon.dll b/bin/iconengines/qsvgicon.dll new file mode 100644 index 0000000..7f92d34 Binary files /dev/null and b/bin/iconengines/qsvgicon.dll differ diff --git a/bin/imageformats/qgif.dll b/bin/imageformats/qgif.dll new file mode 100644 index 0000000..fe72ce3 Binary files /dev/null and b/bin/imageformats/qgif.dll differ diff --git a/bin/imageformats/qicns.dll b/bin/imageformats/qicns.dll new file mode 100644 index 0000000..1c5ab4f Binary files /dev/null and b/bin/imageformats/qicns.dll differ diff --git a/bin/imageformats/qico.dll b/bin/imageformats/qico.dll new file mode 100644 index 0000000..4f12ab9 Binary files /dev/null and b/bin/imageformats/qico.dll differ diff --git a/bin/imageformats/qjpeg.dll b/bin/imageformats/qjpeg.dll new file mode 100644 index 0000000..6dbeeb2 Binary files /dev/null and b/bin/imageformats/qjpeg.dll differ diff --git a/bin/imageformats/qsvg.dll b/bin/imageformats/qsvg.dll new file mode 100644 index 0000000..6717ba4 Binary files /dev/null and b/bin/imageformats/qsvg.dll differ diff --git a/bin/imageformats/qtga.dll b/bin/imageformats/qtga.dll new file mode 100644 index 0000000..bfe4295 Binary files /dev/null and b/bin/imageformats/qtga.dll differ diff --git a/bin/imageformats/qtiff.dll b/bin/imageformats/qtiff.dll new file mode 100644 index 0000000..4cbf358 Binary files /dev/null and b/bin/imageformats/qtiff.dll differ diff --git a/bin/imageformats/qwbmp.dll b/bin/imageformats/qwbmp.dll new file mode 100644 index 0000000..6d93968 Binary files /dev/null and b/bin/imageformats/qwbmp.dll differ diff --git a/bin/imageformats/qwebp.dll b/bin/imageformats/qwebp.dll new file mode 100644 index 0000000..f783616 Binary files /dev/null and b/bin/imageformats/qwebp.dll differ diff --git a/bin/libEGL.dll b/bin/libEGL.dll new file mode 100644 index 0000000..873d988 Binary files /dev/null and b/bin/libEGL.dll differ diff --git a/bin/libGLESv2.dll b/bin/libGLESv2.dll new file mode 100644 index 0000000..d6786ca Binary files /dev/null and b/bin/libGLESv2.dll differ diff --git a/bin/libgcc_s_seh-1.dll b/bin/libgcc_s_seh-1.dll new file mode 100644 index 0000000..4ec945b Binary files /dev/null and b/bin/libgcc_s_seh-1.dll differ diff --git a/bin/libstdc++-6.dll b/bin/libstdc++-6.dll new file mode 100644 index 0000000..8e55acc Binary files /dev/null and b/bin/libstdc++-6.dll differ diff --git a/bin/libwinpthread-1.dll b/bin/libwinpthread-1.dll new file mode 100644 index 0000000..d9f4e1a Binary files /dev/null and b/bin/libwinpthread-1.dll differ diff --git a/bin/myeasylog.log b/bin/myeasylog.log new file mode 100644 index 0000000..30196c7 --- /dev/null +++ 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. diff --git a/bin/opengl32sw.dll b/bin/opengl32sw.dll new file mode 100644 index 0000000..475e82a Binary files /dev/null and b/bin/opengl32sw.dll differ diff --git a/bin/platforms/qwindows.dll b/bin/platforms/qwindows.dll new file mode 100644 index 0000000..b02c018 Binary files /dev/null and b/bin/platforms/qwindows.dll differ diff --git a/bin/printsupport/windowsprintersupport.dll b/bin/printsupport/windowsprintersupport.dll new file mode 100644 index 0000000..4e3b430 Binary files /dev/null and b/bin/printsupport/windowsprintersupport.dll differ diff --git a/bin/styles/qwindowsvistastyle.dll b/bin/styles/qwindowsvistastyle.dll new file mode 100644 index 0000000..9f5b283 Binary files /dev/null and b/bin/styles/qwindowsvistastyle.dll differ diff --git a/experiment_data/analysis_state/基线.xlsx b/experiment_data/analysis_state/基线.xlsx new file mode 100644 index 0000000..7c95cae Binary files /dev/null and b/experiment_data/analysis_state/基线.xlsx differ diff --git a/experiment_data/analysis_state/标样.xlsx b/experiment_data/analysis_state/标样.xlsx new file mode 100644 index 0000000..048c830 Binary files /dev/null and b/experiment_data/analysis_state/标样.xlsx differ diff --git a/experiment_data/analysis_state/样品.xlsx b/experiment_data/analysis_state/样品.xlsx new file mode 100644 index 0000000..ea71e19 Binary files /dev/null and b/experiment_data/analysis_state/样品.xlsx differ diff --git a/src/data/xlsxhandler.cpp b/src/data/xlsxhandler.cpp index 5ca9e1e..2cabf0c 100644 --- 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; diff --git a/src/ui/centralwidget.cpp b/src/ui/centralwidget.cpp index fcffbb2..78a9ac9 100644 --- a/src/ui/centralwidget.cpp +++ b/src/ui/centralwidget.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #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之间最大值。