diff --git a/experiment_data/analysis_state/13-2-new.xlsx b/experiment_data/analysis_state/13-2-new.xlsx new file mode 100644 index 0000000..76ba3b7 Binary files /dev/null and b/experiment_data/analysis_state/13-2-new.xlsx differ diff --git a/experiment_data/analysis_state/13-4-new.xlsx b/experiment_data/analysis_state/13-4-new.xlsx new file mode 100644 index 0000000..ff807a5 Binary files /dev/null and b/experiment_data/analysis_state/13-4-new.xlsx differ diff --git a/experiment_data/analysis_state/13-new.xlsx b/experiment_data/analysis_state/13-new.xlsx new file mode 100644 index 0000000..1aa9237 Binary files /dev/null and b/experiment_data/analysis_state/13-new.xlsx differ diff --git a/experiment_data/analysis_state/30-new.xlsx b/experiment_data/analysis_state/30-new.xlsx new file mode 100644 index 0000000..384fa70 Binary files /dev/null and b/experiment_data/analysis_state/30-new.xlsx differ diff --git a/experiment_data/analysis_state/new.xlsx b/experiment_data/analysis_state/new.xlsx new file mode 100644 index 0000000..1c30087 Binary files /dev/null and b/experiment_data/analysis_state/new.xlsx differ diff --git a/experiment_data/analysis_state/~$30-new.xlsx b/experiment_data/analysis_state/~$30-new.xlsx new file mode 100644 index 0000000..d4a5841 Binary files /dev/null and b/experiment_data/analysis_state/~$30-new.xlsx differ diff --git a/experiment_data/analysis_state/~$new.xlsx b/experiment_data/analysis_state/~$new.xlsx new file mode 100644 index 0000000..d4a5841 Binary files /dev/null and b/experiment_data/analysis_state/~$new.xlsx differ diff --git a/experiment_data/sample_data/30-new.xlsx b/experiment_data/sample_data/30-new.xlsx new file mode 100644 index 0000000..0d6152b Binary files /dev/null and b/experiment_data/sample_data/30-new.xlsx differ diff --git a/experiment_data/sample_data/33-new.xlsx b/experiment_data/sample_data/33-new.xlsx new file mode 100644 index 0000000..e60f060 Binary files /dev/null and b/experiment_data/sample_data/33-new.xlsx differ diff --git a/experiment_data/sample_data/new.xlsx b/experiment_data/sample_data/new.xlsx index f2f0d0f..3685f14 100644 Binary files a/experiment_data/sample_data/new.xlsx and b/experiment_data/sample_data/new.xlsx differ diff --git a/src/AnalysisTool.pro b/src/DSCAnalysisTool.pro similarity index 99% rename from src/AnalysisTool.pro rename to src/DSCAnalysisTool.pro index 1f18c0a..ee8b879 100644 --- a/src/AnalysisTool.pro +++ b/src/DSCAnalysisTool.pro @@ -9,7 +9,7 @@ CONFIG+=precompile_header PRECOMPILED_HEADER=stable.h # -VERSION = 1.0.1 +VERSION = 1.0.2 # 设置目标文件名,包含版本号 TARGET = DSCAnalysisTool_$${VERSION} diff --git a/src/data/xlsxhandler.cpp b/src/data/xlsxhandler.cpp index 3a6e02a..ca38ec0 100644 --- a/src/data/xlsxhandler.cpp +++ b/src/data/xlsxhandler.cpp @@ -27,7 +27,7 @@ int XlsxHandler::readFile(const QString filePath, Global::CurveFileData &cfd) { if(!QFile::exists(filePath)) { - qDebug() << "xlsx file not existed:" << filePath; + logde<< "xlsx file not existed:" << filePath.toStdString(); return 1; } @@ -198,7 +198,7 @@ void XlsxHandler::writeFile(const QString filePath) const Phase& phase = ei.phaseVtr.at(i); if(phase.onoff == 0){ - logde<<"onoff == 0."; +// logde<<"onoff == 0."; continue; } @@ -381,8 +381,9 @@ void XlsxHandler::writeAnalysisOperation(const QString filePath) QXlsx::Document* XlsxHandler::openXlsxFile(const QString& sourceFilePath) { // 检查文件是否存在 if (!QFile::exists(sourceFilePath)) { - qDebug() << "xlsx file not existed:" << sourceFilePath; - return nullptr; + logde << "xlsx file not existed:" << sourceFilePath.toStdString(); + QXlsx::Document* xlsx = new QXlsx::Document(sourceFilePath); + return xlsx; } QFileInfo fileInfo(sourceFilePath); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d74b814..7b8bf93 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -34,6 +34,8 @@ MainWindow::MainWindow(QWidget *parent) ui->setupUi(this); this->setToolTip("....."); + ui->actionSaveas->setVisible(false); + setCentralWidget(_centralWidget); addDockWidget(Qt::LeftDockWidgetArea, _leftWidget); addDockWidget(Qt::RightDockWidgetArea, _rightWidget); @@ -268,12 +270,21 @@ bool MainWindow::saveFile(const QString fileName,const Global::Mode mode) } if(mode == Global::Mode::Analysis){ - XlsxHandler::writeAnalysisOperation(filePath); + if(Global::_curveFileDataVtr.empty()){ + logde<<"analysis experiemt data..."; + XlsxHandler::writeFile(filePath); +// XlsxHandler::writeAnalysisOperation(filePath); + }else{ + logde<<"analysis xlsx data..."; + XlsxHandler::writeAnalysisOperation(filePath); + } }else if(mode == Global::Mode::Experiment){ + logde<<"writeFile..."; XlsxHandler::writeFile(filePath); - +#if 0 // Clear data. Global::clearExperimentData(); +#endif } return true; diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 7ea5cb4..76604d5 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -332,6 +332,9 @@ + + false + 另存为 diff --git a/src/ui/centralwidget.cpp b/src/ui/centralwidget.cpp index acd0845..1c5325d 100644 --- a/src/ui/centralwidget.cpp +++ b/src/ui/centralwidget.cpp @@ -963,6 +963,8 @@ void CentralWidget::clearData(const CentralWidget::ClearDataMode mode) Global::_curveFileDataVtr.clear(); + AnalysisOperationRecorder::_analysisOperationVtr.clear(); + // Set lines visiable false. _line1->setVisible(false); _line2->setVisible(false); @@ -1295,6 +1297,7 @@ void CentralWidget::loadAnalysisData( void CentralWidget::clearAllData() { + Global::_mode = Global::Mode::Analysis; clearData(ClearDataMode::All); }