From 0acf149be729e5a3142824fd8b8515fd5a71dcad Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 17 Aug 2015 13:26:27 +0300 Subject: [PATCH] Load measurements. --HG-- branch : feature --- src/app/valentina/mainwindow.cpp | 90 ++++++++++++++++++++++++++++++++ src/app/valentina/mainwindow.h | 5 ++ src/app/valentina/mainwindow.ui | 20 ++++++- 3 files changed, 114 insertions(+), 1 deletion(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 1c466d4c3..fecf15ce5 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -232,6 +232,62 @@ void MainWindow::InitScenes() qApp->setSceneView(ui->view); } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::LoadMeasurements(const QString &path) +{ + if (path.isEmpty()) + { + return; + } + + VMeasurements *m = nullptr; + try + { + m = new VMeasurements(pattern); + m->setXMLContent(path); + + if (m->Type() == MeasurementsType::Unknown) + { + VException e("Measurement file has unknown format."); + throw e; + } + + if (m->Type() == MeasurementsType::Standard) + { + VDomDocument::ValidateXML(VVSTConverter::CurrentSchema, path); + } + else + { + VDomDocument::ValidateXML(VVITConverter::CurrentSchema, path); + } + + const QStringList mList = m->ListAll(); + const QStringList pList = doc->ListMeasurements(); + + const QSet match = pList.toSet().subtract(mList.toSet()); + if (not match.isEmpty()) + { + VException e("Measurement file doesn't include all required measurements."); + e.AddMoreInformation(QString("Please, additionaly provide: %1") + .arg(QStringList(match.toList()).join(", "))); + throw e; + } + + pattern->ClearVariables(VarType::Measurement); + m->ReadMeasurements(); + delete m; + doc->SetPath(path); + PatternWasModified(false); + doc->LiteParseTree(Document::LiteParse); + } + catch (VException &e) + { + e.CriticalMessageBox(tr("File error."), this); + delete m; + return; + } +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief OptionDraw help change name of pattern piece. @@ -902,6 +958,34 @@ void MainWindow::PrepareSceneList() } } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::LoadIndividual() +{ + const QString filter = tr("Individual measurements (*.vit);;Standard measurements (*.vst)"); + //Use standard path to standard measurements + const QString path = qApp->ValentinaSettings()->GetPathStandardMeasurements(); + const QString mPath = QFileDialog::getOpenFileName(this, tr("Open file"), path, filter); + + if (not mPath.isEmpty()) + { + LoadMeasurements(mPath); + } +} + +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::LoadStandard() +{ + const QString filter = tr("Individual measurements (*.vit);;Standard measurements (*.vst)"); + //Use standard path to individual measurements + const QString path = qApp->ValentinaSettings()->GetPathIndividualMeasurements(); + const QString mPath = QFileDialog::getOpenFileName(this, tr("Open file"), path, filter); + + if (not mPath.isEmpty()) + { + LoadMeasurements(mPath); + } +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ToolBarOption enable option toolbar. @@ -1716,6 +1800,8 @@ void MainWindow::Clear() ui->actionEdit_pattern_code->setEnabled(false); ui->actionLast_tool->setEnabled(false); ui->actionShowCurveDetails->setEnabled(false); + ui->actionLoadIndividual->setEnabled(false); + ui->actionLoadStandard->setEnabled(false); SetEnableTool(false); qApp->setPatternUnit(Unit::Cm); qApp->setPatternType(MeasurementsType::Individual); @@ -1924,6 +2010,8 @@ void MainWindow::SetEnableWidgets(bool enable) ui->actionZoomFitBest->setEnabled(enable); ui->actionZoomOriginal->setEnabled(enable); ui->actionShowCurveDetails->setEnabled(enable); + ui->actionLoadIndividual->setEnabled(enable); + ui->actionLoadStandard->setEnabled(enable); //Now we don't want allow user call context menu sceneDraw->SetDisableTools(!enable, doc->GetNameActivPP()); @@ -2661,6 +2749,8 @@ void MainWindow::CreateActions() connect(ui->actionEdit_pattern_code, &QAction::triggered, this, &MainWindow::EditPatternCode); connect(ui->actionCloseWindow, &QAction::triggered, this, &MainWindow::ResetWindow); connect(ui->actionShowCurveDetails, &QAction::triggered, this, &MainWindow::ActionCurveDetailsMode); + connect(ui->actionLoadIndividual, &QAction::triggered, this, &MainWindow::LoadIndividual); + connect(ui->actionLoadStandard, &QAction::triggered, this, &MainWindow::LoadStandard); connect(ui->actionExportAs, &QAction::triggered, this, &MainWindow::ExportLayoutAs); connect(ui->actionPrintPreview, &QAction::triggered, this, &MainWindow::PrintPreviewOrigin); diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 252316b60..53ed0b530 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -159,6 +159,9 @@ protected: virtual void CleanLayout() Q_DECL_OVERRIDE; virtual void PrepareSceneList() Q_DECL_OVERRIDE; +private slots: + void LoadIndividual(); + void LoadStandard(); private: Q_DISABLE_COPY(MainWindow) /** @brief ui keeps information about user interface */ @@ -282,6 +285,8 @@ private: void AddPP(const QString &PPName); void InitScenes(); + + void LoadMeasurements(const QString &path); }; #endif // MAINWINDOW_H diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index 2869e7103..8581cefc1 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -1085,6 +1085,8 @@ Measurements + + @@ -1854,6 +1856,22 @@ Export original layout + + + false + + + Load Individual ... + + + + + false + + + Load Standard ... + + @@ -1867,8 +1885,8 @@ toolButtonSplinePath - +