diff --git a/src/app/container/vcontainer.cpp b/src/app/container/vcontainer.cpp index 020535ca8..8ecedcae0 100644 --- a/src/app/container/vcontainer.cpp +++ b/src/app/container/vcontainer.cpp @@ -93,7 +93,7 @@ void VContainer::setData(const VContainer &data) qDeleteAll(gObjects); gObjects.clear(); const QHash *obj = data.DataGObjects(); - Q_CHECK_PTR(obj); + SCASSERT(obj != nullptr); QHashIterator i(*obj); while (i.hasNext()) { @@ -331,7 +331,7 @@ template void VContainer::UpdateObject(QHash &obj, const quint32 &id, val point) { Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); - Q_CHECK_PTR(point); + SCASSERT(point != nullptr); point->setId(id); if (gObjects.contains(id)) { @@ -542,7 +542,7 @@ void VContainer::AddLine(const quint32 &firstPointId, const quint32 &secondPoint template quint32 VContainer::AddObject(QHash &obj, val value) { - Q_CHECK_PTR(value); + SCASSERT(value != nullptr); quint32 id = getNextId(); value->setId(id); obj[id] = value; diff --git a/src/app/container/vcontainer.h b/src/app/container/vcontainer.h index 29ff7d00c..75d69e75a 100644 --- a/src/app/container/vcontainer.h +++ b/src/app/container/vcontainer.h @@ -73,7 +73,7 @@ public: try { T obj = dynamic_cast(gObj); - Q_CHECK_PTR(obj); + SCASSERT(obj != nullptr); return obj; } catch (const std::bad_alloc &) diff --git a/src/app/dialogs/app/dialogaboutapp.cpp b/src/app/dialogs/app/dialogaboutapp.cpp index 47d2f8fa2..614f49efa 100644 --- a/src/app/dialogs/app/dialogaboutapp.cpp +++ b/src/app/dialogs/app/dialogaboutapp.cpp @@ -32,8 +32,6 @@ #include #include #include -#include -#include //--------------------------------------------------------------------------------------------------------------------- DialogAboutApp::DialogAboutApp(QWidget *parent) : diff --git a/src/app/dialogs/app/dialoghistory.cpp b/src/app/dialogs/app/dialoghistory.cpp index 5639febce..65c170e12 100644 --- a/src/app/dialogs/app/dialoghistory.cpp +++ b/src/app/dialogs/app/dialoghistory.cpp @@ -153,7 +153,7 @@ void DialogHistory::FillTable() { ui->tableWidget->clear(); const QVector *history = doc->getHistory(); - Q_CHECK_PTR(history); + SCASSERT(history != nullptr); qint32 currentRow = -1; qint32 count = 0; ui->tableWidget->setRowCount(history->size()); @@ -188,7 +188,7 @@ void DialogHistory::FillTable() { cursorRow = currentRow; QTableWidgetItem *item = ui->tableWidget->item(cursorRow, 0); - Q_CHECK_PTR(item); + SCASSERT(item != nullptr); item->setIcon(QIcon("://icon/32x32/put_after.png")); } ui->tableWidget->resizeColumnsToContents(); @@ -290,7 +290,7 @@ QString DialogHistory::Record(const VToolRecord &tool) case Valentina::SplineTool: { const VSpline *spl = data->GeometricObject(tool.getId()); - Q_CHECK_PTR(spl); + SCASSERT(spl != nullptr); const QString splP1Name = data->GeometricObject(spl->GetP1().id())->name(); const QString splP4Name = data->GeometricObject(spl->GetP4().id())->name(); return QString(tr("Curve %1_%2")).arg(splP1Name, splP4Name); @@ -298,14 +298,14 @@ QString DialogHistory::Record(const VToolRecord &tool) case Valentina::ArcTool: { const VArc *arc = data->GeometricObject(tool.getId()); - Q_CHECK_PTR(arc); + SCASSERT(arc != nullptr); const QString arcCenterName = data->GeometricObject(arc->GetCenter().id())->name(); return QString(tr("Arc with center in point %1")).arg(arcCenterName); } case Valentina::SplinePathTool: { const VSplinePath *splPath = data->GeometricObject(tool.getId()); - Q_CHECK_PTR(splPath); + SCASSERT(splPath != nullptr); const QVector points = splPath->GetSplinePath(); QString record; if (points.size() != 0 ) @@ -376,7 +376,7 @@ QString DialogHistory::Record(const VToolRecord &tool) { const quint32 arcId = doc->GetParametrUInt(domElement, VToolCutArc::AttrArc, "0"); const VArc *arc = data->GeometricObject(arcId); - Q_CHECK_PTR(arc); + SCASSERT(arc != nullptr); const QString arcCenterName = data->GeometricObject(arc->GetCenter().id())->name(); const QString toolIdName = data->GeometricObject(tool.getId())->name(); return QString(tr("%1 - cut arc with center %2")).arg(toolIdName, arcCenterName); @@ -385,7 +385,7 @@ QString DialogHistory::Record(const VToolRecord &tool) { const quint32 splineId = doc->GetParametrUInt(domElement, VToolCutSpline::AttrSpline, "0"); const VSpline *spl = data->GeometricObject(splineId); - Q_CHECK_PTR(spl); + SCASSERT(spl != nullptr); const QString toolIdName = data->GeometricObject(tool.getId())->name(); const QString splP1Name = data->GeometricObject(spl->GetP1().id())->name(); const QString splP4Name = data->GeometricObject(spl->GetP4().id())->name(); @@ -395,7 +395,7 @@ QString DialogHistory::Record(const VToolRecord &tool) { const quint32 splinePathId = doc->GetParametrUInt(domElement, VToolCutSplinePath::AttrSplinePath, "0"); const VSplinePath *splPath = data->GeometricObject(splinePathId); - Q_CHECK_PTR(splPath); + SCASSERT(splPath != nullptr); const QVector points = splPath->GetSplinePath(); QString record; if (points.size() != 0 ) diff --git a/src/app/dialogs/app/dialoghistory.h b/src/app/dialogs/app/dialoghistory.h index 971ab7188..7c8fbb2c7 100644 --- a/src/app/dialogs/app/dialoghistory.h +++ b/src/app/dialogs/app/dialoghistory.h @@ -48,6 +48,10 @@ public: virtual ~DialogHistory(); public slots: virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} void cellClicked(int row, int column); void ChangedCursor(quint32 id); void UpdateHistory(); diff --git a/src/app/dialogs/app/dialogincrements.h b/src/app/dialogs/app/dialogincrements.h index d53aab35d..301fbdc9e 100644 --- a/src/app/dialogs/app/dialogincrements.h +++ b/src/app/dialogs/app/dialogincrements.h @@ -48,6 +48,10 @@ public: DialogIncrements(VContainer *data, VPattern *doc, QWidget *parent = nullptr); ~DialogIncrements(); public slots: + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} void clickedToolButtonAdd(); void clickedToolButtonRemove(); void IncrementChanged ( qint32 row, qint32 column ); diff --git a/src/app/dialogs/app/dialogindividualmeasurements.cpp b/src/app/dialogs/app/dialogindividualmeasurements.cpp index 234bdb4b2..e90db6da9 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.cpp +++ b/src/app/dialogs/app/dialogindividualmeasurements.cpp @@ -46,12 +46,12 @@ DialogIndividualMeasurements::DialogIndividualMeasurements(VContainer *data, con { const QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); connect(bOk, &QPushButton::clicked, this, &DialogIndividualMeasurements::DialogAccepted); } { const QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); - Q_CHECK_PTR(bCansel); + SCASSERT(bCansel != nullptr); connect(bCansel, &QPushButton::clicked, this, &DialogIndividualMeasurements::DialogRejected); } @@ -176,7 +176,7 @@ void DialogIndividualMeasurements::CheckState() QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); bOk->setEnabled(flagName && flagPath); } diff --git a/src/app/dialogs/app/dialogpatternproperties.cpp b/src/app/dialogs/app/dialogpatternproperties.cpp index bc0efe0e0..e047c8e0d 100644 --- a/src/app/dialogs/app/dialogpatternproperties.cpp +++ b/src/app/dialogs/app/dialogpatternproperties.cpp @@ -37,7 +37,7 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, QWidget *parent) { ui->setupUi(this); - Q_CHECK_PTR(doc); + SCASSERT(doc != nullptr); QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QApplication::applicationName()); @@ -52,11 +52,11 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, QWidget *parent) ui->plainTextEditTechNotes->setPlainText(this->doc->UniqueTagText("notes")); QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); connect(bOk, &QPushButton::clicked, this, &DialogPatternProperties::Apply); QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); - Q_CHECK_PTR(bCansel); + SCASSERT(bCansel != nullptr); connect(bCansel, &QPushButton::clicked, this, &DialogPatternProperties::close); connect(this, &DialogPatternProperties::haveChange, this->doc, &VPattern::haveLiteChange); diff --git a/src/app/dialogs/app/dialogstandardmeasurements.cpp b/src/app/dialogs/app/dialogstandardmeasurements.cpp index 01d2b10dd..3cce31782 100644 --- a/src/app/dialogs/app/dialogstandardmeasurements.cpp +++ b/src/app/dialogs/app/dialogstandardmeasurements.cpp @@ -42,12 +42,12 @@ DialogStandardMeasurements::DialogStandardMeasurements(VContainer *data, const Q { const QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); connect(bOk, &QPushButton::clicked, this, &DialogStandardMeasurements::DialogAccepted); } { const QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); - Q_CHECK_PTR(bCansel); + SCASSERT(bCansel != nullptr); connect(bCansel, &QPushButton::clicked, this, &DialogStandardMeasurements::DialogRejected); } @@ -121,7 +121,7 @@ void DialogStandardMeasurements::CheckState() bool flagTable = false; { const QComboBox *box = ui->comboBoxTables; - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); if (box->count() > 0 && box->currentIndex() != -1) { flagTable = true; @@ -129,7 +129,7 @@ void DialogStandardMeasurements::CheckState() } QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); bOk->setEnabled(flagTable && flagName); } diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index 28fe46024..fa58cf61c 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -43,12 +43,14 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent) { ui->setupUi(this); labelResultCalculation = ui->labelResultCalculation; - lineEditFormula = ui->lineEditFormula; + plainTextEditFormula = ui->plainTextEditFormula; labelEditFormula = ui->labelEditFormula; + this->formulaBaseHeight=ui->plainTextEditFormula->height(); + flagFormula = false; flagName = false; - InitOkCansel(ui); + InitOkCancelApply(ui); CheckState(); FillComboBoxTypeLine(ui->comboBoxLineType); @@ -60,9 +62,38 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent) connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogAlongLine::PutHere); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogAlongLine::NamePointChanged); connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogAlongLine::EvalFormula); - connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogAlongLine::FormulaChanged); + connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogAlongLine::FormulaTextChanged); + connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogAlongLine::DeployFormulaTextEdit); InitVariables(ui); connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogTool::PutVal); + + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogAlongLine::FormulaTextChanged() +{ + this->FormulaChangedPlainText(); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogAlongLine::DeployFormulaTextEdit() +{ + if (ui->plainTextEditFormula->height() < DIALOGALONLINE_MAX_FORMULA_HEIGHT) + { + ui->plainTextEditFormula->setFixedHeight(DIALOGALONLINE_MAX_FORMULA_HEIGHT); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-next.png"))); + } + else + { + ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -108,13 +139,26 @@ void DialogAlongLine::ChoosedObject(quint32 id, const Valentina::Scenes &type) * @brief DialogAccepted save data and emit signal about closed dialog. */ void DialogAlongLine::DialogAccepted() +{ + this->SaveData(); + emit DialogClosed(QDialog::Accepted); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogAlongLine::DialogApply() +{ + this->SaveData(); + emit DialogApplied(); +} +//--------------------------------------------------------------------------------------------------------------------- +void DialogAlongLine::SaveData() { pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); - formula = ui->lineEditFormula->text(); + formula = ui->plainTextEditFormula->toPlainText(); + formula.replace("\n"," "); firstPointId = getCurrentObjectId(ui->comboBoxFirstPoint); secondPointId = getCurrentObjectId(ui->comboBoxSecondPoint); - emit DialogClosed(QDialog::Accepted); } //--------------------------------------------------------------------------------------------------------------------- @@ -147,7 +191,12 @@ void DialogAlongLine::setFirstPointId(const quint32 &value, const quint32 &id) void DialogAlongLine::setFormula(const QString &value) { formula = qApp->FormulaToUser(value); - ui->lineEditFormula->setText(formula); + // increase height if needed. + if (formula.length() > 80) + { + this->DeployFormulaTextEdit(); + } + ui->plainTextEditFormula->setPlainText(formula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogalongline.h b/src/app/dialogs/tools/dialogalongline.h index 850a702ea..708fca0c2 100644 --- a/src/app/dialogs/tools/dialogalongline.h +++ b/src/app/dialogs/tools/dialogalongline.h @@ -31,6 +31,7 @@ #include "dialogtool.h" +#define DIALOGALONLINE_MAX_FORMULA_HEIGHT 64 namespace Ui { class DialogAlongLine; @@ -62,6 +63,18 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(); + /** + * @brief DeployFormulaTextEdit grow or shrink formula input + */ + void DeployFormulaTextEdit(); + /** + * @brief FormulaTextChanged when formula text changes for validation and calc + */ + void FormulaTextChanged(); private: Q_DISABLE_COPY(DialogAlongLine) @@ -85,6 +98,14 @@ private: /** @brief secondPointId id second point of line */ quint32 secondPointId; + + /** @brief formulaBaseHeight base height defined by dialogui */ + int formulaBaseHeight; + + /** + * @brief SaveData Put dialog data in local variables + */ + void SaveData(); }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogalongline.ui b/src/app/dialogs/tools/dialogalongline.ui index 9113f9e04..5bf4d8691 100644 --- a/src/app/dialogs/tools/dialogalongline.ui +++ b/src/app/dialogs/tools/dialogalongline.ui @@ -74,11 +74,17 @@ - - - Formula for the calculation of length of line + + + Qt::Horizontal - + + + 40 + 20 + + + @@ -150,6 +156,55 @@ + + + + + + + 16777215 + 24 + + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + :/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png:/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png + + + + 16 + 16 + + + + true + + + + + @@ -390,14 +445,13 @@ Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - lineEditFormula toolButtonEqual lineEditNamePoint comboBoxFirstPoint @@ -414,6 +468,7 @@ + diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp index 3e773f20c..00e8e1de7 100644 --- a/src/app/dialogs/tools/dialogarc.cpp +++ b/src/app/dialogs/tools/dialogarc.cpp @@ -53,7 +53,7 @@ DialogArc::DialogArc(const VContainer *data, QWidget *parent) timerF2 = new QTimer(this); connect(timerF2, &QTimer::timeout, this, &DialogArc::EvalF2); - InitOkCansel(ui); + InitOkCancel(ui); FillComboBoxPoints(ui->comboBoxBasePoint); @@ -250,7 +250,7 @@ void DialogArc::F2Changed() */ void DialogArc::CheckState() { - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); bOk->setEnabled(flagRadius && flagF1 && flagF2); } @@ -294,7 +294,7 @@ void DialogArc::ShowLineAngles() ui->listWidget->clear(); connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogArc::ValChenged); const QHash *lineAnglesTable = data->DataLineAngles(); - Q_CHECK_PTR(lineAnglesTable); + SCASSERT(lineAnglesTable != nullptr); QHashIterator i(*lineAnglesTable); while (i.hasNext()) { diff --git a/src/app/dialogs/tools/dialogarc.h b/src/app/dialogs/tools/dialogarc.h index 667065cb6..2a0f9781a 100644 --- a/src/app/dialogs/tools/dialogarc.h +++ b/src/app/dialogs/tools/dialogarc.h @@ -60,6 +60,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} virtual void ValChenged(int row); void PutRadius(); void PutF1(); diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index ec59cd269..30afe5795 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -44,10 +44,13 @@ DialogBisector::DialogBisector(const VContainer *data, QWidget *parent) ui->setupUi(this); InitVariables(ui); labelResultCalculation = ui->labelResultCalculation; - lineEditFormula = ui->lineEditFormula; + plainTextEditFormula = ui->plainTextEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; - InitOkCansel(ui); + + this->formulaBaseHeight=ui->plainTextEditFormula->height(); + + InitOkCancelApply(ui); flagFormula = false; flagName = false; CheckState(); @@ -62,7 +65,36 @@ DialogBisector::DialogBisector(const VContainer *data, QWidget *parent) connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogBisector::EvalFormula); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogBisector::NamePointChanged); - connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogBisector::FormulaChanged); + connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogBisector::FormulaTextChanged); + connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogBisector::DeployFormulaTextEdit); + + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogBisector::FormulaTextChanged() +{ + this->FormulaChangedPlainText(); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogBisector::DeployFormulaTextEdit() +{ + if (ui->plainTextEditFormula->height() < DIALOGBISECTOR_MAX_FORMULA_HEIGHT) + { + ui->plainTextEditFormula->setFixedHeight(DIALOGBISECTOR_MAX_FORMULA_HEIGHT); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-next.png"))); + } + else + { + ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -151,7 +183,12 @@ void DialogBisector::setTypeLine(const QString &value) void DialogBisector::setFormula(const QString &value) { formula = qApp->FormulaToUser(value); - ui->lineEditFormula->setText(formula); + // increase height if needed. + if (formula.length() > 80) + { + this->DeployFormulaTextEdit(); + } + ui->plainTextEditFormula->setPlainText(formula); } //--------------------------------------------------------------------------------------------------------------------- @@ -192,12 +229,25 @@ void DialogBisector::setThirdPointId(const quint32 &value, const quint32 &id) * @brief DialogAccepted save data and emit signal about closed dialog. */ void DialogBisector::DialogAccepted() +{ + this->SaveData(); + emit DialogClosed(QDialog::Accepted); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogBisector::DialogApply() +{ + this->SaveData(); + emit DialogApplied(); +} +//--------------------------------------------------------------------------------------------------------------------- +void DialogBisector::SaveData() { pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); - formula = ui->lineEditFormula->text(); + formula = ui->plainTextEditFormula->toPlainText(); + formula.replace("\n"," "); firstPointId = getCurrentObjectId(ui->comboBoxFirstPoint); secondPointId = getCurrentObjectId(ui->comboBoxSecondPoint); thirdPointId = getCurrentObjectId(ui->comboBoxThirdPoint); - emit DialogClosed(QDialog::Accepted); } diff --git a/src/app/dialogs/tools/dialogbisector.h b/src/app/dialogs/tools/dialogbisector.h index 99ce110f4..974a94e31 100644 --- a/src/app/dialogs/tools/dialogbisector.h +++ b/src/app/dialogs/tools/dialogbisector.h @@ -31,6 +31,7 @@ #include "dialogtool.h" +#define DIALOGBISECTOR_MAX_FORMULA_HEIGHT 64 namespace Ui { class DialogBisector; @@ -67,6 +68,18 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(); + /** + * @brief DeployFormulaTextEdit grow or shrink formula input + */ + void DeployFormulaTextEdit(); + /** + * @brief FormulaTextChanged when formula text changes for validation and calc + */ + void FormulaTextChanged(); private: Q_DISABLE_COPY(DialogBisector) @@ -93,6 +106,14 @@ private: /** @brief thirdPointId id of third point */ quint32 thirdPointId; + + /** @brief formulaBaseHeight base height defined by dialogui */ + int formulaBaseHeight; + + /** + * @brief SaveData Put dialog data in local variables + */ + void SaveData(); }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogbisector.ui b/src/app/dialogs/tools/dialogbisector.ui index 1c5221267..5c634c8aa 100644 --- a/src/app/dialogs/tools/dialogbisector.ui +++ b/src/app/dialogs/tools/dialogbisector.ui @@ -71,17 +71,17 @@ - - - - 0 - 0 - + + + Qt::Horizontal - - Calculation of length of bisector by using the formula + + + 40 + 20 + - + @@ -147,6 +147,54 @@ + + + + + + + 16777215 + 24 + + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + + + + 16 + 16 + + + + true + + + + + @@ -429,14 +477,13 @@ Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - lineEditFormula lineEditNamePoint comboBoxFirstPoint comboBoxSecondPoint diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index 0a43e7e6d..bf7e0f873 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -41,14 +41,15 @@ DialogCutArc::DialogCutArc(const VContainer *data, QWidget *parent) : ui->setupUi(this); InitVariables(ui); labelResultCalculation = ui->labelResultCalculation; - lineEditFormula = ui->lineEditFormula; + plainTextEditFormula = ui->plainTextEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; - InitOkCansel(ui); + InitOkCancelApply(ui); flagFormula = false; flagName = false; CheckState(); + this->formulaBaseHeight=ui->plainTextEditFormula->height(); FillComboBoxArcs(ui->comboBoxArc); @@ -57,7 +58,36 @@ DialogCutArc::DialogCutArc(const VContainer *data, QWidget *parent) : connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogCutArc::EvalFormula); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogCutArc::NamePointChanged); - connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogCutArc::FormulaChanged); + connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCutArc::FormulaTextChanged); + connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutArc::DeployFormulaTextEdit); + + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogCutArc::FormulaTextChanged() +{ + this->FormulaChangedPlainText(); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogCutArc::DeployFormulaTextEdit() +{ + if (ui->plainTextEditFormula->height() < DIALOGCUTARC_MAX_FORMULA_HEIGHT) + { + ui->plainTextEditFormula->setFixedHeight(DIALOGCUTARC_MAX_FORMULA_HEIGHT); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-next.png"))); + } + else + { + ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -89,12 +119,25 @@ void DialogCutArc::ChoosedObject(quint32 id, const Valentina::Scenes &type) */ void DialogCutArc::DialogAccepted() { - pointName = ui->lineEditNamePoint->text(); - formula = ui->lineEditFormula->text(); - arcId = getCurrentObjectId(ui->comboBoxArc); + this->SaveData(); emit DialogClosed(QDialog::Accepted); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogCutArc::DialogApply() +{ + this->SaveData(); + emit DialogApplied(); +} +//--------------------------------------------------------------------------------------------------------------------- +void DialogCutArc::SaveData() +{ + pointName = ui->lineEditNamePoint->text(); + formula = ui->plainTextEditFormula->toPlainText(); + formula.replace("\n"," "); + arcId = getCurrentObjectId(ui->comboBoxArc); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief setArcId set id of arc @@ -114,7 +157,12 @@ void DialogCutArc::setArcId(const quint32 &value, const quint32 &id) void DialogCutArc::setFormula(const QString &value) { formula = qApp->FormulaToUser(value); - ui->lineEditFormula->setText(formula); + // increase height if needed. + if (formula.length() > 80) + { + this->DeployFormulaTextEdit(); + } + ui->plainTextEditFormula->setPlainText(formula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogcutarc.h b/src/app/dialogs/tools/dialogcutarc.h index ece152ef9..9fceca34d 100644 --- a/src/app/dialogs/tools/dialogcutarc.h +++ b/src/app/dialogs/tools/dialogcutarc.h @@ -31,6 +31,7 @@ #include "dialogtool.h" +#define DIALOGCUTARC_MAX_FORMULA_HEIGHT 64 namespace Ui { class DialogCutArc; @@ -43,6 +44,7 @@ class DialogCutArc : public DialogTool { Q_OBJECT public: + DialogCutArc(const VContainer *data, QWidget *parent = nullptr); ~DialogCutArc(); @@ -57,6 +59,18 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(); + /** + * @brief DeployFormulaTextEdit grow or shrink formula input + */ + void DeployFormulaTextEdit(); + /** + * @brief FormulaTextChanged when formula text changes for validation and calc + */ + void FormulaTextChanged(); private: Q_DISABLE_COPY(DialogCutArc) /** @brief ui keeps information about user interface */ @@ -70,6 +84,13 @@ private: /** @brief arcId keep id of arc */ quint32 arcId; + + /** @brief formulaBaseHeight base height defined by dialogui */ + int formulaBaseHeight; + /** + * @brief SaveData Put dialog data in local variables + */ + void SaveData(); }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogcutarc.ui b/src/app/dialogs/tools/dialogcutarc.ui index bfbff85fa..c79294e69 100644 --- a/src/app/dialogs/tools/dialogcutarc.ui +++ b/src/app/dialogs/tools/dialogcutarc.ui @@ -67,17 +67,17 @@ - - - - 0 - 0 - + + + Qt::Horizontal - - Formula for the calculation of the spline + + + 40 + 20 + - + @@ -140,6 +140,56 @@ + + + + + + + 16777215 + 24 + + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + + + + + + 16 + 16 + + + + true + + + + + @@ -353,7 +403,7 @@ Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp index 43dc0d012..4c035ba60 100644 --- a/src/app/dialogs/tools/dialogcutspline.cpp +++ b/src/app/dialogs/tools/dialogcutspline.cpp @@ -44,7 +44,7 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, QWidget *parent) lineEditFormula = ui->lineEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; - InitOkCansel(ui); + InitOkCancel(ui); flagFormula = false; flagName = false; diff --git a/src/app/dialogs/tools/dialogcutspline.h b/src/app/dialogs/tools/dialogcutspline.h index 455b127ff..20ef63fa0 100644 --- a/src/app/dialogs/tools/dialogcutspline.h +++ b/src/app/dialogs/tools/dialogcutspline.h @@ -57,6 +57,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} private: Q_DISABLE_COPY(DialogCutSpline) diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp index 7de7b87db..803d75738 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp @@ -46,7 +46,7 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, QWidget *parent labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; - InitOkCansel(ui); + InitOkCancel(ui); flagFormula = false; flagName = false; CheckState(); diff --git a/src/app/dialogs/tools/dialogcutsplinepath.h b/src/app/dialogs/tools/dialogcutsplinepath.h index 06baa4d2a..a93c2c2bc 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.h +++ b/src/app/dialogs/tools/dialogcutsplinepath.h @@ -57,6 +57,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} private: Q_DISABLE_COPY(DialogCutSplinePath) diff --git a/src/app/dialogs/tools/dialogdetail.cpp b/src/app/dialogs/tools/dialogdetail.cpp index ab20e9b45..23b1c3dd7 100644 --- a/src/app/dialogs/tools/dialogdetail.cpp +++ b/src/app/dialogs/tools/dialogdetail.cpp @@ -44,10 +44,10 @@ DialogDetail::DialogDetail(const VContainer *data, QWidget *parent) labelEditNamePoint = ui.labelEditNameDetail; bOk = ui.buttonBox->button(QDialogButtonBox::Ok); - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); connect(bOk, &QPushButton::clicked, this, &DialogTool::DialogAccepted); QPushButton *bCansel = ui.buttonBox->button(QDialogButtonBox::Cancel); - Q_CHECK_PTR(bCansel); + SCASSERT(bCansel != nullptr); connect(bCansel, &QPushButton::clicked, this, &DialogTool::DialogRejected); flagName = true;//We have default name of detail. @@ -217,7 +217,7 @@ void DialogDetail::BiasXChanged(qreal d) { qint32 row = ui.listWidget->currentRow(); QListWidgetItem *item = ui.listWidget->item( row ); - Q_CHECK_PTR(item); + SCASSERT(item != nullptr); VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); node.setMx(qApp->toPixel(d)); item->setData(Qt::UserRole, QVariant::fromValue(node)); @@ -232,7 +232,7 @@ void DialogDetail::BiasYChanged(qreal d) { qint32 row = ui.listWidget->currentRow(); QListWidgetItem *item = ui.listWidget->item( row ); - Q_CHECK_PTR(item); + SCASSERT(item != nullptr); VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); node.setMy(qApp->toPixel(d)); item->setData(Qt::UserRole, QVariant::fromValue(node)); diff --git a/src/app/dialogs/tools/dialogdetail.h b/src/app/dialogs/tools/dialogdetail.h index adcf69a34..227fda868 100644 --- a/src/app/dialogs/tools/dialogdetail.h +++ b/src/app/dialogs/tools/dialogdetail.h @@ -46,6 +46,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} void BiasXChanged(qreal d); void BiasYChanged(qreal d); void ClickedSeams(bool checked); diff --git a/src/app/dialogs/tools/dialogeditwrongformula.cpp b/src/app/dialogs/tools/dialogeditwrongformula.cpp index f82e5ef4b..71d20c0c3 100644 --- a/src/app/dialogs/tools/dialogeditwrongformula.cpp +++ b/src/app/dialogs/tools/dialogeditwrongformula.cpp @@ -41,7 +41,7 @@ DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, QWidget * lineEditFormula = ui->lineEditFormula; labelEditFormula = ui->labelFormula; - InitOkCansel(ui); + InitOkCancel(ui); flagFormula = false; CheckState(); @@ -85,7 +85,7 @@ void DialogEditWrongFormula::DialogRejected() //--------------------------------------------------------------------------------------------------------------------- void DialogEditWrongFormula::CheckState() { - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); bOk->setEnabled(flagFormula); } diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 88dac3ec4..6fc808beb 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -44,11 +44,13 @@ DialogEndLine::DialogEndLine(const VContainer *data, QWidget *parent) ui->setupUi(this); InitVariables(ui); labelResultCalculation = ui->labelResultCalculation; - lineEditFormula = ui->lineEditFormula; + plainTextEditFormula = ui->plainTextEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; - InitOkCansel(ui); + this->formulaBaseHeight=ui->plainTextEditFormula->height(); + + InitOkCancelApply(ui); flagFormula = false; flagName = false; CheckState(); @@ -62,7 +64,37 @@ DialogEndLine::DialogEndLine(const VContainer *data, QWidget *parent) connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogEndLine::PutVal); connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogEndLine::EvalFormula); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogEndLine::NamePointChanged); - connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogEndLine::FormulaChanged); + connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogEndLine::FormulaTextChanged); + connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogEndLine::DeployFormulaTextEdit); + + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); + +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogEndLine::FormulaTextChanged() +{ + this->FormulaChangedPlainText(); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogEndLine::DeployFormulaTextEdit() +{ + if (ui->plainTextEditFormula->height() < DIALOGENDLINE_MAX_FORMULA_HEIGHT) + { + ui->plainTextEditFormula->setFixedHeight(DIALOGENDLINE_MAX_FORMULA_HEIGHT); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-next.png"))); + } + else + { + ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -112,7 +144,16 @@ void DialogEndLine::setTypeLine(const QString &value) void DialogEndLine::setFormula(const QString &value) { formula = qApp->FormulaToUser(value); - ui->lineEditFormula->setText(formula); + // increase height if needed. TODO : see if I can get the max number of caracters in one line + // of this PlainTextEdit to change 80 to this value + if (formula.length() > 80) + { + this->DeployFormulaTextEdit(); + } + ui->plainTextEditFormula->setPlainText(formula); + //QTextCursor cursor = ui->plainTextEditFormula->textCursor(); + //cursor.insertText(value); + //ui->plainTextEditFormula->setCursor(cursor); } //--------------------------------------------------------------------------------------------------------------------- @@ -142,13 +183,26 @@ void DialogEndLine::setBasePointId(const quint32 &value, const quint32 &id) * @brief DialogAccepted save data and emit signal about closed dialog. */ void DialogEndLine::DialogAccepted() +{ + this->SaveData(); + emit DialogClosed(QDialog::Accepted); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogEndLine::DialogApply() +{ + this->SaveData(); + emit DialogApplied(); +} +//--------------------------------------------------------------------------------------------------------------------- +void DialogEndLine::SaveData() { pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); - formula = ui->lineEditFormula->text(); + formula = ui->plainTextEditFormula->toPlainText(); + formula.replace("\n"," "); angle = ui->doubleSpinBoxAngle->value(); basePointId = getCurrentObjectId(ui->comboBoxBasePoint); - emit DialogClosed(QDialog::Accepted); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogendline.h b/src/app/dialogs/tools/dialogendline.h index 55fb4cdff..7cba81c13 100644 --- a/src/app/dialogs/tools/dialogendline.h +++ b/src/app/dialogs/tools/dialogendline.h @@ -31,6 +31,8 @@ #include "dialogtool.h" + +#define DIALOGENDLINE_MAX_FORMULA_HEIGHT 64 namespace Ui { class DialogEndLine; @@ -63,6 +65,18 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(); + /** + * @brief DeployFormulaTextEdit grow or shrink formula input + */ + void DeployFormulaTextEdit(); + /** + * @brief FormulaTextChanged when formula text changes for validation and calc + */ + void FormulaTextChanged(); private: Q_DISABLE_COPY(DialogEndLine) @@ -83,6 +97,13 @@ private: /** @brief basePointId id base point of line */ quint32 basePointId; + /** @brief formulaBaseHeight base height defined by dialogui */ + int formulaBaseHeight; + + /** + * @brief SaveData Put dialog data in local variables + */ + void SaveData(); }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogendline.ui b/src/app/dialogs/tools/dialogendline.ui index 1b88dd92b..12be8bf7a 100644 --- a/src/app/dialogs/tools/dialogendline.ui +++ b/src/app/dialogs/tools/dialogendline.ui @@ -6,8 +6,8 @@ 0 0 - 584 - 718 + 486 + 586 @@ -80,17 +80,17 @@ - - - - 0 - 0 - + + + Qt::Horizontal - - Formula for calculation of length of line + + + 40 + 20 + - + @@ -153,6 +153,58 @@ + + + + + + + 16777215 + 24 + + + + + 4 + 0 + + + + QPlainTextEdit::NoWrap + + + + + + + + 16 + 16 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + :/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png:/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png + + + + 16 + 16 + + + + true + + + + + @@ -594,14 +646,13 @@ Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - lineEditFormula comboBoxBasePoint lineEditNamePoint doubleSpinBoxAngle @@ -626,6 +677,7 @@ + diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index 7a6b80b32..0cfe458a8 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -43,7 +43,7 @@ DialogHeight::DialogHeight(const VContainer *data, QWidget *parent) { ui->setupUi(this); labelEditNamePoint = ui->labelEditNamePoint; - InitOkCansel(ui); + InitOkCancel(ui); flagName = false; CheckState(); diff --git a/src/app/dialogs/tools/dialogheight.h b/src/app/dialogs/tools/dialogheight.h index fe3a1c498..25f443cf0 100644 --- a/src/app/dialogs/tools/dialogheight.h +++ b/src/app/dialogs/tools/dialogheight.h @@ -63,6 +63,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} private: Q_DISABLE_COPY(DialogHeight) diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp index 6682ca5a1..c87b5a912 100644 --- a/src/app/dialogs/tools/dialogline.cpp +++ b/src/app/dialogs/tools/dialogline.cpp @@ -41,7 +41,7 @@ DialogLine::DialogLine(const VContainer *data, QWidget *parent) :DialogTool(data, parent), ui(new Ui::DialogLine), number(0), firstPoint(0), secondPoint(0), typeLine(QString()) { ui->setupUi(this); - InitOkCansel(ui); + InitOkCancel(ui); FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxSecondPoint); diff --git a/src/app/dialogs/tools/dialogline.h b/src/app/dialogs/tools/dialogline.h index ce22b1ff7..62b61d918 100644 --- a/src/app/dialogs/tools/dialogline.h +++ b/src/app/dialogs/tools/dialogline.h @@ -57,6 +57,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} private: Q_DISABLE_COPY(DialogLine) diff --git a/src/app/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp index 8dd42b279..469467efb 100644 --- a/src/app/dialogs/tools/dialoglineintersect.cpp +++ b/src/app/dialogs/tools/dialoglineintersect.cpp @@ -43,7 +43,7 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, QWidget *parent { ui->setupUi(this); number = 0; - InitOkCansel(ui); + InitOkCancel(ui); labelEditNamePoint = ui->labelEditNamePoint; flagName = false; @@ -208,7 +208,7 @@ void DialogLineIntersect::P2Line2Changed(int index) */ void DialogLineIntersect::CheckState() { - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); bOk->setEnabled(flagName && flagPoint); } diff --git a/src/app/dialogs/tools/dialoglineintersect.h b/src/app/dialogs/tools/dialoglineintersect.h index 91775f608..be7f400f6 100644 --- a/src/app/dialogs/tools/dialoglineintersect.h +++ b/src/app/dialogs/tools/dialoglineintersect.h @@ -63,6 +63,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} void P1Line1Changed( int index); void P2Line1Changed( int index); void P1Line2Changed( int index); diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 1f4f57ebc..dfe72aa7f 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -44,10 +44,12 @@ DialogNormal::DialogNormal(const VContainer *data, QWidget *parent) ui->setupUi(this); InitVariables(ui); labelResultCalculation = ui->labelResultCalculation; - lineEditFormula = ui->lineEditFormula; + plainTextEditFormula = ui->plainTextEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; - InitOkCansel(ui); + InitOkCancelApply(ui); + + this->formulaBaseHeight=ui->plainTextEditFormula->height(); flagFormula = false; flagName = false; @@ -63,7 +65,34 @@ DialogNormal::DialogNormal(const VContainer *data, QWidget *parent) connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogNormal::PutVal); connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogNormal::EvalFormula); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogNormal::NamePointChanged); - connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogNormal::FormulaChanged); + connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogNormal::FormulaTextChanged); + connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogNormal::DeployFormulaTextEdit); + + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogNormal::FormulaTextChanged() +{ + this->FormulaChangedPlainText(); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogNormal::DeployFormulaTextEdit() +{ + if (ui->plainTextEditFormula->height() < DIALOGNORMAL_MAX_FORMULA_HEIGHT) + { + ui->plainTextEditFormula->setFixedHeight(DIALOGNORMAL_MAX_FORMULA_HEIGHT); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next")); + } + else + { + ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down")); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -109,14 +138,27 @@ void DialogNormal::ChoosedObject(quint32 id, const Valentina::Scenes &type) * @brief DialogAccepted save data and emit signal about closed dialog. */ void DialogNormal::DialogAccepted() +{ + this->SaveData(); + emit DialogClosed(QDialog::Accepted); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogNormal::DialogApply() +{ + this->SaveData(); + emit DialogApplied(); +} +//--------------------------------------------------------------------------------------------------------------------- +void DialogNormal::SaveData() { pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); - formula = ui->lineEditFormula->text(); + formula = ui->plainTextEditFormula->toPlainText(); + formula.replace("\n"," "); angle = ui->doubleSpinBoxAngle->value(); firstPointId = getCurrentObjectId(ui->comboBoxFirstPoint); secondPointId = getCurrentObjectId(ui->comboBoxSecondPoint); - emit DialogClosed(QDialog::Accepted); } //--------------------------------------------------------------------------------------------------------------------- @@ -160,7 +202,12 @@ void DialogNormal::setAngle(const qreal &value) void DialogNormal::setFormula(const QString &value) { formula = qApp->FormulaToUser(value); - ui->lineEditFormula->setText(formula); + // increase height if needed. + if (formula.length() > 80) + { + this->DeployFormulaTextEdit(); + } + ui->plainTextEditFormula->setPlainText(formula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialognormal.h b/src/app/dialogs/tools/dialognormal.h index a3c29a207..f575fd33f 100644 --- a/src/app/dialogs/tools/dialognormal.h +++ b/src/app/dialogs/tools/dialognormal.h @@ -31,6 +31,7 @@ #include "dialogtool.h" +#define DIALOGNORMAL_MAX_FORMULA_HEIGHT 64 namespace Ui { class DialogNormal; @@ -66,6 +67,18 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(); + /** + * @brief DeployFormulaTextEdit grow or shrink formula input + */ + void DeployFormulaTextEdit(); + /** + * @brief FormulaTextChanged when formula text changes for validation and calc + */ + void FormulaTextChanged(); private: Q_DISABLE_COPY(DialogNormal) @@ -92,6 +105,13 @@ private: /** @brief secondPointId id second point of line */ quint32 secondPointId; + /** @brief formulaBaseHeight base height defined by dialogui */ + int formulaBaseHeight; + + /** + * @brief SaveData Put dialog data in local variables + */ + void SaveData(); }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialognormal.ui b/src/app/dialogs/tools/dialognormal.ui index 781fd810d..a135ba36a 100644 --- a/src/app/dialogs/tools/dialognormal.ui +++ b/src/app/dialogs/tools/dialognormal.ui @@ -74,17 +74,17 @@ - - - - 0 - 0 - + + + Qt::Horizontal - - Formula for calculation of length of normal + + + 40 + 20 + - + @@ -150,6 +150,56 @@ + + + + + + + 16777215 + 24 + + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + + + + + + 16 + 16 + + + + true + + + + + @@ -601,14 +651,13 @@ Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - lineEditFormula lineEditNamePoint comboBoxFirstPoint comboBoxSecondPoint diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index 67c3d0d64..cd99125d5 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -37,60 +37,93 @@ * @param parent parent widget */ DialogPointOfContact::DialogPointOfContact(const VContainer *data, QWidget *parent) - :DialogTool(data, parent), ui(), number(0), pointName(QString()), radius(QString()), center(0), + :DialogTool(data, parent), ui(new Ui::DialogPointOfContact), number(0), pointName(QString()), radius(QString()), center(0), firstPoint(0), secondPoint(0) { - ui.setupUi(this); - listWidget = ui.listWidget; - labelResultCalculation = ui.labelResultCalculation; - labelDescription = ui.labelDescription; - radioButtonSizeGrowth = ui.radioButtonSizeGrowth; - radioButtonStandardTable = ui.radioButtonStandardTable; - radioButtonIncrements = ui.radioButtonIncrements; - radioButtonLengthLine = ui.radioButtonLengthLine; - radioButtonLengthArc = ui.radioButtonLengthArc; - radioButtonLengthCurve = ui.radioButtonLengthSpline; - lineEditFormula = ui.lineEditFormula; - labelEditFormula = ui.labelEditFormula; - labelEditNamePoint = ui.labelEditNamePoint; + ui->setupUi(this); + InitVariables(ui); + listWidget = ui->listWidget; + labelResultCalculation = ui->labelResultCalculation; + labelDescription = ui->labelDescription; + radioButtonSizeGrowth = ui->radioButtonSizeGrowth; + radioButtonStandardTable = ui->radioButtonStandardTable; + radioButtonIncrements = ui->radioButtonIncrements; + radioButtonLengthLine = ui->radioButtonLengthLine; + radioButtonLengthArc = ui->radioButtonLengthArc; + radioButtonLengthCurve = ui->radioButtonLengthSpline; + plainTextEditFormula = ui->plainTextEditFormula; + labelEditFormula = ui->labelEditFormula; + labelEditNamePoint = ui->labelEditNamePoint; - bOk = ui.buttonBox->button(QDialogButtonBox::Ok); - Q_CHECK_PTR(bOk); + this->formulaBaseHeight=ui->plainTextEditFormula->height(); + InitOkCancelApply(ui); + + /* bOk = ui.buttonBox->button(QDialogButtonBox::Ok); + SCASSERT(bOk != nullptr); connect(bOk, &QPushButton::clicked, this, &DialogTool::DialogAccepted); QPushButton *bCansel = ui.buttonBox->button(QDialogButtonBox::Cancel); - Q_CHECK_PTR(bCansel); + SCASSERT(bCansel != nullptr); connect(bCansel, &QPushButton::clicked, this, &DialogTool::DialogRejected); - + */ flagFormula = false; flagName = false; CheckState(); - FillComboBoxPoints(ui.comboBoxCenter); - FillComboBoxPoints(ui.comboBoxFirstPoint); - FillComboBoxPoints(ui.comboBoxSecondPoint); + FillComboBoxPoints(ui->comboBoxCenter); + FillComboBoxPoints(ui->comboBoxFirstPoint); + FillComboBoxPoints(ui->comboBoxSecondPoint); - connect(ui.toolButtonPutHere, &QPushButton::clicked, this, &DialogPointOfContact::PutHere); - connect(ui.listWidget, &QListWidget::itemDoubleClicked, this, &DialogPointOfContact::PutVal); - connect(ui.listWidget, &QListWidget::currentRowChanged, this, &DialogPointOfContact::ValChenged); + connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogPointOfContact::PutHere); + connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogPointOfContact::PutVal); + connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogPointOfContact::ValChenged); if (qApp->patternType() == Pattern::Standard) { SizeHeight(); - connect(ui.radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogTool::SizeHeight); + connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogTool::SizeHeight); } else { radioButtonSizeGrowth->setVisible(false); Measurements(); } - connect(ui.radioButtonStandardTable, &QRadioButton::clicked, this, &DialogPointOfContact::Measurements); - connect(ui.radioButtonIncrements, &QRadioButton::clicked, this, &DialogPointOfContact::Increments); - connect(ui.radioButtonLengthLine, &QRadioButton::clicked, this, &DialogPointOfContact::LengthLines); - connect(ui.radioButtonLengthArc, &QRadioButton::clicked, this, &DialogPointOfContact::LengthArcs); - connect(ui.radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogPointOfContact::LengthCurves); - connect(ui.toolButtonEqual, &QPushButton::clicked, this, &DialogPointOfContact::EvalFormula); - connect(ui.lineEditNamePoint, &QLineEdit::textChanged, this, &DialogPointOfContact::NamePointChanged); - connect(ui.lineEditFormula, &QLineEdit::textChanged, this, &DialogPointOfContact::FormulaChanged); + connect(ui->radioButtonStandardTable, &QRadioButton::clicked, this, &DialogPointOfContact::Measurements); + connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogPointOfContact::Increments); + connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogPointOfContact::LengthLines); + connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogPointOfContact::LengthArcs); + connect(ui->radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogPointOfContact::LengthCurves); + connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogPointOfContact::EvalFormula); + connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogPointOfContact::NamePointChanged); + connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogPointOfContact::FormulaTextChanged); + connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogPointOfContact::DeployFormulaTextEdit); + + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointOfContact::FormulaTextChanged() +{ + this->FormulaChangedPlainText(); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointOfContact::DeployFormulaTextEdit() +{ + if (ui->plainTextEditFormula->height() < DIALOGPOINTOFCONTACT_MAX_FORMULA_HEIGHT) + { + ui->plainTextEditFormula->setFixedHeight(DIALOGPOINTOFCONTACT_MAX_FORMULA_HEIGHT); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-next.png"))); + } + else + { + ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -106,10 +139,10 @@ void DialogPointOfContact::ChoosedObject(quint32 id, const Valentina::Scenes &ty const VPointF *point = data->GeometricObject(id); if (number == 0) { - qint32 index = ui.comboBoxFirstPoint->findText(point->name()); + qint32 index = ui->comboBoxFirstPoint->findText(point->name()); if ( index != -1 ) { // -1 for not found - ui.comboBoxFirstPoint->setCurrentIndex(index); + ui->comboBoxFirstPoint->setCurrentIndex(index); number++; emit ToolTip(tr("Select second point of line")); return; @@ -117,10 +150,10 @@ void DialogPointOfContact::ChoosedObject(quint32 id, const Valentina::Scenes &ty } if (number == 1) { - qint32 index = ui.comboBoxSecondPoint->findText(point->name()); + qint32 index = ui->comboBoxSecondPoint->findText(point->name()); if ( index != -1 ) { // -1 for not found - ui.comboBoxSecondPoint->setCurrentIndex(index); + ui->comboBoxSecondPoint->setCurrentIndex(index); number++; emit ToolTip(tr("Select point of center of arc")); return; @@ -128,10 +161,10 @@ void DialogPointOfContact::ChoosedObject(quint32 id, const Valentina::Scenes &ty } if (number == 2) { - qint32 index = ui.comboBoxCenter->findText(point->name()); + qint32 index = ui->comboBoxCenter->findText(point->name()); if ( index != -1 ) { // -1 for not found - ui.comboBoxCenter->setCurrentIndex(index); + ui->comboBoxCenter->setCurrentIndex(index); number = 0; emit ToolTip(""); } @@ -149,14 +182,27 @@ void DialogPointOfContact::ChoosedObject(quint32 id, const Valentina::Scenes &ty */ void DialogPointOfContact::DialogAccepted() { - pointName = ui.lineEditNamePoint->text(); - radius = ui.lineEditFormula->text(); - center = getCurrentObjectId(ui.comboBoxCenter); - firstPoint = getCurrentObjectId(ui.comboBoxFirstPoint); - secondPoint = getCurrentObjectId(ui.comboBoxSecondPoint); + this->SaveData(); emit DialogClosed(QDialog::Accepted); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointOfContact::DialogApply() +{ + this->SaveData(); + emit DialogApplied(); +} +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointOfContact::SaveData() +{ + pointName = ui->lineEditNamePoint->text(); + radius = ui->plainTextEditFormula->toPlainText(); + radius.replace("\n"," "); + center = getCurrentObjectId(ui->comboBoxCenter); + firstPoint = getCurrentObjectId(ui->comboBoxFirstPoint); + secondPoint = getCurrentObjectId(ui->comboBoxSecondPoint); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief setSecondPoint set id second point @@ -165,7 +211,7 @@ void DialogPointOfContact::DialogAccepted() */ void DialogPointOfContact::setSecondPoint(const quint32 &value, const quint32 &id) { - setCurrentPointId(ui.comboBoxSecondPoint, secondPoint, value, id); + setCurrentPointId(ui->comboBoxSecondPoint, secondPoint, value, id); } //--------------------------------------------------------------------------------------------------------------------- @@ -176,7 +222,7 @@ void DialogPointOfContact::setSecondPoint(const quint32 &value, const quint32 &i */ void DialogPointOfContact::setFirstPoint(const quint32 &value, const quint32 &id) { - setCurrentPointId(ui.comboBoxFirstPoint, firstPoint, value, id); + setCurrentPointId(ui->comboBoxFirstPoint, firstPoint, value, id); } //--------------------------------------------------------------------------------------------------------------------- @@ -187,7 +233,7 @@ void DialogPointOfContact::setFirstPoint(const quint32 &value, const quint32 &id */ void DialogPointOfContact::setCenter(const quint32 &value, const quint32 &id) { - setCurrentPointId(ui.comboBoxCenter, center, value, id); + setCurrentPointId(ui->comboBoxCenter, center, value, id); center = value; } @@ -199,7 +245,12 @@ void DialogPointOfContact::setCenter(const quint32 &value, const quint32 &id) void DialogPointOfContact::setRadius(const QString &value) { radius = value; - ui.lineEditFormula->setText(radius); + // increase height if needed. + if (radius.length() > 80) + { + this->DeployFormulaTextEdit(); + } + ui->plainTextEditFormula->setPlainText(radius); } //--------------------------------------------------------------------------------------------------------------------- @@ -210,5 +261,5 @@ void DialogPointOfContact::setRadius(const QString &value) void DialogPointOfContact::setPointName(const QString &value) { pointName = value; - ui.lineEditNamePoint->setText(pointName); + ui->lineEditNamePoint->setText(pointName); } diff --git a/src/app/dialogs/tools/dialogpointofcontact.h b/src/app/dialogs/tools/dialogpointofcontact.h index a9f8ea652..cc96ef85c 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.h +++ b/src/app/dialogs/tools/dialogpointofcontact.h @@ -32,6 +32,11 @@ #include "ui_dialogpointofcontact.h" #include "dialogtool.h" +#define DIALOGPOINTOFCONTACT_MAX_FORMULA_HEIGHT 64 +namespace Ui +{ + class DialogPointOfContact; +} /** * @brief The DialogPointOfContact class dialog for ToolPointOfContact. Help create point and edit option. */ @@ -58,11 +63,23 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(); + /** + * @brief DeployFormulaTextEdit grow or shrink formula input + */ + void DeployFormulaTextEdit(); + /** + * @brief FormulaTextChanged when formula text changes for validation and calc + */ + void FormulaTextChanged(); private: Q_DISABLE_COPY(DialogPointOfContact) /** @brief ui keeps information about user interface */ - Ui::DialogPointOfContact ui; + Ui::DialogPointOfContact *ui; /** @brief number number of handled objects */ qint32 number; @@ -81,6 +98,14 @@ private: /** @brief secondPoint id second point of line */ quint32 secondPoint; + + /** @brief formulaBaseHeight base height defined by dialogui */ + int formulaBaseHeight; + + /** + * @brief SaveData Put dialog data in local variables + */ + void SaveData(); }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogpointofcontact.ui b/src/app/dialogs/tools/dialogpointofcontact.ui index 532648eeb..147765832 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.ui +++ b/src/app/dialogs/tools/dialogpointofcontact.ui @@ -74,17 +74,17 @@ - - - - 0 - 0 - + + + Qt::Horizontal - - Formula for calculation of radius of arc + + + 40 + 20 + - + @@ -150,6 +150,56 @@ + + + + + + + 16777215 + 24 + + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + + + + + + 16 + 16 + + + + true + + + + + @@ -441,14 +491,13 @@ Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - lineEditFormula lineEditNamePoint comboBoxCenter comboBoxFirstPoint diff --git a/src/app/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp index 5683f9b75..2f1f2545c 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.cpp +++ b/src/app/dialogs/tools/dialogpointofintersection.cpp @@ -43,7 +43,7 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, QWi { ui->setupUi(this); labelEditNamePoint = ui->labelEditNamePoint; - InitOkCansel(ui); + InitOkCancel(ui); flagName = false; CheckState(); diff --git a/src/app/dialogs/tools/dialogpointofintersection.h b/src/app/dialogs/tools/dialogpointofintersection.h index bde7baa1c..326c5fe91 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.h +++ b/src/app/dialogs/tools/dialogpointofintersection.h @@ -57,6 +57,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} private: Q_DISABLE_COPY(DialogPointOfIntersection) diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index e0a3d5937..36aef56d5 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -45,10 +45,12 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, QWidget *parent number = 0; InitVariables(ui); labelResultCalculation = ui->labelResultCalculation; - lineEditFormula = ui->lineEditFormula; + plainTextEditFormula = ui->plainTextEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; - InitOkCansel(ui); + InitOkCancelApply(ui); + + this->formulaBaseHeight=ui->plainTextEditFormula->height(); flagFormula = false; flagName = false; @@ -63,7 +65,36 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, QWidget *parent connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogShoulderPoint::PutVal); connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogShoulderPoint::EvalFormula); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogShoulderPoint::NamePointChanged); - connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogShoulderPoint::FormulaChanged); + connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogShoulderPoint::FormulaTextChanged); + connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogShoulderPoint::DeployFormulaTextEdit); + + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogShoulderPoint::FormulaTextChanged() +{ + this->FormulaChangedPlainText(); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogShoulderPoint::DeployFormulaTextEdit() +{ + if (ui->plainTextEditFormula->height() < DIALOGSHOULDERPOINT_MAX_FORMULA_HEIGHT) + { + ui->plainTextEditFormula->setFixedHeight(DIALOGSHOULDERPOINT_MAX_FORMULA_HEIGHT); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-next", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-next.png"))); + } + else + { + ui->plainTextEditFormula->setFixedHeight(this->formulaBaseHeight); + //Set icon from theme (internal for Windows system) + ui->pushButtonGrowLength->setIcon(QIcon::fromTheme("go-down", + QIcon(":/icons/win.icon.theme/icons/win.icon.theme/16x16/actions/go-down.png"))); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -127,14 +158,27 @@ void DialogShoulderPoint::ChoosedObject(quint32 id, const Valentina::Scenes &typ * @brief DialogAccepted save data and emit signal about closed dialog. */ void DialogShoulderPoint::DialogAccepted() +{ + this->SaveData(); + emit DialogClosed(QDialog::Accepted); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogShoulderPoint::DialogApply() +{ + this->SaveData(); + emit DialogApplied(); +} +//--------------------------------------------------------------------------------------------------------------------- +void DialogShoulderPoint::SaveData() { pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); - formula = ui->lineEditFormula->text(); + formula = ui->plainTextEditFormula->toPlainText(); + formula.replace("\n"," "); p1Line = getCurrentObjectId(ui->comboBoxP1Line); p2Line = getCurrentObjectId(ui->comboBoxP2Line); pShoulder = getCurrentObjectId(ui->comboBoxPShoulder); - emit DialogClosed(QDialog::Accepted); } //--------------------------------------------------------------------------------------------------------------------- @@ -178,7 +222,12 @@ void DialogShoulderPoint::setP1Line(const quint32 &value, const quint32 &id) void DialogShoulderPoint::setFormula(const QString &value) { formula = qApp->FormulaToUser(value); - ui->lineEditFormula->setText(formula); + // increase height if needed. + if (formula.length() > 80) + { + this->DeployFormulaTextEdit(); + } + ui->plainTextEditFormula->setPlainText(formula); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogshoulderpoint.h b/src/app/dialogs/tools/dialogshoulderpoint.h index 3684c8d02..6e7e947fc 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.h +++ b/src/app/dialogs/tools/dialogshoulderpoint.h @@ -31,6 +31,7 @@ #include "dialogtool.h" +#define DIALOGSHOULDERPOINT_MAX_FORMULA_HEIGHT 64 namespace Ui { class DialogShoulderPoint; @@ -66,6 +67,18 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(); + /** + * @brief DeployFormulaTextEdit grow or shrink formula input + */ + void DeployFormulaTextEdit(); + /** + * @brief FormulaTextChanged when formula text changes for validation and calc + */ + void FormulaTextChanged(); private: Q_DISABLE_COPY(DialogShoulderPoint) @@ -92,6 +105,14 @@ private: /** @brief pShoulder id shoulder point */ quint32 pShoulder; + + /** @brief formulaBaseHeight base height defined by dialogui */ + int formulaBaseHeight; + + /** + * @brief SaveData Put dialog data in local variables + */ + void SaveData(); }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogshoulderpoint.ui b/src/app/dialogs/tools/dialogshoulderpoint.ui index 27bd11328..a9ed3dc8b 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.ui +++ b/src/app/dialogs/tools/dialogshoulderpoint.ui @@ -74,17 +74,17 @@ - - - - 0 - 0 - + + + Qt::Horizontal - - Formula for calculation of length of line + + + 40 + 20 + - + @@ -150,6 +150,56 @@ + + + + + + + 16777215 + 24 + + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + + + + + + 16 + 16 + + + + true + + + + + @@ -462,14 +512,13 @@ Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - lineEditFormula lineEditNamePoint comboBoxP1Line comboBoxP2Line diff --git a/src/app/dialogs/tools/dialogsinglepoint.cpp b/src/app/dialogs/tools/dialogsinglepoint.cpp index 544529cf4..9a303c335 100644 --- a/src/app/dialogs/tools/dialogsinglepoint.cpp +++ b/src/app/dialogs/tools/dialogsinglepoint.cpp @@ -45,7 +45,7 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent) ui->doubleSpinBoxX->setRange(0, qApp->fromPixel(SceneSize)); ui->doubleSpinBoxY->setRange(0, qApp->fromPixel(SceneSize)); labelEditNamePoint = ui->labelEditName; - InitOkCansel(ui); + InitOkCancel(ui); flagName = false; CheckState(); diff --git a/src/app/dialogs/tools/dialogsinglepoint.h b/src/app/dialogs/tools/dialogsinglepoint.h index 5c99e7e79..6ee4ff4fb 100644 --- a/src/app/dialogs/tools/dialogsinglepoint.h +++ b/src/app/dialogs/tools/dialogsinglepoint.h @@ -51,6 +51,10 @@ public: public slots: void mousePress(const QPointF &scenePos); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} private: Q_DISABLE_COPY(DialogSinglePoint) diff --git a/src/app/dialogs/tools/dialogspline.cpp b/src/app/dialogs/tools/dialogspline.cpp index b0d065189..c18f7a233 100644 --- a/src/app/dialogs/tools/dialogspline.cpp +++ b/src/app/dialogs/tools/dialogspline.cpp @@ -42,7 +42,7 @@ DialogSpline::DialogSpline(const VContainer *data, QWidget *parent) kAsm1(1), kAsm2(1), kCurve(1) { ui->setupUi(this); - InitOkCansel(ui); + InitOkCancel(ui); FillComboBoxPoints(ui->comboBoxP1); FillComboBoxPoints(ui->comboBoxP4); diff --git a/src/app/dialogs/tools/dialogspline.h b/src/app/dialogs/tools/dialogspline.h index 979e29dc2..8d6cd84ca 100644 --- a/src/app/dialogs/tools/dialogspline.h +++ b/src/app/dialogs/tools/dialogspline.h @@ -69,6 +69,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} private: Q_DISABLE_COPY(DialogSpline) diff --git a/src/app/dialogs/tools/dialogsplinepath.cpp b/src/app/dialogs/tools/dialogsplinepath.cpp index b68ceef6d..a40ae2f40 100644 --- a/src/app/dialogs/tools/dialogsplinepath.cpp +++ b/src/app/dialogs/tools/dialogsplinepath.cpp @@ -42,7 +42,7 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, QWidget *parent) :DialogTool(data, parent), ui(new Ui::DialogSplinePath), path(VSplinePath()) { ui->setupUi(this); - InitOkCansel(ui); + InitOkCancel(ui); bOk->setEnabled(false); FillComboBoxPoints(ui->comboBoxPoint); @@ -160,7 +160,7 @@ void DialogSplinePath::Angle1Changed(qreal index) { qint32 row = ui->listWidget->currentRow(); QListWidgetItem *item = ui->listWidget->item( row ); - Q_CHECK_PTR(item); + SCASSERT(item != nullptr); VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); p.SetAngle1(index); DataPoint(p.P().id(), p.KAsm1(), p.Angle1(), p.KAsm2(), p.Angle2()); @@ -176,7 +176,7 @@ void DialogSplinePath::Angle2Changed(qreal index) { qint32 row = ui->listWidget->currentRow(); QListWidgetItem *item = ui->listWidget->item( row ); - Q_CHECK_PTR(item); + SCASSERT(item != nullptr); VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); p.SetAngle2(index); DataPoint(p.P().id(), p.KAsm1(), p.Angle1(), p.KAsm2(), p.Angle2()); diff --git a/src/app/dialogs/tools/dialogsplinepath.h b/src/app/dialogs/tools/dialogsplinepath.h index 30e0b4c60..41bf0282c 100644 --- a/src/app/dialogs/tools/dialogsplinepath.h +++ b/src/app/dialogs/tools/dialogsplinepath.h @@ -52,6 +52,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} void PointChanged(int row); void currentPointChanged( int index ); void Angle1Changed(qreal index ); diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index 6953004de..cf6d12ac9 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -34,6 +34,11 @@ #include #include "../../../libs/qmuparser/qmuparsererror.h" +// TODO : for issue #79 +// replace lineEditFormula -> plainTextEditFormula +// delete lineEditFormala everywhrer +// delete PutValHere and eval overloaded functions + //--------------------------------------------------------------------------------------------------------------------- /** * @brief DialogTool create dialog @@ -42,13 +47,13 @@ */ DialogTool::DialogTool(const VContainer *data, QWidget *parent) :QDialog(parent), data(data), isInitialized(false), flagName(true), flagFormula(true), timerFormula(nullptr), - bOk(nullptr), spinBoxAngle(nullptr), lineEditFormula(nullptr), listWidget(nullptr), - labelResultCalculation(nullptr), labelDescription(nullptr), labelEditNamePoint(nullptr), + bOk(nullptr), bApply(nullptr), spinBoxAngle(nullptr), lineEditFormula(nullptr), plainTextEditFormula(nullptr), + listWidget(nullptr), labelResultCalculation(nullptr), labelDescription(nullptr), labelEditNamePoint(nullptr), labelEditFormula(nullptr), radioButtonSizeGrowth(nullptr), radioButtonStandardTable(nullptr), radioButtonIncrements(nullptr), radioButtonLengthLine(nullptr), radioButtonLengthArc(nullptr), - radioButtonLengthCurve(nullptr), lineStyles(QStringList()) + radioButtonLengthCurve(nullptr), lineStyles(QStringList()), associatedTool(nullptr) { - Q_CHECK_PTR(data); + SCASSERT(data != nullptr); timerFormula = new QTimer(this); connect(timerFormula, &QTimer::timeout, this, &DialogTool::EvalFormula); //Keep synchronize with VAbstractTool styles list!!! @@ -96,7 +101,7 @@ void DialogTool::showEvent(QShowEvent *event) */ void DialogTool::FillComboBoxPoints(QComboBox *box, const quint32 &id) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); QHashIterator i(*objs); QMap list; @@ -119,7 +124,7 @@ void DialogTool::FillComboBoxPoints(QComboBox *box, const quint32 &id) const //--------------------------------------------------------------------------------------------------------------------- void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboMode::ComboBoxCutArc cut) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); QHashIterator i(*objs); QMap list; @@ -163,7 +168,7 @@ void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboMode:: */ void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboMode::ComboBoxCutSpline cut) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); QHashIterator i(*objs); QMap list; @@ -207,7 +212,7 @@ void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboMod */ void DialogTool::FillComboBoxSplinesPath(QComboBox *box, const quint32 &id, ComboMode::ComboBoxCutSpline cut) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); QHashIterator i(*objs); QMap list; @@ -249,7 +254,7 @@ void DialogTool::FillComboBoxSplinesPath(QComboBox *box, const quint32 &id, Comb */ void DialogTool::FillComboBoxTypeLine(QComboBox *box) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); box->addItems(lineStyles); box->setCurrentIndex(1); } @@ -346,16 +351,36 @@ void DialogTool::ChangeCurrentData(QComboBox *box, const quint32 &value) const */ void DialogTool::PutValHere(QLineEdit *lineEdit, QListWidget *listWidget) { - Q_CHECK_PTR(lineEdit); - Q_CHECK_PTR(listWidget); + SCASSERT(lineEdit != nullptr); + SCASSERT(listWidget != nullptr); QListWidgetItem *item = listWidget->currentItem(); - Q_CHECK_PTR(item); + SCASSERT(item != nullptr); + int pos = lineEdit->cursorPosition(); lineEdit->setText(lineEdit->text().insert(lineEdit->cursorPosition(), item->text())); lineEdit->setFocus(); lineEdit->setCursorPosition(pos + item->text().size()); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogTool::PutValHere(QPlainTextEdit *plainTextEdit, QListWidget *listWidget) +{ + SCASSERT(plainTextEdit != nullptr); + SCASSERT(listWidget != nullptr); + QListWidgetItem *item = listWidget->currentItem(); + SCASSERT(item != nullptr); + + QTextCursor cursor = plainTextEdit->textCursor(); + cursor.insertText(item->text()); + plainTextEdit->setTextCursor(cursor); + /* + int pos = lineEdit->cursorPosition(); + lineEdit->setText(lineEdit->text().insert(lineEdit->cursorPosition(), item->text())); + lineEdit->setFocus(); + lineEdit->setCursorPosition(pos + item->text().size()); + */ +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ValFormulaChanged handle change formula @@ -365,9 +390,9 @@ void DialogTool::PutValHere(QLineEdit *lineEdit, QListWidget *listWidget) */ void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer) { - Q_CHECK_PTR(edit); - Q_CHECK_PTR(timer); - Q_CHECK_PTR(labelEditFormula); + SCASSERT(edit != nullptr); + SCASSERT(timer != nullptr); + SCASSERT(labelEditFormula != nullptr); if (edit->text().isEmpty()) { flag = false; @@ -379,6 +404,23 @@ void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer) } timer->start(1000); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogTool::ValFormulaChanged(bool &flag, QPlainTextEdit *edit, QTimer *timer) +{ + SCASSERT(edit != nullptr); + SCASSERT(timer != nullptr); + SCASSERT(labelEditFormula != nullptr); + if (edit->toPlainText().isEmpty()) + { + flag = false; + CheckState(); + QPalette palette = labelEditFormula->palette(); + palette.setColor(labelEditFormula->foregroundRole(), Qt::red); + labelEditFormula->setPalette(palette); + return; + } + timer->start(1000); +} //--------------------------------------------------------------------------------------------------------------------- /** @@ -390,10 +432,10 @@ void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer) */ void DialogTool::Eval(QLineEdit *edit, bool &flag, QTimer *timer, QLabel *label) { - Q_CHECK_PTR(edit); - Q_CHECK_PTR(timer); - Q_CHECK_PTR(label); - Q_CHECK_PTR(labelEditFormula); + SCASSERT(edit != nullptr); + SCASSERT(timer != nullptr); + SCASSERT(label != nullptr); + SCASSERT(labelEditFormula != nullptr); QPalette palette = labelEditFormula->palette(); if (edit->text().isEmpty()) { @@ -446,16 +488,70 @@ void DialogTool::Eval(QLineEdit *edit, bool &flag, QTimer *timer, QLabel *label) } //--------------------------------------------------------------------------------------------------------------------- -/** - * @brief setCurrentPointId set current point id in combobox - * @param box combobox - * @param pointId save current point id - * @param value point id - * @param id don't show this id in list - */ +void DialogTool::Eval(QPlainTextEdit *edit, bool &flag, QTimer *timer, QLabel *label) +{ + SCASSERT(edit != nullptr); + SCASSERT(timer != nullptr); + SCASSERT(label != nullptr); + SCASSERT(labelEditFormula != nullptr); + QPalette palette = labelEditFormula->palette(); + if (edit->toPlainText().isEmpty()) + { + flag = false; + palette.setColor(labelEditFormula->foregroundRole(), Qt::red); + } + else + { + try + { + // Replace line return with spaces for calc + QString formula = edit->toPlainText(); + formula.replace("\n"," "); + formula = qApp->FormulaFromUser(formula); + Calculator *cal = new Calculator(data); + const qreal result = cal->EvalFormula(formula); + delete cal; + + QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), + QApplication::applicationName()); + bool osSeparatorValue = settings.value("configuration/osSeparator", 1).toBool(); + + if (osSeparatorValue) + { + QLocale loc = QLocale::system(); + label->setText(loc.toString(result)); + } + else + { + QLocale loc = QLocale(QLocale::C); + label->setText(loc.toString(result)); + } + flag = true; + palette.setColor(labelEditFormula->foregroundRole(), QColor(76, 76, 76)); + emit ToolTip(""); + } + catch(qmu::QmuParserError &e) + { + label->setText(tr("Error")); + flag = false; + palette.setColor(labelEditFormula->foregroundRole(), Qt::red); + emit ToolTip("Parser error: "+e.GetMsg()); + qDebug() << "\nMath parser error:\n" + << "--------------------------------------\n" + << "Message: " << e.GetMsg() << "\n" + << "Expression: " << e.GetExpr() << "\n" + << "--------------------------------------"; + } + } + CheckState(); + timer->stop(); + labelEditFormula->setPalette(palette); +} + +//--------------------------------------------------------------------------------------------------------------------- void DialogTool::setCurrentPointId(QComboBox *box, quint32 &pointId, const quint32 &value, const quint32 &id) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); FillComboBoxPoints(box, id); pointId = value; ChangeCurrentData(box, value); @@ -473,7 +569,7 @@ void DialogTool::setCurrentPointId(QComboBox *box, quint32 &pointId, const quint void DialogTool::setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value, const quint32 &id, ComboMode::ComboBoxCutSpline cut) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); FillComboBoxSplines(box, id, cut); splineId = value; ChangeCurrentData(box, value); @@ -491,7 +587,7 @@ void DialogTool::setCurrentSplineId(QComboBox *box, quint32 &splineId, const qui void DialogTool::setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 &value, const quint32 &id, ComboMode::ComboBoxCutArc cut) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); FillComboBoxArcs(box, id, cut); arcId = value; ChangeCurrentData(box, value); @@ -509,7 +605,7 @@ void DialogTool::setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 & void DialogTool::setCurrentSplinePathId(QComboBox *box, quint32 &splinePathId, const quint32 &value, const quint32 &id, ComboMode::ComboBoxCutSpline cut) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); FillComboBoxSplinesPath(box, id, cut); splinePathId = value; ChangeCurrentData(box, value); @@ -523,7 +619,7 @@ void DialogTool::setCurrentSplinePathId(QComboBox *box, quint32 &splinePathId, c */ quint32 DialogTool::getCurrentObjectId(QComboBox *box) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); qint32 index = box->currentIndex(); Q_ASSERT(index != -1); if (index != -1) @@ -539,9 +635,9 @@ quint32 DialogTool::getCurrentObjectId(QComboBox *box) const //--------------------------------------------------------------------------------------------------------------------- bool DialogTool::ChoosedPoint(const quint32 &id, QComboBox *box, const QString &toolTip) { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); const VPointF *point = data->GeometricObject(id); - Q_CHECK_PTR(point); + SCASSERT(point != nullptr); const qint32 index = box->findText(point->name()); if ( index != -1 ) { // -1 for not found @@ -560,7 +656,7 @@ bool DialogTool::ChoosedPoint(const quint32 &id, QComboBox *box, const QString & */ void DialogTool::FillList(QComboBox *box, const QMap &list) const { - Q_CHECK_PTR(box); + SCASSERT(box != nullptr); box->clear(); QMapIterator iter(list); @@ -577,8 +673,13 @@ void DialogTool::FillList(QComboBox *box, const QMap &list) co */ void DialogTool::CheckState() { - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); bOk->setEnabled(flagFormula && flagName); + // In case dialog hasn't apply button + if ( bApply != nullptr) + { + bApply->setEnabled(flagFormula && flagName); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -599,7 +700,7 @@ void DialogTool::ChoosedObject(quint32 id, const Valentina::Scenes &type) */ void DialogTool::NamePointChanged() { - Q_CHECK_PTR(labelEditNamePoint); + SCASSERT(labelEditNamePoint != nullptr); QLineEdit* edit = qobject_cast(sender()); if (edit) { @@ -652,6 +753,15 @@ void DialogTool::FormulaChanged() ValFormulaChanged(flagFormula, edit, timerFormula); } } +//--------------------------------------------------------------------------------------------------------------------- +void DialogTool::FormulaChangedPlainText() +{ + QPlainTextEdit* edit = qobject_cast(sender()); + if (edit) + { + ValFormulaChanged(flagFormula, edit, timerFormula); + } +} //--------------------------------------------------------------------------------------------------------------------- /** @@ -659,7 +769,7 @@ void DialogTool::FormulaChanged() */ void DialogTool::ArrowUp() { - Q_CHECK_PTR(spinBoxAngle); + SCASSERT(spinBoxAngle != nullptr); spinBoxAngle->setValue(90); } @@ -669,7 +779,7 @@ void DialogTool::ArrowUp() */ void DialogTool::ArrowDown() { - Q_CHECK_PTR(spinBoxAngle); + SCASSERT(spinBoxAngle != nullptr); spinBoxAngle->setValue(270); } @@ -679,7 +789,7 @@ void DialogTool::ArrowDown() */ void DialogTool::ArrowLeft() { - Q_CHECK_PTR(spinBoxAngle); + SCASSERT(spinBoxAngle != nullptr); spinBoxAngle->setValue(180); } @@ -689,7 +799,7 @@ void DialogTool::ArrowLeft() */ void DialogTool::ArrowRight() { - Q_CHECK_PTR(spinBoxAngle); + SCASSERT(spinBoxAngle != nullptr); spinBoxAngle->setValue(0); } @@ -699,7 +809,7 @@ void DialogTool::ArrowRight() */ void DialogTool::ArrowLeftUp() { - Q_CHECK_PTR(spinBoxAngle); + SCASSERT(spinBoxAngle != nullptr); spinBoxAngle->setValue(135); } @@ -709,7 +819,7 @@ void DialogTool::ArrowLeftUp() */ void DialogTool::ArrowLeftDown() { - Q_CHECK_PTR(spinBoxAngle); + SCASSERT(spinBoxAngle != nullptr); spinBoxAngle->setValue(225); } @@ -719,7 +829,7 @@ void DialogTool::ArrowLeftDown() */ void DialogTool::ArrowRightUp() { - Q_CHECK_PTR(spinBoxAngle); + SCASSERT(spinBoxAngle != nullptr); spinBoxAngle->setValue(45); } @@ -729,7 +839,7 @@ void DialogTool::ArrowRightUp() */ void DialogTool::ArrowRightDown() { - Q_CHECK_PTR(spinBoxAngle); + SCASSERT(spinBoxAngle != nullptr); spinBoxAngle->setValue(315); } @@ -739,9 +849,9 @@ void DialogTool::ArrowRightDown() */ void DialogTool::EvalFormula() { - Q_CHECK_PTR(lineEditFormula); - Q_CHECK_PTR(labelResultCalculation); - Eval(lineEditFormula, flagFormula, timerFormula, labelResultCalculation); + SCASSERT(plainTextEditFormula != nullptr); + SCASSERT(labelResultCalculation != nullptr); + Eval(plainTextEditFormula, flagFormula, timerFormula, labelResultCalculation); } //--------------------------------------------------------------------------------------------------------------------- @@ -750,7 +860,7 @@ void DialogTool::EvalFormula() */ void DialogTool::SizeHeight() { - Q_CHECK_PTR(listWidget); + SCASSERT(listWidget != nullptr); disconnect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); listWidget->clear(); @@ -819,7 +929,7 @@ void DialogTool::Increments() */ void DialogTool::PutHere() { - PutValHere(lineEditFormula, listWidget); + PutValHere(plainTextEditFormula, listWidget); } //--------------------------------------------------------------------------------------------------------------------- @@ -829,13 +939,17 @@ void DialogTool::PutHere() */ void DialogTool::PutVal(QListWidgetItem *item) { - Q_CHECK_PTR(lineEditFormula); - Q_CHECK_PTR(item); - int pos = lineEditFormula->cursorPosition(); + SCASSERT(plainTextEditFormula != nullptr); + SCASSERT(item != nullptr); + QTextCursor cursor = plainTextEditFormula->textCursor(); + cursor.insertText(item->text()); + plainTextEditFormula->setTextCursor(cursor); + /*int pos = plainTextEditFormula->cursorPosition(); lineEditFormula->setText(lineEditFormula->text().insert(lineEditFormula->cursorPosition(), item->text())); lineEditFormula->setFocus(); lineEditFormula->setCursorPosition(pos + item->text().size()); + */ } //--------------------------------------------------------------------------------------------------------------------- @@ -845,14 +959,14 @@ void DialogTool::PutVal(QListWidgetItem *item) */ void DialogTool::ValChenged(int row) { - Q_CHECK_PTR(listWidget); - Q_CHECK_PTR(labelDescription); - Q_CHECK_PTR(radioButtonSizeGrowth); - Q_CHECK_PTR(radioButtonStandardTable); - Q_CHECK_PTR(radioButtonIncrements); - Q_CHECK_PTR(radioButtonLengthLine); - Q_CHECK_PTR(radioButtonLengthArc); - Q_CHECK_PTR(radioButtonLengthCurve); + SCASSERT(listWidget != nullptr); + SCASSERT(labelDescription != nullptr); + SCASSERT(radioButtonSizeGrowth != nullptr); + SCASSERT(radioButtonStandardTable != nullptr); + SCASSERT(radioButtonIncrements != nullptr); + SCASSERT(radioButtonLengthLine != nullptr); + SCASSERT(radioButtonLengthArc != nullptr); + SCASSERT(radioButtonLengthCurve != nullptr); if (listWidget->count() == 0) { return; @@ -918,12 +1032,12 @@ void DialogTool::ValChenged(int row) */ void DialogTool::UpdateList() { - Q_CHECK_PTR(radioButtonSizeGrowth); - Q_CHECK_PTR(radioButtonStandardTable); - Q_CHECK_PTR(radioButtonIncrements); - Q_CHECK_PTR(radioButtonLengthLine); - Q_CHECK_PTR(radioButtonLengthArc); - Q_CHECK_PTR(radioButtonLengthCurve); + SCASSERT(radioButtonSizeGrowth != nullptr); + SCASSERT(radioButtonStandardTable != nullptr); + SCASSERT(radioButtonIncrements != nullptr); + SCASSERT(radioButtonLengthLine != nullptr); + SCASSERT(radioButtonLengthArc != nullptr); + SCASSERT(radioButtonLengthCurve != nullptr); if (radioButtonSizeGrowth->isChecked()) { @@ -959,7 +1073,7 @@ void DialogTool::UpdateList() template void DialogTool::ShowVariable(const QHash *var) { - Q_CHECK_PTR(listWidget); + SCASSERT(listWidget != nullptr); disconnect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); listWidget->clear(); @@ -982,3 +1096,9 @@ void DialogTool::ShowVariable(const QHash *var) connect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); listWidget->setCurrentRow (0); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogTool::DialogApply() +{ + +} diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index f88612a11..9b421fc0c 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -37,8 +37,10 @@ #include #include #include +#include #include "../../container/vcontainer.h" #include "../../widgets/vapplication.h" +#include "../../tools/vabstracttool.h" namespace ComboMode { @@ -63,12 +65,24 @@ class DialogTool : public QDialog public: DialogTool(const VContainer *data, QWidget *parent = nullptr); virtual ~DialogTool() {} + inline VAbstractTool* GetAssociatedTool() + { + return this->associatedTool; + } + inline void SetAssociatedTool(VAbstractTool* tool) + { + this->associatedTool=tool; + } signals: /** * @brief DialogClosed signal dialog closed * @param result keep result */ void DialogClosed(int result); + /** + * @brief DialogApplied emit signal dialog apply changes + */ + void DialogApplied(); /** * @brief ToolTip emit tooltipe for tool * @param toolTip text tooltipe @@ -78,8 +92,16 @@ public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); void NamePointChanged(); virtual void DialogAccepted(); + /** + * @brief DialogApply save data and emit signal DialogApplied. + */ + virtual void DialogApply(); virtual void DialogRejected(); void FormulaChanged(); + /** + * @brief FormulaChangedPlainText check formula (plain text editor editor) + */ + void FormulaChangedPlainText(); void ArrowUp(); void ArrowDown(); void ArrowLeft(); @@ -120,12 +142,15 @@ protected: /** @brief bOk button ok */ QPushButton *bOk; + /** @brief bApply button apply */ + QPushButton *bApply; + /** @brief spinBoxAngle spinbox for angle */ QDoubleSpinBox *spinBoxAngle; /** @brief lineEditFormula linEdit for formula */ QLineEdit *lineEditFormula; - + QPlainTextEdit *plainTextEditFormula; /** @brief listWidget listWidget with variables */ QListWidget *listWidget; @@ -180,8 +205,11 @@ protected: void ChangeCurrentText(QComboBox *box, const QString &value); void ChangeCurrentData(QComboBox *box, const quint32 &value) const; void PutValHere(QLineEdit *lineEdit, QListWidget *listWidget); +void PutValHere(QPlainTextEdit *plainTextEdit, QListWidget *listWidget); void ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer * timer); + void ValFormulaChanged(bool &flag, QPlainTextEdit *edit, QTimer * timer); void Eval(QLineEdit *edit, bool &flag, QTimer *timer, QLabel *label); + void Eval(QPlainTextEdit *edit, bool &flag, QTimer *timer, QLabel *label); void setCurrentPointId(QComboBox *box, quint32 &pointId, const quint32 &value, const quint32 &id) const; void setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value, const quint32 &id, ComboMode::ComboBoxCutSpline cut = ComboMode::NoCutSpline) const; @@ -195,7 +223,7 @@ protected: template void InitArrow(T *ui) { - Q_CHECK_PTR(ui); + SCASSERT(ui != nullptr); spinBoxAngle = ui->doubleSpinBoxAngle; connect(ui->toolButtonArrowDown, &QPushButton::clicked, this, &DialogTool::ArrowDown); connect(ui->toolButtonArrowUp, &QPushButton::clicked, this, &DialogTool::ArrowUp); @@ -238,16 +266,36 @@ protected: connect(radioButtonLengthCurve, &QRadioButton::clicked, this, &DialogTool::LengthCurves); } template - void InitOkCansel(T *ui) + /** + * @brief InitOkCancelApply initialise OK / Cancel and Apply buttons + * @param ui Dialog container + */ + void InitOkCancelApply(T *ui) + { + InitOkCancel(ui); + bApply = ui->buttonBox->button(QDialogButtonBox::Apply); + SCASSERT(bApply != nullptr); + connect(bApply, &QPushButton::clicked, this, &DialogTool::DialogApply); + } + template + /** + * @brief InitOkCancel initialise OK and Cancel buttons + * @param ui Dialog container + */ + void InitOkCancel(T *ui) { bOk = ui->buttonBox->button(QDialogButtonBox::Ok); - Q_CHECK_PTR(bOk); + SCASSERT(bOk != nullptr); connect(bOk, &QPushButton::clicked, this, &DialogTool::DialogAccepted); - QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); - Q_CHECK_PTR(bCansel); - connect(bCansel, &QPushButton::clicked, this, &DialogTool::DialogRejected); + QPushButton *bCancel = ui->buttonBox->button(QDialogButtonBox::Cancel); + SCASSERT(bCancel != nullptr); + connect(bCancel, &QPushButton::clicked, this, &DialogTool::DialogRejected); } + /** + * @brief associatedTool vdrawtool associated with opened dialog. + */ + VAbstractTool* associatedTool; private: void FillList(QComboBox *box, const QMap &list)const; }; diff --git a/src/app/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp index be953b2f9..f551487aa 100644 --- a/src/app/dialogs/tools/dialogtriangle.cpp +++ b/src/app/dialogs/tools/dialogtriangle.cpp @@ -43,7 +43,7 @@ DialogTriangle::DialogTriangle(const VContainer *data, QWidget *parent) { ui->setupUi(this); labelEditNamePoint = ui->labelEditNamePoint; - InitOkCansel(ui); + InitOkCancel(ui); flagName = false; CheckState(); diff --git a/src/app/dialogs/tools/dialogtriangle.h b/src/app/dialogs/tools/dialogtriangle.h index 17561c879..0281b1f2e 100644 --- a/src/app/dialogs/tools/dialogtriangle.h +++ b/src/app/dialogs/tools/dialogtriangle.h @@ -63,6 +63,10 @@ public: public slots: virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} private: Q_DISABLE_COPY(DialogTriangle) diff --git a/src/app/dialogs/tools/dialoguniondetails.cpp b/src/app/dialogs/tools/dialoguniondetails.cpp index ff6302e5a..9e459d71a 100644 --- a/src/app/dialogs/tools/dialoguniondetails.cpp +++ b/src/app/dialogs/tools/dialoguniondetails.cpp @@ -40,7 +40,7 @@ DialogUnionDetails::DialogUnionDetails(const VContainer *data, QWidget *parent) numberP(0), p1(0), p2(0) { ui->setupUi(this); - InitOkCansel(ui); + InitOkCancel(ui); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialoguniondetails.h b/src/app/dialogs/tools/dialoguniondetails.h index faf401d1c..4e72252cd 100644 --- a/src/app/dialogs/tools/dialoguniondetails.h +++ b/src/app/dialogs/tools/dialoguniondetails.h @@ -53,6 +53,10 @@ public: public slots: void ChoosedObject(quint32 id, const Valentina::Scenes &type); virtual void DialogAccepted(); + /** TODO ISSUE 79 : create real function + * @brief DialogApply apply data and emit signal about applied dialog. + */ + virtual void DialogApply(){} private: Q_DISABLE_COPY(DialogUnionDetails) diff --git a/src/app/geometry/vequidistant.cpp b/src/app/geometry/vequidistant.cpp index c80f34324..e44b05ead 100644 --- a/src/app/geometry/vequidistant.cpp +++ b/src/app/geometry/vequidistant.cpp @@ -33,7 +33,7 @@ //--------------------------------------------------------------------------------------------------------------------- QPainterPath VEquidistant::ContourPath(const quint32 &idDetail, const VContainer *data) const { - Q_CHECK_PTR(data); + SCASSERT(data != nullptr); VDetail detail = data->GetDetail(idDetail); QVector points; QVector pointsEkv; diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 8a431c9b2..725e77ef6 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -178,7 +178,7 @@ void MainWindow::ActionNewDraw() connect(spoint, &VToolPoint::ChoosedTool, sceneDraw, &VMainGraphicsScene::ChoosedItem); connect(sceneDraw, &VMainGraphicsScene::NewFactor, spoint, &VToolSinglePoint::SetFactor); QHash* tools = doc->getTools(); - Q_CHECK_PTR(tools); + SCASSERT(tools != nullptr); tools->insert(id, spoint); VDrawTool::AddRecord(id, Valentina::SinglePointTool, doc); SetEnableTool(true); @@ -247,12 +247,50 @@ void MainWindow::SetToolButton(bool checked, Valentina::Tools t, const QString & { if (QToolButton *tButton = qobject_cast< QToolButton * >(this->sender())) { - Q_CHECK_PTR(tButton); + SCASSERT(tButton != nullptr); tButton->setChecked(true); } } } +//--------------------------------------------------------------------------------------------------------------------- +template +/** + * @brief SetToolButtonWithApply set tool and show dialog. + * @param checked true if tool button checked. + * @param t tool type. + * @param cursor path tool cursor icon. + * @param toolTip first tooltipe. + * @param closeDialogSlot function to handle close of dialog. + * @param applyDialogSlot function to handle apply in dialog. + */ +void MainWindow::SetToolButtonWithApply(bool checked, Valentina::Tools t, const QString &cursor, const QString &toolTip, + Func closeDialogSlot, Func2 applyDialogSlot) +{ + if (checked) + { + CancelTool(); + tool = t; + QPixmap pixmap(cursor); + QCursor cur(pixmap, 2, 3); + view->setCursor(cur); + helpLabel->setText(toolTip); + dialogTool = new Dialog(pattern, this); + connect(currentScene, &VMainGraphicsScene::ChoosedObject, dialogTool, &DialogTool::ChoosedObject); + connect(dialogTool, &DialogTool::DialogClosed, this, closeDialogSlot); + connect(dialogTool, &DialogTool::DialogApplied, this, applyDialogSlot); + connect(dialogTool, &DialogTool::ToolTip, this, &MainWindow::ShowToolTip); + connect(doc, &VPattern::FullUpdateFromFile, dialogTool, &DialogTool::UpdateList); + } + else + { + if (QToolButton *tButton = qobject_cast< QToolButton * >(this->sender())) + { + SCASSERT(tButton != nullptr); + tButton->setChecked(true); + } + } +} //--------------------------------------------------------------------------------------------------------------------- /** * @brief ClosedDialog handle close dialog @@ -261,7 +299,7 @@ void MainWindow::SetToolButton(bool checked, Valentina::Tools t, const QString & template void MainWindow::ClosedDialog(int result) { - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); if (result == QDialog::Accepted) { DrawTool::Create(dialogTool, currentScene, doc, pattern); @@ -269,6 +307,59 @@ void MainWindow::ClosedDialog(int result) ArrowTool(); } +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief ClosedDialogWithApply handle close dialog that has apply button + * @param result result working dialog. + */ +template +void MainWindow::ClosedDialogWithApply(int result) +{ + SCASSERT(dialogTool != nullptr); + if (result == QDialog::Accepted) + { + // Only create tool if not already created with apply + if (dialogTool->GetAssociatedTool() == nullptr) + { + dialogTool->SetAssociatedTool( + dynamic_cast (DrawTool::Create(dialogTool, currentScene, doc, pattern))); + } + else + { // Or update associated tool with data + VDrawTool * vtool= static_cast(dialogTool->GetAssociatedTool()); + vtool->FullUpdateFromGuiApply(); + } + } + if (dialogTool->GetAssociatedTool() != nullptr) + { + VDrawTool * vtool= static_cast(dialogTool->GetAssociatedTool()); + vtool->DialogLinkDestroy(); + } + ArrowTool(); +} + +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief ApplyDialog handle apply in dialog + */ +template +void MainWindow::ApplyDialog() +{ + SCASSERT(dialogTool != nullptr); + + // Only create tool if not already created with apply + if (dialogTool->GetAssociatedTool() == nullptr) + { + dialogTool->SetAssociatedTool( + static_cast (DrawTool::Create(dialogTool, currentScene, doc, pattern))); + } + else + { // Or update associated tool with data + VDrawTool * vtool= static_cast(dialogTool->GetAssociatedTool()); + vtool->FullUpdateFromGuiApply(); + } +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ToolEndLine handler tool endLine. @@ -276,8 +367,17 @@ void MainWindow::ClosedDialog(int result) */ void MainWindow::ToolEndLine(bool checked) { - SetToolButton(checked, Valentina::EndLineTool, ":/cursor/endline_cursor.png", tr("Select point"), - &MainWindow::ClosedDialogEndLine); + SetToolButtonWithApply(checked, Valentina::EndLineTool, ":/cursor/endline_cursor.png", tr("Select point"), + &MainWindow::ClosedDialogEndLine,&MainWindow::ApplyDialogEndLine); +} + +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief ApplyDialogEndLine actions after apply in DialogEndLine. + */ +void MainWindow::ApplyDialogEndLine() +{ + ApplyDialog(); } //--------------------------------------------------------------------------------------------------------------------- @@ -287,7 +387,7 @@ void MainWindow::ToolEndLine(bool checked) */ void MainWindow::ClosedDialogEndLine(int result) { - ClosedDialog(result); + ClosedDialogWithApply(result); } //--------------------------------------------------------------------------------------------------------------------- @@ -318,8 +418,17 @@ void MainWindow::ClosedDialogLine(int result) */ void MainWindow::ToolAlongLine(bool checked) { - SetToolButton(checked, Valentina::AlongLineTool, ":/cursor/alongline_cursor.png", - tr("Select point"), &MainWindow::ClosedDialogAlongLine); + SetToolButtonWithApply(checked, Valentina::AlongLineTool, ":/cursor/alongline_cursor.png", + tr("Select point"), &MainWindow::ClosedDialogAlongLine, &MainWindow::ApplyDialogAlongLine); +} + +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief ApplyDialogAlongLine actions after apply in DialogAlongLine. + */ +void MainWindow::ApplyDialogAlongLine() +{ + ApplyDialog(); } //--------------------------------------------------------------------------------------------------------------------- @@ -329,7 +438,7 @@ void MainWindow::ToolAlongLine(bool checked) */ void MainWindow::ClosedDialogAlongLine(int result) { - ClosedDialog(result); + ClosedDialogWithApply(result); } //--------------------------------------------------------------------------------------------------------------------- @@ -339,8 +448,18 @@ void MainWindow::ClosedDialogAlongLine(int result) */ void MainWindow::ToolShoulderPoint(bool checked) { - SetToolButton(checked, Valentina::ShoulderPointTool, ":/cursor/shoulder_cursor.png", - tr("Select first point of line"), &MainWindow::ClosedDialogShoulderPoint); + SetToolButtonWithApply(checked, Valentina::ShoulderPointTool, ":/cursor/shoulder_cursor.png", + tr("Select first point of line"), &MainWindow::ClosedDialogShoulderPoint, + &MainWindow::ApplyDialogShoulderPoint); +} + +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief ApplyDialogShoulderPoint actions after apply in DialogShoulderPoint. + */ +void MainWindow::ApplyDialogShoulderPoint() +{ + ApplyDialog(); } //--------------------------------------------------------------------------------------------------------------------- @@ -350,7 +469,7 @@ void MainWindow::ToolShoulderPoint(bool checked) */ void MainWindow::ClosedDialogShoulderPoint(int result) { - ClosedDialog(result); + ClosedDialogWithApply(result); } //--------------------------------------------------------------------------------------------------------------------- @@ -360,8 +479,18 @@ void MainWindow::ClosedDialogShoulderPoint(int result) */ void MainWindow::ToolNormal(bool checked) { - SetToolButton(checked, Valentina::NormalTool, ":/cursor/normal_cursor.png", - tr("Select first point of line"), &MainWindow::ClosedDialogNormal); + SetToolButtonWithApply(checked, Valentina::NormalTool, ":/cursor/normal_cursor.png", + tr("Select first point of line"), &MainWindow::ClosedDialogNormal, + &MainWindow::ApplyDialogNormal); +} + +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief ApplyDialogNormal actions after apply in DialogNormal. + */ +void MainWindow::ApplyDialogNormal() +{ + ApplyDialog(); } //--------------------------------------------------------------------------------------------------------------------- @@ -371,7 +500,7 @@ void MainWindow::ToolNormal(bool checked) */ void MainWindow::ClosedDialogNormal(int result) { - ClosedDialog(result); + ClosedDialogWithApply(result); } //--------------------------------------------------------------------------------------------------------------------- @@ -381,8 +510,18 @@ void MainWindow::ClosedDialogNormal(int result) */ void MainWindow::ToolBisector(bool checked) { - SetToolButton(checked, Valentina::BisectorTool, ":/cursor/bisector_cursor.png", - tr("Select first point of angle"), &MainWindow::ClosedDialogBisector); + SetToolButtonWithApply(checked, Valentina::BisectorTool, ":/cursor/bisector_cursor.png", + tr("Select first point of angle"), &MainWindow::ClosedDialogBisector, + &MainWindow::ApplyDialogBisector); +} + +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief ApplyDialogBisector actions after apply in DialogBisector. + */ +void MainWindow::ApplyDialogBisector() +{ + ApplyDialog(); } //--------------------------------------------------------------------------------------------------------------------- @@ -392,7 +531,7 @@ void MainWindow::ToolBisector(bool checked) */ void MainWindow::ClosedDialogBisector(int result) { - ClosedDialog(result); + ClosedDialogWithApply(result); } //--------------------------------------------------------------------------------------------------------------------- @@ -529,8 +668,18 @@ void MainWindow::ClosedDialogCutSplinePath(int result) */ void MainWindow::ToolPointOfContact(bool checked) { - SetToolButton(checked, Valentina::PointOfContact, ":/cursor/pointcontact_cursor.png", - tr("Select first point of line"), &MainWindow::ClosedDialogPointOfContact); + SetToolButtonWithApply(checked, Valentina::PointOfContact, ":/cursor/pointcontact_cursor.png", + tr("Select first point of line"), &MainWindow::ClosedDialogPointOfContact, + &MainWindow::ApplyDialogPointOfContact); +} + +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief ApplyDialogPointOfContact actions after apply in DialogPointOfContact. + */ +void MainWindow::ApplyDialogPointOfContact() +{ + ApplyDialog(); } //--------------------------------------------------------------------------------------------------------------------- @@ -540,7 +689,7 @@ void MainWindow::ToolPointOfContact(bool checked) */ void MainWindow::ClosedDialogPointOfContact(int result) { - ClosedDialog(result); + ClosedDialogWithApply(result); } //--------------------------------------------------------------------------------------------------------------------- @@ -664,8 +813,17 @@ void MainWindow::ClosedDialogUnionDetails(int result) */ void MainWindow::ToolCutArc(bool checked) { - SetToolButton(checked, Valentina::CutArcTool, ":/cursor/arc_cut_cursor.png", tr("Select arc"), - &MainWindow::ClosedDialogCutArc); + SetToolButtonWithApply(checked, Valentina::CutArcTool, ":/cursor/arc_cut_cursor.png", + tr("Select arc"), &MainWindow::ClosedDialogCutArc, &MainWindow::ApplyDialogCutArc); +} + +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief ApplyDialogCutArc actions after apply in DialogCutArc. + */ +void MainWindow::ApplyDialogCutArc() +{ + ApplyDialog(); } //--------------------------------------------------------------------------------------------------------------------- @@ -675,7 +833,7 @@ void MainWindow::ToolCutArc(bool checked) */ void MainWindow::ClosedDialogCutArc(int result) { - ClosedDialog(result); + ClosedDialogWithApply(result); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h index 07b0f3b00..7976860d0 100644 --- a/src/app/mainwindow.h +++ b/src/app/mainwindow.h @@ -103,17 +103,23 @@ public slots: void ToolCutArc(bool checked); void ClosedDialogEndLine(int result); + void ApplyDialogEndLine(); void ClosedDialogLine(int result); void ClosedDialogAlongLine(int result); + void ApplyDialogAlongLine(); void ClosedDialogShoulderPoint(int result); + void ApplyDialogShoulderPoint(); void ClosedDialogNormal(int result); + void ApplyDialogNormal(); void ClosedDialogBisector(int result); + void ApplyDialogBisector(); void ClosedDialogLineIntersect(int result); void ClosedDialogSpline(int result); void ClosedDialogArc(int result); void ClosedDialogSplinePath(int result); void ClosedDialogCutSplinePath(int result); void ClosedDialogPointOfContact(int result); + void ApplyDialogPointOfContact(); void ClosedDialogDetail(int result); void ClosedDialogHeight(int result); void ClosedDialogTriangle(int result); @@ -121,6 +127,7 @@ public slots: void ClosedDialogUnionDetails(int result); void ClosedDialogCutSpline(int result); void ClosedDialogCutArc(int result); + void ApplyDialogCutArc(); void About(); void AboutQt(); @@ -220,10 +227,15 @@ private: template void SetToolButton(bool checked, Valentina::Tools t, const QString &cursor, const QString &toolTip, Func closeDialogSlot); - + template + void SetToolButtonWithApply(bool checked, Valentina::Tools t, const QString &cursor, const QString &toolTip, + Func closeDialogSlot, Func2 applyDialogSlot); template void ClosedDialog(int result); - + template + void ClosedDialogWithApply(int result); + template + void ApplyDialog(); bool SavePattern(const QString &curFile); void AutoSavePattern(); void setCurrentFile(const QString &fileName); diff --git a/src/app/options.h b/src/app/options.h index 53cdb7c61..2b99ea490 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -341,6 +341,8 @@ extern const QString in_Oprt; } \ #endif /* Q_OS_WIN32 */ +#else // define but disable this function if debugging is not set +#define SCASSERT(cond) qt_noop(); #endif /* QT_NO_DEBUG */ #endif // OPTIONS_H diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/go-down.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/go-down.png new file mode 100644 index 000000000..a74287892 Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/16x16/actions/go-down.png differ diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-down.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-down.png new file mode 100755 index 000000000..d53d924b9 Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-down.png differ diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png old mode 100644 new mode 100755 index 8eabaafe8..989e8d435 Binary files a/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png and b/src/app/share/resources/icons/win.icon.theme/24x24/actions/go-next.png differ diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png old mode 100644 new mode 100755 index fc2c75622..95cc6e0e1 Binary files a/src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png and b/src/app/share/resources/icons/win.icon.theme/24x24/actions/process-stop.png differ diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/go-down.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/go-down.png new file mode 100755 index 000000000..e44828414 Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/32x32/actions/go-down.png differ diff --git a/src/app/share/resources/theme.qrc b/src/app/share/resources/theme.qrc index 4950eb163..ae7c42bb5 100644 --- a/src/app/share/resources/theme.qrc +++ b/src/app/share/resources/theme.qrc @@ -34,5 +34,8 @@ icons/win.icon.theme/24x24/actions/list-add.png icons/win.icon.theme/32x32/actions/list-remove.png icons/win.icon.theme/32x32/actions/list-add.png + icons/win.icon.theme/16x16/actions/go-down.png + icons/win.icon.theme/24x24/actions/go-down.png + icons/win.icon.theme/32x32/actions/go-down.png diff --git a/src/app/stable.h b/src/app/stable.h index 22bf1261b..d5ecc8150 100644 --- a/src/app/stable.h +++ b/src/app/stable.h @@ -38,9 +38,6 @@ #if defined __cplusplus /* Add C++ includes here */ -#ifdef Q_CC_MSVC -#define _USE_MATH_DEFINES -#endif #ifdef QT_CORE_LIB # include diff --git a/src/app/tablewindow.cpp b/src/app/tablewindow.cpp index 64e5af6eb..a71eaa79e 100644 --- a/src/app/tablewindow.cpp +++ b/src/app/tablewindow.cpp @@ -97,7 +97,7 @@ void TableWindow::AddDetail() { tableScene->clearSelection(); VItem* Detail = listDetails[indexDetail]; - Q_CHECK_PTR(Detail); + SCASSERT(Detail != nullptr); connect(Detail, &VItem::itemOut, this, &TableWindow::itemOut); connect(Detail, &VItem::itemColliding, this, &TableWindow::itemColliding); connect(this, &TableWindow::LengthChanged, Detail, &VItem::LengthChanged); @@ -329,7 +329,7 @@ void TableWindow::itemColliding(QList list, int number) if (lis.size()-2 <= 0) { VItem * bitem = qgraphicsitem_cast ( listCollidingItems.at(i) ); - Q_CHECK_PTR(bitem); + SCASSERT(bitem != nullptr); bitem->setPen(QPen(Qt::black, qApp->toPixel(qApp->widthMainLine()))); listCollidingItems.removeAt(i); } @@ -338,7 +338,7 @@ void TableWindow::itemColliding(QList list, int number) else if (listCollidingItems.size()==1) { VItem * bitem = qgraphicsitem_cast ( listCollidingItems.at(0) ); - Q_CHECK_PTR(bitem); + SCASSERT(bitem != nullptr); bitem->setPen(QPen(Qt::black, qApp->toPixel(qApp->widthMainLine()))); listCollidingItems.clear(); collidingItems = true; diff --git a/src/app/tools/drawTools/vdrawtool.cpp b/src/app/tools/drawTools/vdrawtool.cpp index 2b45827f5..d121327c7 100644 --- a/src/app/tools/drawTools/vdrawtool.cpp +++ b/src/app/tools/drawTools/vdrawtool.cpp @@ -125,6 +125,25 @@ void VDrawTool::FullUpdateFromGui(int result) dialog = nullptr; } +//--------------------------------------------------------------------------------------------------------------------- +void VDrawTool::FullUpdateFromGuiApply() +{ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if (domElement.isElement()) + { + SaveDialog(domElement); + + emit FullUpdateTree(); + emit toolhaveChange(); + } +} + +//--------------------------------------------------------------------------------------------------------------------- +void VDrawTool::DialogLinkDestroy() +{ + this->dialog=nullptr; +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief SetFactor set current scale factor of scene. @@ -171,9 +190,9 @@ qreal VDrawTool::CheckFormula(QString &formula, VContainer *data) //Need delete dialog here because parser in dialog don't allow use correct separator for parsing here. //Don't know why. delete dialog; - Calculator *cal = new Calculator(data); - result = cal->EvalFormula(formula); - delete cal;//Here can be memory leak, but dialog already check this formula and probability very low. + Calculator *cal1 = new Calculator(data); + result = cal1->EvalFormula(formula); + delete cal1;//Here can be memory leak, but dialog already check this formula and probability very low. } else { diff --git a/src/app/tools/drawTools/vdrawtool.h b/src/app/tools/drawTools/vdrawtool.h index 842ca5bc7..4dbaefeaf 100644 --- a/src/app/tools/drawTools/vdrawtool.h +++ b/src/app/tools/drawTools/vdrawtool.h @@ -30,7 +30,6 @@ #define VDRAWTOOL_H #include "../vabstracttool.h" - #include #include #include @@ -49,6 +48,10 @@ public: /** @brief setDialog set dialog when user want change tool option. */ virtual void setDialog() {} + /** + * @brief DialogLinkDestroy removes dialog pointer + */ + virtual void DialogLinkDestroy(); void ignoreContextMenu(bool enable); static qreal CheckFormula(QString &formula, VContainer *data); @@ -57,6 +60,10 @@ public slots: virtual void ChangedActivDraw(const QString &newName); void ChangedNameDraw(const QString &oldName, const QString &newName); virtual void FullUpdateFromGui(int result); + /** + * @brief FullUpdateFromGuiApply refresh tool data after change in options but do not delete dialog + */ + virtual void FullUpdateFromGuiApply(); virtual void SetFactor(qreal factor); protected: /** @brief ignoreContextMenuEvent ignore or not context menu events. */ @@ -117,6 +124,7 @@ protected: connect(qobject_cast< VMainGraphicsScene * >(tool->scene()), &VMainGraphicsScene::ChoosedObject, dialog, &DialogTool::ChoosedObject); connect(dialog, &DialogTool::DialogClosed, tool, &Tool::FullUpdateFromGui); + connect(dialog, &DialogTool::DialogApplied, tool, &Tool::FullUpdateFromGuiApply); if (ignoreFullUpdate == false) { connect(doc, &VPattern::FullUpdateFromFile, dialog, &DialogTool::UpdateList); diff --git a/src/app/tools/drawTools/vtoolalongline.cpp b/src/app/tools/drawTools/vtoolalongline.cpp index b6ca59ec2..19f1f703e 100644 --- a/src/app/tools/drawTools/vtoolalongline.cpp +++ b/src/app/tools/drawTools/vtoolalongline.cpp @@ -133,9 +133,9 @@ void VToolAlongLine::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolAlongLine::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogAlongLine *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->getTypeLine()); doc->SetAttribute(domElement, AttrLength, dialogTool->getFormula()); @@ -146,9 +146,9 @@ void VToolAlongLine::SaveDialog(QDomElement &domElement) //--------------------------------------------------------------------------------------------------------------------- void VToolAlongLine::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogAlongLine *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setTypeLine(typeLine); dialogTool->setFormula(formula); @@ -158,22 +158,28 @@ void VToolAlongLine::setDialog() } //--------------------------------------------------------------------------------------------------------------------- -void VToolAlongLine::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) +VToolAlongLine* VToolAlongLine::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogAlongLine *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); QString formula = dialogTool->getFormula(); const quint32 firstPointId = dialogTool->getFirstPointId(); const quint32 secondPointId = dialogTool->getSecondPointId(); const QString typeLine = dialogTool->getTypeLine(); const QString pointName = dialogTool->getPointName(); - Create(0, pointName, typeLine, formula, firstPointId, secondPointId, 5, 10, scene, doc, data, + VToolAlongLine *point=nullptr; + point = Create(0, pointName, typeLine, formula, firstPointId, secondPointId, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + if (point != nullptr) + { + point->dialog=dialogTool; + } + return point; } //--------------------------------------------------------------------------------------------------------------------- -void VToolAlongLine::Create(const quint32 _id, const QString &pointName, const QString &typeLine, QString &formula, +VToolAlongLine* VToolAlongLine::Create(const quint32 _id, const QString &pointName, const QString &typeLine, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) @@ -212,5 +218,7 @@ void VToolAlongLine::Create(const quint32 _id, const QString &pointName, const Q doc->AddTool(id, point); doc->IncrementReferens(firstPointId); doc->IncrementReferens(secondPointId); + return point; } + return nullptr; } diff --git a/src/app/tools/drawTools/vtoolalongline.h b/src/app/tools/drawTools/vtoolalongline.h index 8276c3954..a5f9795bb 100644 --- a/src/app/tools/drawTools/vtoolalongline.h +++ b/src/app/tools/drawTools/vtoolalongline.h @@ -64,7 +64,7 @@ public: * @param doc dom document container. * @param data container with variables. */ - static void Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); + static VToolAlongLine* Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); /** * @brief Create help create tool. * @param _id tool id, 0 if tool doesn't exist yet. @@ -81,7 +81,7 @@ public: * @param parse parser file mode. * @param typeCreation way we create this tool. */ - static void Create(const quint32 _id, const QString &pointName, const QString &typeLine, QString &formula, + static VToolAlongLine* Create(const quint32 _id, const QString &pointName, const QString &typeLine, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation); diff --git a/src/app/tools/drawTools/vtoolarc.cpp b/src/app/tools/drawTools/vtoolarc.cpp index 9664f2528..fadf1a9ed 100644 --- a/src/app/tools/drawTools/vtoolarc.cpp +++ b/src/app/tools/drawTools/vtoolarc.cpp @@ -62,9 +62,9 @@ VToolArc::VToolArc(VPattern *doc, VContainer *data, quint32 id, const Valentina: //--------------------------------------------------------------------------------------------------------------------- void VToolArc::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogArc *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VArc *arc = VAbstractTool::data.GeometricObject(id); dialogTool->SetCenter(arc->GetCenter().id()); dialogTool->SetF1(arc->GetFormulaF1()); @@ -75,9 +75,9 @@ void VToolArc::setDialog() //--------------------------------------------------------------------------------------------------------------------- void VToolArc::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogArc *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const quint32 center = dialogTool->GetCenter(); QString radius = dialogTool->GetRadius(); QString f1 = dialogTool->GetF1(); @@ -268,9 +268,9 @@ void VToolArc::keyReleaseEvent(QKeyEvent *event) //--------------------------------------------------------------------------------------------------------------------- void VToolArc::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogArc *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->GetCenter())); doc->SetAttribute(domElement, AttrRadius, dialogTool->GetRadius()); doc->SetAttribute(domElement, AttrAngle1, dialogTool->GetF1()); diff --git a/src/app/tools/drawTools/vtoolbisector.cpp b/src/app/tools/drawTools/vtoolbisector.cpp index 07a136106..f4b5b371b 100644 --- a/src/app/tools/drawTools/vtoolbisector.cpp +++ b/src/app/tools/drawTools/vtoolbisector.cpp @@ -74,9 +74,9 @@ QPointF VToolBisector::FindPoint(const QPointF &firstPoint, const QPointF &secon //--------------------------------------------------------------------------------------------------------------------- void VToolBisector::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogBisector *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setTypeLine(typeLine); dialogTool->setFormula(formula); @@ -87,24 +87,30 @@ void VToolBisector::setDialog() } //--------------------------------------------------------------------------------------------------------------------- -void VToolBisector::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, +VToolBisector* VToolBisector::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogBisector *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); QString formula = dialogTool->getFormula(); const quint32 firstPointId = dialogTool->getFirstPointId(); const quint32 secondPointId = dialogTool->getSecondPointId(); const quint32 thirdPointId = dialogTool->getThirdPointId(); const QString typeLine = dialogTool->getTypeLine(); const QString pointName = dialogTool->getPointName(); - Create(0, formula, firstPointId, secondPointId, thirdPointId, typeLine, pointName, 5, 10, scene, doc, data, + VToolBisector *point = nullptr; + point=Create(0, formula, firstPointId, secondPointId, thirdPointId, typeLine, pointName, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + if (point != nullptr) + { + point->dialog=dialogTool; + } + return point; } //--------------------------------------------------------------------------------------------------------------------- -void VToolBisector::Create(const quint32 _id, QString &formula, const quint32 &firstPointId, +VToolBisector* VToolBisector::Create(const quint32 _id, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const quint32 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, @@ -145,7 +151,9 @@ void VToolBisector::Create(const quint32 _id, QString &formula, const quint32 &f doc->IncrementReferens(firstPointId); doc->IncrementReferens(secondPointId); doc->IncrementReferens(thirdPointId); + return point; } + return nullptr; } //--------------------------------------------------------------------------------------------------------------------- @@ -232,9 +240,9 @@ void VToolBisector::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolBisector::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogBisector *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->getTypeLine()); doc->SetAttribute(domElement, AttrLength, dialogTool->getFormula()); diff --git a/src/app/tools/drawTools/vtoolbisector.h b/src/app/tools/drawTools/vtoolbisector.h index f49d6fa5b..1640da520 100644 --- a/src/app/tools/drawTools/vtoolbisector.h +++ b/src/app/tools/drawTools/vtoolbisector.h @@ -75,7 +75,7 @@ public: * @param doc dom document container. * @param data container with variables. */ - static void Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); + static VToolBisector* Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); /** * @brief Create help create tool. * @param _id tool id, 0 if tool doesn't exist yet. @@ -93,7 +93,7 @@ public: * @param parse parser file mode. * @param typeCreation way we create this tool. */ - static void Create(const quint32 _id, QString &formula, const quint32 &firstPointId, + static VToolBisector* Create(const quint32 _id, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const quint32 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, diff --git a/src/app/tools/drawTools/vtoolcutarc.cpp b/src/app/tools/drawTools/vtoolcutarc.cpp index 50521d867..b46a7c7ab 100644 --- a/src/app/tools/drawTools/vtoolcutarc.cpp +++ b/src/app/tools/drawTools/vtoolcutarc.cpp @@ -67,9 +67,9 @@ VToolCutArc::VToolCutArc(VPattern *doc, VContainer *data, const quint32 &id, con //--------------------------------------------------------------------------------------------------------------------- void VToolCutArc::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogCutArc *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *point = VAbstractTool::data.GeometricObject(id); dialogTool->setFormula(formula); dialogTool->setArcId(arcId, id); @@ -77,20 +77,26 @@ void VToolCutArc::setDialog() } //--------------------------------------------------------------------------------------------------------------------- -void VToolCutArc::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, +VToolCutArc* VToolCutArc::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogCutArc *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const QString pointName = dialogTool->getPointName(); QString formula = dialogTool->getFormula(); const quint32 arcId = dialogTool->getArcId(); - Create(0, pointName, formula, arcId, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + VToolCutArc* point = nullptr; + point=Create(0, pointName, formula, arcId, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + if (point != nullptr) + { + point->dialog=dialogTool; + } + return point; } //--------------------------------------------------------------------------------------------------------------------- -void VToolCutArc::Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &arcId, +VToolCutArc* VToolCutArc::Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &arcId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) { @@ -149,7 +155,9 @@ void VToolCutArc::Create(const quint32 _id, const QString &pointName, QString &f doc->AddTool(arc1id, point); doc->AddTool(arc2id, point); doc->IncrementReferens(arcId); + return point; } + return nullptr; } //--------------------------------------------------------------------------------------------------------------------- @@ -250,9 +258,9 @@ void VToolCutArc::RefreshGeometry() //--------------------------------------------------------------------------------------------------------------------- void VToolCutArc::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogCutArc *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrLength, dialogTool->getFormula()); doc->SetAttribute(domElement, AttrArc, QString().setNum(dialogTool->getArcId())); diff --git a/src/app/tools/drawTools/vtoolcutarc.h b/src/app/tools/drawTools/vtoolcutarc.h index 53dbcd740..f53e64523 100644 --- a/src/app/tools/drawTools/vtoolcutarc.h +++ b/src/app/tools/drawTools/vtoolcutarc.h @@ -65,7 +65,7 @@ public: * @param doc dom document container. * @param data container with variables. */ - static void Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); + static VToolCutArc* Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); /** * @brief Create help create tool. * @param _id tool id, 0 if tool doesn't exist yet. @@ -80,7 +80,7 @@ public: * @param parse parser file mode. * @param typeCreation way we create this tool. */ - static void Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &arcId, + static VToolCutArc* Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &arcId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation); static const QString ToolType; diff --git a/src/app/tools/drawTools/vtoolcutspline.cpp b/src/app/tools/drawTools/vtoolcutspline.cpp index 4e74b31d6..fac3d1e96 100644 --- a/src/app/tools/drawTools/vtoolcutspline.cpp +++ b/src/app/tools/drawTools/vtoolcutspline.cpp @@ -67,9 +67,9 @@ VToolCutSpline::VToolCutSpline(VPattern *doc, VContainer *data, const quint32 &i //--------------------------------------------------------------------------------------------------------------------- void VToolCutSpline::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogCutSpline *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *point = VAbstractTool::data.GeometricObject(id); dialogTool->setFormula(formula); dialogTool->setSplineId(splineId, id); @@ -80,9 +80,9 @@ void VToolCutSpline::setDialog() void VToolCutSpline::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogCutSpline *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const QString pointName = dialogTool->getPointName(); QString formula = dialogTool->getFormula(); const quint32 splineId = dialogTool->getSplineId(); @@ -251,9 +251,9 @@ void VToolCutSpline::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolCutSpline::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogCutSpline *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrLength, dialogTool->getFormula()); doc->SetAttribute(domElement, AttrSpline, QString().setNum(dialogTool->getSplineId())); diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.cpp b/src/app/tools/drawTools/vtoolcutsplinepath.cpp index e21db71cd..800ef0334 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolcutsplinepath.cpp @@ -68,9 +68,9 @@ VToolCutSplinePath::VToolCutSplinePath(VPattern *doc, VContainer *data, const qu //--------------------------------------------------------------------------------------------------------------------- void VToolCutSplinePath::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogCutSplinePath *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *point = VAbstractTool::data.GeometricObject(id); dialogTool->setFormula(formula); dialogTool->setSplinePathId(splinePathId, id); @@ -80,9 +80,9 @@ void VToolCutSplinePath::setDialog() //--------------------------------------------------------------------------------------------------------------------- void VToolCutSplinePath::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogCutSplinePath *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const QString pointName = dialogTool->getPointName(); QString formula = dialogTool->getFormula(); const quint32 splinePathId = dialogTool->getSplinePathId(); @@ -96,7 +96,7 @@ void VToolCutSplinePath::Create(const quint32 _id, const QString &pointName, QSt const Document::Documents &parse, const Valentina::Sources &typeCreation) { const VSplinePath *splPath = data->GeometricObject(splinePathId); - Q_CHECK_PTR(splPath); + SCASSERT(splPath != nullptr); const qreal result = CheckFormula(formula, data); @@ -326,9 +326,9 @@ void VToolCutSplinePath::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolCutSplinePath::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogCutSplinePath *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrLength, dialogTool->getFormula()); doc->SetAttribute(domElement, AttrSplinePath, QString().setNum(dialogTool->getSplinePathId())); diff --git a/src/app/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp index 107a6e107..8bd8509b1 100644 --- a/src/app/tools/drawTools/vtoolendline.cpp +++ b/src/app/tools/drawTools/vtoolendline.cpp @@ -30,7 +30,6 @@ #include "../../widgets/vmaingraphicsscene.h" #include "../../container/calculator.h" #include "../../dialogs/tools/dialogendline.h" -#include "../../dialogs/tools/dialogeditwrongformula.h" const QString VToolEndLine::ToolType = QStringLiteral("endLine"); @@ -54,9 +53,9 @@ VToolEndLine::VToolEndLine(VPattern *doc, VContainer *data, const quint32 &id, //--------------------------------------------------------------------------------------------------------------------- void VToolEndLine::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogEndLine *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setTypeLine(typeLine); dialogTool->setFormula(formula); @@ -66,26 +65,33 @@ void VToolEndLine::setDialog() } //--------------------------------------------------------------------------------------------------------------------- -void VToolEndLine::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, +VToolEndLine* VToolEndLine::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogEndLine *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool); const QString pointName = dialogTool->getPointName(); const QString typeLine = dialogTool->getTypeLine(); QString formula = dialogTool->getFormula(); const qreal angle = dialogTool->getAngle(); const quint32 basePointId = dialogTool->getBasePointId(); - Create(0, pointName, typeLine, formula, angle, basePointId, 5, 10, scene, doc, data, Document::FullParse, - Valentina::FromGui); + + VToolEndLine *point = nullptr; + point=Create(0, pointName, typeLine, formula, angle, basePointId, 5, 10, scene, doc, data, Document::FullParse, + Valentina::FromGui); + if (point != nullptr) + { + point->dialog=dialogTool; + } + return point; } //--------------------------------------------------------------------------------------------------------------------- -void VToolEndLine::Create(const quint32 _id, const QString &pointName, const QString &typeLine, - QString &formula, const qreal &angle, const quint32 &basePointId, - const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, - VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) +VToolEndLine* VToolEndLine::Create(const quint32 _id, const QString &pointName, const QString &typeLine, + QString &formula, const qreal &angle, const quint32 &basePointId, + const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, + VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) { const VPointF *basePoint = data->GeometricObject(basePointId); QLineF line = QLineF(basePoint->toQPointF(), QPointF(basePoint->x()+100, basePoint->y())); @@ -117,7 +123,9 @@ void VToolEndLine::Create(const quint32 _id, const QString &pointName, const QSt connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPoint::SetFactor); doc->AddTool(id, point); doc->IncrementReferens(basePointId); + return point; } + return nullptr; } //--------------------------------------------------------------------------------------------------------------------- @@ -186,9 +194,9 @@ void VToolEndLine::RefreshDataInFile() //--------------------------------------------------------------------------------------------------------------------- void VToolEndLine::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogEndLine *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->getTypeLine()); doc->SetAttribute(domElement, AttrLength, dialogTool->getFormula()); diff --git a/src/app/tools/drawTools/vtoolendline.h b/src/app/tools/drawTools/vtoolendline.h index 17a272f19..2e65d6e89 100644 --- a/src/app/tools/drawTools/vtoolendline.h +++ b/src/app/tools/drawTools/vtoolendline.h @@ -63,8 +63,9 @@ public: * @param scene pointer to scene. * @param doc dom document container. * @param data container with variables. + * @return the created tool */ - static void Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); + static VToolEndLine *Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); /** * @brief Create help create tool. * @param _id tool id, 0 if tool doesn't exist yet. @@ -80,8 +81,9 @@ public: * @param data container with variables. * @param parse parser file mode. * @param typeCreation way we create this tool. + * @return the created tool */ - static void Create(const quint32 _id, const QString &pointName, const QString &typeLine, + static VToolEndLine *Create(const quint32 _id, const QString &pointName, const QString &typeLine, QString &formula, const qreal &angle, const quint32 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation); diff --git a/src/app/tools/drawTools/vtoolheight.cpp b/src/app/tools/drawTools/vtoolheight.cpp index 88b92801e..d934d4ef3 100644 --- a/src/app/tools/drawTools/vtoolheight.cpp +++ b/src/app/tools/drawTools/vtoolheight.cpp @@ -51,9 +51,9 @@ VToolHeight::VToolHeight(VPattern *doc, VContainer *data, const quint32 &id, con //--------------------------------------------------------------------------------------------------------------------- void VToolHeight::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogHeight *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setTypeLine(typeLine); dialogTool->setBasePointId(basePointId, id); @@ -66,9 +66,9 @@ void VToolHeight::setDialog() void VToolHeight::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogHeight *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); disconnect(doc, &VPattern::FullUpdateFromFile, dialogTool, &DialogHeight::UpdateList); const QString pointName = dialogTool->getPointName(); const QString typeLine = dialogTool->getTypeLine(); @@ -198,9 +198,9 @@ void VToolHeight::RefreshDataInFile() //--------------------------------------------------------------------------------------------------------------------- void VToolHeight::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogHeight *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->getTypeLine()); doc->SetAttribute(domElement, AttrBasePoint, QString().setNum(dialogTool->getBasePointId())); diff --git a/src/app/tools/drawTools/vtoolline.cpp b/src/app/tools/drawTools/vtoolline.cpp index 49014357d..b05acb829 100644 --- a/src/app/tools/drawTools/vtoolline.cpp +++ b/src/app/tools/drawTools/vtoolline.cpp @@ -62,9 +62,9 @@ VToolLine::VToolLine(VPattern *doc, VContainer *data, quint32 id, quint32 firstP //--------------------------------------------------------------------------------------------------------------------- void VToolLine::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogLine *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); dialogTool->setFirstPoint(firstPoint); dialogTool->setSecondPoint(secondPoint); dialogTool->setTypeLine(typeLine); @@ -73,9 +73,9 @@ void VToolLine::setDialog() //--------------------------------------------------------------------------------------------------------------------- void VToolLine::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogLine *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const quint32 firstPoint = dialogTool->getFirstPoint(); const quint32 secondPoint = dialogTool->getSecondPoint(); const QString typeLine = dialogTool->getTypeLine(); @@ -87,9 +87,9 @@ void VToolLine::Create(const quint32 &_id, const quint32 &firstPoint, const quin const QString &typeLine, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) { - Q_CHECK_PTR(scene); - Q_CHECK_PTR(doc); - Q_CHECK_PTR(data); + SCASSERT(scene != nullptr); + SCASSERT(doc != nullptr); + SCASSERT(data != nullptr); quint32 id = _id; if (typeCreation == Valentina::FromGui) { @@ -243,9 +243,9 @@ void VToolLine::keyReleaseEvent(QKeyEvent *event) //--------------------------------------------------------------------------------------------------------------------- void VToolLine::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogLine *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->getFirstPoint())); doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->getSecondPoint())); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->getTypeLine()); diff --git a/src/app/tools/drawTools/vtoollineintersect.cpp b/src/app/tools/drawTools/vtoollineintersect.cpp index b73cafaf0..9e0df71a5 100644 --- a/src/app/tools/drawTools/vtoollineintersect.cpp +++ b/src/app/tools/drawTools/vtoollineintersect.cpp @@ -53,9 +53,9 @@ VToolLineIntersect::VToolLineIntersect(VPattern *doc, VContainer *data, const qu //--------------------------------------------------------------------------------------------------------------------- void VToolLineIntersect::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogLineIntersect *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setP1Line1(p1Line1); dialogTool->setP2Line1(p2Line1); @@ -67,9 +67,9 @@ void VToolLineIntersect::setDialog() //--------------------------------------------------------------------------------------------------------------------- void VToolLineIntersect::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogLineIntersect *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const quint32 p1Line1Id = dialogTool->getP1Line1(); const quint32 p2Line1Id = dialogTool->getP2Line1(); const quint32 p1Line2Id = dialogTool->getP1Line2(); @@ -217,9 +217,9 @@ void VToolLineIntersect::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolLineIntersect::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogLineIntersect *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrP1Line1, QString().setNum(dialogTool->getP1Line1())); doc->SetAttribute(domElement, AttrP2Line1, QString().setNum(dialogTool->getP2Line1())); diff --git a/src/app/tools/drawTools/vtoolnormal.cpp b/src/app/tools/drawTools/vtoolnormal.cpp index ef5b9ba9b..453b212b2 100644 --- a/src/app/tools/drawTools/vtoolnormal.cpp +++ b/src/app/tools/drawTools/vtoolnormal.cpp @@ -53,9 +53,9 @@ VToolNormal::VToolNormal(VPattern *doc, VContainer *data, const quint32 &id, con //--------------------------------------------------------------------------------------------------------------------- void VToolNormal::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogNormal *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setTypeLine(typeLine); dialogTool->setFormula(formula); @@ -66,23 +66,29 @@ void VToolNormal::setDialog() } //--------------------------------------------------------------------------------------------------------------------- -void VToolNormal::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) +VToolNormal* VToolNormal::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogNormal *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); QString formula = dialogTool->getFormula(); const quint32 firstPointId = dialogTool->getFirstPointId(); const quint32 secondPointId = dialogTool->getSecondPointId(); const QString typeLine = dialogTool->getTypeLine(); const QString pointName = dialogTool->getPointName(); const qreal angle = dialogTool->getAngle(); - Create(0, formula, firstPointId, secondPointId, typeLine, pointName, angle, 5, 10, scene, doc, data, + VToolNormal *point = nullptr; + point=Create(0, formula, firstPointId, secondPointId, typeLine, pointName, angle, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + if (point != nullptr) + { + point->dialog=dialogTool; + } + return point; } //--------------------------------------------------------------------------------------------------------------------- -void VToolNormal::Create(const quint32 _id, QString &formula, const quint32 &firstPointId, +VToolNormal* VToolNormal::Create(const quint32 _id, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const QString &typeLine, const QString &pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, @@ -121,7 +127,9 @@ void VToolNormal::Create(const quint32 _id, QString &formula, const quint32 &fir doc->AddTool(id, point); doc->IncrementReferens(firstPointId); doc->IncrementReferens(secondPointId); + return point; } + return nullptr; } //--------------------------------------------------------------------------------------------------------------------- @@ -218,9 +226,9 @@ void VToolNormal::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolNormal::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogNormal *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->getTypeLine()); doc->SetAttribute(domElement, AttrLength, dialogTool->getFormula()); diff --git a/src/app/tools/drawTools/vtoolnormal.h b/src/app/tools/drawTools/vtoolnormal.h index f054b3280..16d84e471 100644 --- a/src/app/tools/drawTools/vtoolnormal.h +++ b/src/app/tools/drawTools/vtoolnormal.h @@ -66,7 +66,7 @@ public: * @param doc dom document container. * @param data container with variables. */ - static void Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); + static VToolNormal* Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); /** * @brief Create help create tool. * @param _id tool id, 0 if tool doesn't exist yet. @@ -84,7 +84,7 @@ public: * @param parse parser file mode. * @param typeCreation way we create this tool. */ - static void Create(const quint32 _id, QString &formula, const quint32 &firstPointId, + static VToolNormal* Create(const quint32 _id, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const QString &typeLine, const QString &pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, diff --git a/src/app/tools/drawTools/vtoolpointofcontact.cpp b/src/app/tools/drawTools/vtoolpointofcontact.cpp index 25d942d7c..52615b8b2 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.cpp +++ b/src/app/tools/drawTools/vtoolpointofcontact.cpp @@ -53,9 +53,9 @@ VToolPointOfContact::VToolPointOfContact(VPattern *doc, VContainer *data, const //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfContact::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogPointOfContact *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setRadius(arcRadius); dialogTool->setCenter(center, id); @@ -92,22 +92,28 @@ QPointF VToolPointOfContact::FindPoint(const qreal &radius, const QPointF ¢e } //--------------------------------------------------------------------------------------------------------------------- -void VToolPointOfContact::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) +VToolPointOfContact* VToolPointOfContact::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogPointOfContact *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); QString radius = dialogTool->getRadius(); const quint32 center = dialogTool->getCenter(); const quint32 firstPointId = dialogTool->getFirstPoint(); const quint32 secondPointId = dialogTool->getSecondPoint(); const QString pointName = dialogTool->getPointName(); - Create(0, radius, center, firstPointId, secondPointId, pointName, 5, 10, scene, doc, data, + VToolPointOfContact *point = nullptr; + point=Create(0, radius, center, firstPointId, secondPointId, pointName, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + if (point != nullptr) + { + point->dialog=dialogTool; + } + return point; } //--------------------------------------------------------------------------------------------------------------------- -void VToolPointOfContact::Create(const quint32 _id, QString &radius, const quint32 ¢er, const quint32 &firstPointId, +VToolPointOfContact* VToolPointOfContact::Create(const quint32 _id, QString &radius, const quint32 ¢er, const quint32 &firstPointId, const quint32 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) @@ -151,7 +157,9 @@ void VToolPointOfContact::Create(const quint32 _id, QString &radius, const quint doc->IncrementReferens(center); doc->IncrementReferens(firstPointId); doc->IncrementReferens(secondPointId); + return point; } + return nullptr; } //--------------------------------------------------------------------------------------------------------------------- @@ -235,9 +243,9 @@ void VToolPointOfContact::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfContact::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogPointOfContact *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrRadius, dialogTool->getRadius()); doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->getCenter())); diff --git a/src/app/tools/drawTools/vtoolpointofcontact.h b/src/app/tools/drawTools/vtoolpointofcontact.h index 5a95e6b19..04670c7e2 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.h +++ b/src/app/tools/drawTools/vtoolpointofcontact.h @@ -74,7 +74,7 @@ public: * @param doc dom document container. * @param data container with variables. */ - static void Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); + static VToolPointOfContact* Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); /** * @brief Create help create tool. * @param _id tool id, 0 if tool doesn't exist yet. @@ -91,7 +91,7 @@ public: * @param parse parser file mode. * @param typeCreation way we create this tool. */ - static void Create(const quint32 _id, QString &arcRadius, const quint32 ¢er, + static VToolPointOfContact* Create(const quint32 _id, QString &arcRadius, const quint32 ¢er, const quint32 &firstPointId, const quint32 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation); diff --git a/src/app/tools/drawTools/vtoolpointofintersection.cpp b/src/app/tools/drawTools/vtoolpointofintersection.cpp index 9ff688a39..64db28e83 100644 --- a/src/app/tools/drawTools/vtoolpointofintersection.cpp +++ b/src/app/tools/drawTools/vtoolpointofintersection.cpp @@ -51,9 +51,9 @@ VToolPointOfIntersection::VToolPointOfIntersection(VPattern *doc, VContainer *da //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersection::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogPointOfIntersection *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setFirstPointId(firstPointId, id); dialogTool->setSecondPointId(secondPointId, id); @@ -64,9 +64,9 @@ void VToolPointOfIntersection::setDialog() void VToolPointOfIntersection::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogPointOfIntersection *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const quint32 firstPointId = dialogTool->getFirstPointId(); const quint32 secondPointId = dialogTool->getSecondPointId(); const QString pointName = dialogTool->getPointName(); @@ -177,9 +177,9 @@ void VToolPointOfIntersection::RefreshDataInFile() //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersection::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogPointOfIntersection *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->getFirstPointId())); doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->getSecondPointId())); diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.cpp b/src/app/tools/drawTools/vtoolshoulderpoint.cpp index 354aec712..b92d0e300 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.cpp +++ b/src/app/tools/drawTools/vtoolshoulderpoint.cpp @@ -52,9 +52,9 @@ VToolShoulderPoint::VToolShoulderPoint(VPattern *doc, VContainer *data, const qu //--------------------------------------------------------------------------------------------------------------------- void VToolShoulderPoint::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogShoulderPoint *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setTypeLine(typeLine); dialogTool->setFormula(formula); @@ -94,23 +94,29 @@ QPointF VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Li } //--------------------------------------------------------------------------------------------------------------------- -void VToolShoulderPoint::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) +VToolShoulderPoint* VToolShoulderPoint::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogShoulderPoint *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool); QString formula = dialogTool->getFormula(); const quint32 p1Line = dialogTool->getP1Line(); const quint32 p2Line = dialogTool->getP2Line(); const quint32 pShoulder = dialogTool->getPShoulder(); const QString typeLine = dialogTool->getTypeLine(); const QString pointName = dialogTool->getPointName(); - Create(0, formula, p1Line, p2Line, pShoulder, typeLine, pointName, 5, 10, scene, doc, data, + VToolShoulderPoint * point = nullptr; + point=Create(0, formula, p1Line, p2Line, pShoulder, typeLine, pointName, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + if (point != nullptr) + { + point->dialog=dialogTool; + } + return point; } //--------------------------------------------------------------------------------------------------------------------- -void VToolShoulderPoint::Create(const quint32 _id, QString &formula, const quint32 &p1Line, +VToolShoulderPoint* VToolShoulderPoint::Create(const quint32 _id, QString &formula, const quint32 &p1Line, const quint32 &p2Line, const quint32 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, @@ -154,7 +160,9 @@ void VToolShoulderPoint::Create(const quint32 _id, QString &formula, const quint doc->IncrementReferens(p1Line); doc->IncrementReferens(p2Line); doc->IncrementReferens(pShoulder); + return point; } + return nullptr; } //--------------------------------------------------------------------------------------------------------------------- @@ -241,9 +249,9 @@ void VToolShoulderPoint::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolShoulderPoint::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogShoulderPoint *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->getTypeLine()); doc->SetAttribute(domElement, AttrLength, dialogTool->getFormula()); diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.h b/src/app/tools/drawTools/vtoolshoulderpoint.h index 9e9462d9d..e9eec3e8a 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.h +++ b/src/app/tools/drawTools/vtoolshoulderpoint.h @@ -76,7 +76,7 @@ public: * @param doc dom document container. * @param data container with variables. */ - static void Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); + static VToolShoulderPoint* Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data); /** * @brief Create help create tool. * @param _id tool id, 0 if tool doesn't exist yet. @@ -94,7 +94,7 @@ public: * @param parse parser file mode. * @param typeCreation way we create this tool. */ - static void Create(const quint32 _id, QString &formula, const quint32 &p1Line, const quint32 &p2Line, + static VToolShoulderPoint* Create(const quint32 _id, QString &formula, const quint32 &p1Line, const quint32 &p2Line, const quint32 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation); diff --git a/src/app/tools/drawTools/vtoolsinglepoint.cpp b/src/app/tools/drawTools/vtoolsinglepoint.cpp index 2c542cc5d..8b6b35ad1 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.cpp +++ b/src/app/tools/drawTools/vtoolsinglepoint.cpp @@ -57,9 +57,9 @@ VToolSinglePoint::VToolSinglePoint (VPattern *doc, VContainer *data, quint32 id, //--------------------------------------------------------------------------------------------------------------------- void VToolSinglePoint::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogSinglePoint *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setData(p->name(), p->toQPointF()); } @@ -145,9 +145,9 @@ void VToolSinglePoint::decrementReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolSinglePoint::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogSinglePoint *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); QPointF p = dialogTool->getPoint(); QString name = dialogTool->getName(); doc->SetAttribute(domElement, AttrName, name); diff --git a/src/app/tools/drawTools/vtoolspline.cpp b/src/app/tools/drawTools/vtoolspline.cpp index 0e0a5e844..5b39462cd 100644 --- a/src/app/tools/drawTools/vtoolspline.cpp +++ b/src/app/tools/drawTools/vtoolspline.cpp @@ -75,9 +75,9 @@ VToolSpline::VToolSpline(VPattern *doc, VContainer *data, quint32 id, const Vale //--------------------------------------------------------------------------------------------------------------------- void VToolSpline::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogSpline *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VSpline *spl = VAbstractTool::data.GeometricObject(id); dialogTool->setP1(spl->GetP1().id()); dialogTool->setP4(spl->GetP4().id()); @@ -92,9 +92,9 @@ void VToolSpline::setDialog() void VToolSpline::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogSpline *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const quint32 p1 = dialogTool->getP1(); const quint32 p4 = dialogTool->getP4(); const qreal kAsm1 = dialogTool->getKAsm1(); @@ -233,9 +233,9 @@ void VToolSpline::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolSpline::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogSpline *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); VPointF point1 = *VAbstractTool::data.GeometricObject(dialogTool->getP1()); VPointF point4 = *VAbstractTool::data.GeometricObject(dialogTool->getP4()); diff --git a/src/app/tools/drawTools/vtoolsplinepath.cpp b/src/app/tools/drawTools/vtoolsplinepath.cpp index 6d18d81a0..763edef38 100644 --- a/src/app/tools/drawTools/vtoolsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolsplinepath.cpp @@ -76,9 +76,9 @@ VToolSplinePath::VToolSplinePath(VPattern *doc, VContainer *data, quint32 id, co //--------------------------------------------------------------------------------------------------------------------- void VToolSplinePath::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogSplinePath *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VSplinePath *splPath = VAbstractTool::data.GeometricObject(id); dialogTool->SetPath(*splPath); } @@ -86,9 +86,9 @@ void VToolSplinePath::setDialog() //--------------------------------------------------------------------------------------------------------------------- void VToolSplinePath::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogSplinePath *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); VSplinePath *path = new VSplinePath(dialogTool->GetPath()); for (qint32 i = 0; i < path->CountPoint(); ++i) { @@ -287,9 +287,9 @@ void VToolSplinePath::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolSplinePath::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogSplinePath *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); VSplinePath splPath = dialogTool->GetPath(); RefreshSplinePath(splPath); diff --git a/src/app/tools/drawTools/vtooltriangle.cpp b/src/app/tools/drawTools/vtooltriangle.cpp index 28ca05b8c..9c3aa03c0 100644 --- a/src/app/tools/drawTools/vtooltriangle.cpp +++ b/src/app/tools/drawTools/vtooltriangle.cpp @@ -52,9 +52,9 @@ VToolTriangle::VToolTriangle(VPattern *doc, VContainer *data, const quint32 &id, //--------------------------------------------------------------------------------------------------------------------- void VToolTriangle::setDialog() { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogTriangle *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setAxisP1Id(axisP1Id, id); dialogTool->setAxisP2Id(axisP2Id, id); @@ -67,9 +67,9 @@ void VToolTriangle::setDialog() void VToolTriangle::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogTriangle *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); const quint32 axisP1Id = dialogTool->getAxisP1Id(); const quint32 axisP2Id = dialogTool->getAxisP2Id(); const quint32 firstPointId = dialogTool->getFirstPointId(); @@ -238,9 +238,9 @@ void VToolTriangle::RefreshDataInFile() //--------------------------------------------------------------------------------------------------------------------- void VToolTriangle::SaveDialog(QDomElement &domElement) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogTriangle *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrAxisP1, QString().setNum(dialogTool->getAxisP1Id())); doc->SetAttribute(domElement, AttrAxisP2, QString().setNum(dialogTool->getAxisP2Id())); diff --git a/src/app/tools/nodeDetails/vnodearc.cpp b/src/app/tools/nodeDetails/vnodearc.cpp index b87aeb9fb..ef409f305 100644 --- a/src/app/tools/nodeDetails/vnodearc.cpp +++ b/src/app/tools/nodeDetails/vnodearc.cpp @@ -66,7 +66,7 @@ void VNodeArc::Create(VPattern *doc, VContainer *data, quint32 id, quint32 idArc doc->IncrementReferens(idTool); //Some nodes we don't show on scene. Tool that create this nodes must free memory. VDataTool *tool = doc->getTool(idTool); - Q_CHECK_PTR(tool); + SCASSERT(tool != nullptr); arc->setParent(tool); } else diff --git a/src/app/tools/nodeDetails/vnodepoint.cpp b/src/app/tools/nodeDetails/vnodepoint.cpp index d6735f89c..6e03a5d7e 100644 --- a/src/app/tools/nodeDetails/vnodepoint.cpp +++ b/src/app/tools/nodeDetails/vnodepoint.cpp @@ -77,7 +77,7 @@ void VNodePoint::Create(VPattern *doc, VContainer *data, quint32 id, quint32 idP doc->IncrementReferens(idTool); //Some nodes we don't show on scene. Tool that create this nodes must free memory. VDataTool *tool = doc->getTool(idTool); - Q_CHECK_PTR(tool); + SCASSERT(tool != nullptr); point->setParent(tool); } else diff --git a/src/app/tools/nodeDetails/vnodespline.cpp b/src/app/tools/nodeDetails/vnodespline.cpp index bebdb7042..ef4765273 100644 --- a/src/app/tools/nodeDetails/vnodespline.cpp +++ b/src/app/tools/nodeDetails/vnodespline.cpp @@ -69,7 +69,7 @@ VNodeSpline *VNodeSpline::Create(VPattern *doc, VContainer *data, quint32 id, qu doc->IncrementReferens(idTool); //Some nodes we don't show on scene. Tool that create this nodes must free memory. VDataTool *tool = doc->getTool(idTool); - Q_CHECK_PTR(tool); + SCASSERT(tool != nullptr); spl->setParent(tool); } else diff --git a/src/app/tools/nodeDetails/vnodesplinepath.cpp b/src/app/tools/nodeDetails/vnodesplinepath.cpp index 8b2fc44fd..857a9177d 100644 --- a/src/app/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/app/tools/nodeDetails/vnodesplinepath.cpp @@ -72,7 +72,7 @@ void VNodeSplinePath::Create(VPattern *doc, VContainer *data, quint32 id, quint3 doc->IncrementReferens(idTool); //Some nodes we don't show on scene. Tool that create this nodes must free memory. VDataTool *tool = doc->getTool(idTool); - Q_CHECK_PTR(tool); + SCASSERT(tool != nullptr); splPath->setParent(tool); } else diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp index 90a7ebb84..23880daf3 100644 --- a/src/app/tools/vabstracttool.cpp +++ b/src/app/tools/vabstracttool.cpp @@ -74,7 +74,7 @@ const QString VAbstractTool::TypeLineDashDotDotLine = QStringLiteral("dashDotDot VAbstractTool::VAbstractTool(VPattern *doc, VContainer *data, quint32 id, QObject *parent) :VDataTool(data, parent), doc(doc), id(id), baseColor(Qt::black), currentColor(Qt::black), typeLine(TypeLineLine) { - Q_CHECK_PTR(doc); + SCASSERT(doc != nullptr); connect(this, &VAbstractTool::toolhaveChange, this->doc, &VPattern::haveLiteChange); connect(this->doc, &VPattern::FullUpdateFromFile, this, &VAbstractTool::FullUpdateFromFile); connect(this, &VAbstractTool::FullUpdateTree, this->doc, &VPattern::FullUpdateTree); diff --git a/src/app/tools/vdatatool.cpp b/src/app/tools/vdatatool.cpp index ec16d4f67..0454badb5 100644 --- a/src/app/tools/vdatatool.cpp +++ b/src/app/tools/vdatatool.cpp @@ -31,7 +31,7 @@ //--------------------------------------------------------------------------------------------------------------------- VDataTool::VDataTool(VContainer *data, QObject *parent): QObject(parent), data(*data), _referens(1) { - Q_CHECK_PTR(data); + SCASSERT(data != nullptr); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/tools/vtooluniondetails.cpp b/src/app/tools/vtooluniondetails.cpp index ed4dfbf26..a0929a0b4 100644 --- a/src/app/tools/vtooluniondetails.cpp +++ b/src/app/tools/vtooluniondetails.cpp @@ -312,7 +312,7 @@ void VToolUnionDetails::UpdatePoints(const quint32 &idDetail, VContainer *data, VSplinePath *path = new VSplinePath(); path->setMode(Valentina::Modeling); const VSplinePath *splinePath = data->GeometricObject(det.at(i).getId()); - Q_CHECK_PTR(splinePath); + SCASSERT(splinePath != nullptr); qint32 k = splinePath->getMaxCountPoints(); for (qint32 i = 1; i <= splinePath->Count(); ++i) { @@ -387,9 +387,9 @@ void VToolUnionDetails::BiasRotatePoint(VPointF *point, const qreal &dx, const q //--------------------------------------------------------------------------------------------------------------------- void VToolUnionDetails::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern *doc, VContainer *data) { - Q_CHECK_PTR(dialog); + SCASSERT(dialog != nullptr); DialogUnionDetails *dialogTool = qobject_cast(dialog); - Q_CHECK_PTR(dialogTool); + SCASSERT(dialogTool != nullptr); VDetail d1 = data->GetDetail(dialogTool->getD1()); VDetail d2 = data->GetDetail(dialogTool->getD2()); quint32 indexD1 = static_cast(dialogTool->getIndexD1()); @@ -492,16 +492,16 @@ void VToolUnionDetails::Create(const quint32 _id, const VDetail &d1, const VDeta newDetail.setName("Detail"); VToolDetail::Create(0, newDetail, scene, doc, data, parse, Valentina::FromTool); QHash* tools = doc->getTools(); - Q_CHECK_PTR(tools); + SCASSERT(tools != nullptr); { VToolDetail *toolDet = qobject_cast(tools->value(d1id)); - Q_CHECK_PTR(toolDet); + SCASSERT(toolDet != nullptr); toolDet->Remove(); } VToolDetail *toolDet = qobject_cast(tools->value(d2id)); - Q_CHECK_PTR(toolDet); + SCASSERT(toolDet != nullptr); toolDet->Remove(); } else diff --git a/src/app/widgets/doubledelegate.cpp b/src/app/widgets/doubledelegate.cpp index 8f611b1ee..e36704f77 100644 --- a/src/app/widgets/doubledelegate.cpp +++ b/src/app/widgets/doubledelegate.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "doubledelegate.h" - #include +#include "../options.h" //--------------------------------------------------------------------------------------------------------------------- //cppcheck-suppress unusedFunction @@ -51,7 +51,7 @@ void DoubleSpinBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &in qreal value = index.model()->data(index, Qt::EditRole).toDouble(); QDoubleSpinBox *spinBox = qobject_cast(editor); - Q_CHECK_PTR(spinBox); + SCASSERT(spinBox != nullptr); spinBox->setValue(value); } @@ -60,7 +60,7 @@ void DoubleSpinBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &in void DoubleSpinBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { QDoubleSpinBox *spinBox = qobject_cast(editor); - Q_CHECK_PTR(spinBox); + SCASSERT(spinBox != nullptr); spinBox->interpretText(); qreal value = spinBox->value(); @@ -80,7 +80,7 @@ void DoubleSpinBoxDelegate::updateEditorGeometry(QWidget *editor, const QStyleOp void DoubleSpinBoxDelegate::commitAndCloseEditor() { QDoubleSpinBox *spinBox = qobject_cast(sender()); - Q_CHECK_PTR(spinBox); + SCASSERT(spinBox != nullptr); qreal value = spinBox->value(); if (qFuzzyCompare ( lastValue, value ) == false) { diff --git a/src/app/widgets/textdelegate.cpp b/src/app/widgets/textdelegate.cpp index 1584ebc18..d3605d3a6 100644 --- a/src/app/widgets/textdelegate.cpp +++ b/src/app/widgets/textdelegate.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "textdelegate.h" - #include +#include "../options.h" //--------------------------------------------------------------------------------------------------------------------- TextDelegate::TextDelegate(const QString ®ex, QObject *parent): QItemDelegate(parent), lastText(QString("Name_")), @@ -56,7 +56,7 @@ void TextDelegate::setEditorData(QWidget *editor, const QModelIndex &index) cons QString text = index.model()->data(index, Qt::EditRole).toString(); QLineEdit *lineEdit = qobject_cast(editor); - Q_CHECK_PTR(lineEdit); + SCASSERT(lineEdit != nullptr); if ( lastText != text && text.isEmpty() == false) { //Here need save text, but method is const, so, we use signal instead. @@ -69,7 +69,7 @@ void TextDelegate::setEditorData(QWidget *editor, const QModelIndex &index) cons void TextDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { QLineEdit *lineEdit = qobject_cast(editor); - Q_CHECK_PTR(lineEdit); + SCASSERT(lineEdit != nullptr); QString text = lineEdit->text(); if (text.isEmpty()) { @@ -91,7 +91,7 @@ void TextDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewI void TextDelegate::commitAndCloseEditor() { QLineEdit *lineEdit = qobject_cast(sender()); - Q_CHECK_PTR(lineEdit); + SCASSERT(lineEdit != nullptr); QString text = lineEdit->text(); if ( lastText != text && text.isEmpty() == false) { diff --git a/src/app/widgets/vapplication.cpp b/src/app/widgets/vapplication.cpp index 9456047d0..9a0e51dbf 100644 --- a/src/app/widgets/vapplication.cpp +++ b/src/app/widgets/vapplication.cpp @@ -37,7 +37,6 @@ #include #include #include - #include #include diff --git a/src/app/widgets/vtablegraphicsview.cpp b/src/app/widgets/vtablegraphicsview.cpp index 3ef25896f..54fe88337 100644 --- a/src/app/widgets/vtablegraphicsview.cpp +++ b/src/app/widgets/vtablegraphicsview.cpp @@ -31,6 +31,7 @@ #include #include #include +#include "../options.h" //--------------------------------------------------------------------------------------------------------------------- VTableGraphicsView::VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent) @@ -65,7 +66,7 @@ void VTableGraphicsView::MirrorItem() for ( qint32 i = 0; i < list.count(); ++i ) { QGraphicsItem *item = list.at(i); - Q_CHECK_PTR(item); + SCASSERT(item != nullptr); QRectF itemRectOld = item->sceneBoundingRect(); //Get the current transform QTransform transform(item->transform()); @@ -178,7 +179,7 @@ void VTableGraphicsView::rotateIt() for ( qint32 i = 0; i < list.count(); ++i ) { QGraphicsItem *item = list.at(i); - Q_CHECK_PTR(item); + SCASSERT(item != nullptr); item->setTransformOriginPoint(item->boundingRect().center()); item->setRotation(item->rotation() + 90); } diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp index 67bd9edc1..b8c29c005 100644 --- a/src/app/xml/vpattern.cpp +++ b/src/app/xml/vpattern.cpp @@ -204,8 +204,9 @@ bool VPattern::SetNameDraw(const QString &name) //--------------------------------------------------------------------------------------------------------------------- void VPattern::Parse(const Document::Documents &parse, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail) { - Q_CHECK_PTR(sceneDraw); - Q_CHECK_PTR(sceneDetail); + SCASSERT(sceneDraw != nullptr); + SCASSERT(sceneDetail != nullptr); + QStringList tags{TagDraw, TagIncrements, TagAuthor, TagDescription, TagNotes, TagMeasurements, TagVersion}; PrepareForParse(parse, sceneDraw, sceneDetail); QDomNode domNode = documentElement().firstChild(); while (domNode.isNull() == false) @@ -215,8 +216,6 @@ void VPattern::Parse(const Document::Documents &parse, VMainGraphicsScene *scene const QDomElement domElement = domNode.toElement(); if (domElement.isNull() == false) { - QStringList tags{TagDraw, TagIncrements, TagAuthor, TagDescription, TagNotes, TagMeasurements, - TagVersion}; switch (tags.indexOf(domElement.tagName())) { case 0: // TagDraw @@ -327,7 +326,7 @@ void VPattern::setCurrentData() void VPattern::AddTool(const quint32 &id, VDataTool *tool) { Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); - Q_CHECK_PTR(tool); + SCASSERT(tool != nullptr); tools.insert(id, tool); } @@ -335,9 +334,9 @@ void VPattern::AddTool(const quint32 &id, VDataTool *tool) void VPattern::UpdateToolData(const quint32 &id, VContainer *data) { Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); - Q_CHECK_PTR(data); + SCASSERT(data != nullptr); VDataTool *tool = tools.value(id); - Q_CHECK_PTR(tool); + SCASSERT(tool != nullptr); tool->VDataTool::setData(data); } @@ -346,7 +345,7 @@ void VPattern::IncrementReferens(quint32 id) const { Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); VDataTool *tool = tools.value(id); - Q_CHECK_PTR(tool); + SCASSERT(tool != nullptr); tool->incrementReferens(); } @@ -355,7 +354,7 @@ void VPattern::DecrementReferens(quint32 id) const { Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); VDataTool *tool = tools.value(id); - Q_CHECK_PTR(tool); + SCASSERT(tool != nullptr); tool->decrementReferens(); } @@ -641,6 +640,7 @@ void VPattern::ShowHistoryTool(quint32 id, Qt::GlobalColor color, bool enable) void VPattern::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, const QDomNode &node, const Document::Documents &parse) { + QStringList tags{TagCalculation, TagModeling, TagDetails}; QDomNode domNode = node.firstChild(); while (domNode.isNull() == false) { @@ -649,7 +649,6 @@ void VPattern::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScen const QDomElement domElement = domNode.toElement(); if (domElement.isNull() == false) { - QStringList tags{TagCalculation, TagModeling, TagDetails}; switch (tags.indexOf(domElement.tagName())) { case 0: // TagCalculation @@ -676,8 +675,8 @@ void VPattern::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScen void VPattern::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, const QDomNode &node, const Document::Documents &parse, const Valentina::Draws &mode) { - Q_CHECK_PTR(sceneDraw); - Q_CHECK_PTR(sceneDetail); + SCASSERT(sceneDraw != nullptr); + SCASSERT(sceneDetail != nullptr); VMainGraphicsScene *scene = nullptr; if (mode == Valentina::Calculation) { @@ -687,6 +686,7 @@ void VPattern::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene * { scene = sceneDetail; } + QStringList tags{TagPoint, TagLine, TagSpline, TagArc, TagTools}; const QDomNodeList nodeList = node.childNodes(); const qint32 num = nodeList.size(); for (qint32 i = 0; i < num; ++i) @@ -694,7 +694,6 @@ void VPattern::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene * QDomElement domElement = nodeList.at(i).toElement(); if (domElement.isNull() == false) { - QStringList tags{TagPoint, TagLine, TagSpline, TagArc, TagTools}; switch (tags.indexOf(domElement.tagName())) { case 0: // TagPoint @@ -724,7 +723,7 @@ void VPattern::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene * void VPattern::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, const Document::Documents &parse) { - Q_CHECK_PTR(sceneDetail); + SCASSERT(sceneDetail != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); try { @@ -737,6 +736,8 @@ void VPattern::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomEle detail.setWidth(GetParametrDouble(domElement, VToolDetail::AttrWidth, "10.0")); detail.setClosed(GetParametrUInt(domElement, VToolDetail::AttrClosed, "1")); + QStringList types{VToolDetail::NodePoint, VToolDetail::NodeArc, VToolDetail::NodeSpline, + VToolDetail::NodeSplinePath}; const QDomNodeList nodeList = domElement.childNodes(); const qint32 num = nodeList.size(); for (qint32 i = 0; i < num; ++i) @@ -753,8 +754,7 @@ void VPattern::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomEle const QString t = GetParametrString(element, AttrType, "NodePoint"); Valentina::Tools tool; - QStringList types{VToolDetail::NodePoint, VToolDetail::NodeArc, VToolDetail::NodeSpline, - VToolDetail::NodeSplinePath}; + switch (types.indexOf(t)) { case 0: // VToolDetail::NodePoint @@ -791,7 +791,7 @@ void VPattern::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomEle void VPattern::ParseDetails(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, const Document::Documents &parse) { - Q_CHECK_PTR(sceneDetail); + SCASSERT(sceneDetail != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); QDomNode domNode = domElement.firstChild(); while (domNode.isNull() == false) @@ -815,7 +815,7 @@ void VPattern::ParseDetails(VMainGraphicsScene *sceneDetail, const QDomElement & void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElement, const Document::Documents &parse, const QString &type) { - Q_CHECK_PTR(scene); + SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of point is empty"); @@ -1315,7 +1315,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem void VPattern::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &domElement, const Document::Documents &parse) { - Q_CHECK_PTR(scene); + SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); try { @@ -1339,7 +1339,7 @@ void VPattern::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &do void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement &domElement, const Document::Documents &parse, const QString &type) { - Q_CHECK_PTR(scene); + SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty"); @@ -1461,7 +1461,7 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement & void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElement, const Document::Documents &parse, const QString &type) { - Q_CHECK_PTR(scene); + SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty"); @@ -1535,7 +1535,7 @@ void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElemen void VPattern::ParseToolsElement(VMainGraphicsScene *scene, const QDomElement &domElement, const Document::Documents &parse, const QString &type) { - Q_CHECK_PTR(scene); + SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty"); @@ -1648,8 +1648,8 @@ void VPattern::CollectId(const QDomElement &node, QVector &vector) cons void VPattern::PrepareForParse(const Document::Documents &parse, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail) { - Q_CHECK_PTR(sceneDraw); - Q_CHECK_PTR(sceneDetail); + SCASSERT(sceneDraw != nullptr); + SCASSERT(sceneDetail != nullptr); if (parse == Document::FullParse) { TestUniqueId(); diff --git a/src/libs/qmuparser/qmuparsererror.cpp b/src/libs/qmuparser/qmuparsererror.cpp index 7d788d00e..fdcc0a27a 100644 --- a/src/libs/qmuparser/qmuparsererror.cpp +++ b/src/libs/qmuparser/qmuparsererror.cpp @@ -111,8 +111,8 @@ QmuParserError::QmuParserError ( EErrorCodes a_iErrc ) m_ErrMsg ( QmuParserErrorMsg::Instance() ) { m_sMsg = m_ErrMsg[m_iErrc]; - ReplaceSubString ( m_sMsg, "$POS$", QString().setNum ( m_iPos ) ); - ReplaceSubString ( m_sMsg, "$TOK$", m_sTok ); + m_sMsg.replace("$POS$", QString().setNum ( m_iPos )); + m_sMsg.replace("$TOK$", m_sTok ); } //--------------------------------------------------------------------------------------------------------------------- @@ -137,8 +137,8 @@ QmuParserError::QmuParserError ( EErrorCodes iErrc, const QString &sTok, const Q m_ErrMsg ( QmuParserErrorMsg::Instance() ) { m_sMsg = m_ErrMsg[m_iErrc]; - ReplaceSubString ( m_sMsg, "$POS$", QString().setNum ( m_iPos ) ); - ReplaceSubString ( m_sMsg, "$TOK$", m_sTok ); + m_sMsg.replace("$POS$", QString().setNum ( m_iPos )); + m_sMsg.replace("$TOK$", m_sTok ); } //--------------------------------------------------------------------------------------------------------------------- @@ -153,8 +153,8 @@ QmuParserError::QmuParserError ( EErrorCodes a_iErrc, int a_iPos, const QString m_ErrMsg ( QmuParserErrorMsg::Instance() ) { m_sMsg = m_ErrMsg[m_iErrc]; - ReplaceSubString ( m_sMsg, "$POS$", QString().setNum ( m_iPos ) ); - ReplaceSubString ( m_sMsg, "$TOK$", m_sTok ); + m_sMsg.replace("$POS$", QString().setNum ( m_iPos )); + m_sMsg.replace("$TOK$", m_sTok ); } //--------------------------------------------------------------------------------------------------------------------- @@ -167,8 +167,8 @@ QmuParserError::QmuParserError ( const QString &szMsg, int iPos, const QString & : QException(), m_sMsg ( szMsg ), m_sExpr(), m_sTok ( sTok ), m_iPos ( iPos ), m_iErrc ( ecGENERIC ), m_ErrMsg ( QmuParserErrorMsg::Instance() ) { - ReplaceSubString ( m_sMsg, "$POS$", QString().setNum ( m_iPos ) ); - ReplaceSubString ( m_sMsg, "$TOK$", m_sTok ); + m_sMsg.replace("$POS$", QString().setNum ( m_iPos )); + m_sMsg.replace("$TOK$", m_sTok ); } //--------------------------------------------------------------------------------------------------------------------- @@ -197,34 +197,6 @@ QmuParserError& QmuParserError::operator= ( const QmuParserError &a_Obj ) return *this; } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief Replace all ocuurences of a substring with another string. - * @param strFind The string that shall be replaced. - * @param strReplaceWith The string that should be inserted instead of strFind - */ -void QmuParserError::ReplaceSubString ( QString &strSource, const QString &strFind, const QString &strReplaceWith ) -{ - QString strResult; - int iPos ( 0 ); - - for ( ;; ) - { - int iNext = strSource.indexOf ( strFind, iPos ); - strResult.append ( strSource.mid ( iPos, iNext - iPos ) ); - - if ( iNext == -1 ) - { - break; - } - - strResult.append ( strReplaceWith ); - iPos = iNext + strFind.length(); - } - - strSource.swap ( strResult ); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief Reset the erro object. diff --git a/src/libs/qmuparser/qmuparsererror.h b/src/libs/qmuparser/qmuparsererror.h index 49b16e972..e90ec29b7 100644 --- a/src/libs/qmuparser/qmuparsererror.h +++ b/src/libs/qmuparser/qmuparsererror.h @@ -157,10 +157,6 @@ private: int m_iPos; ///< Formula position related to the error EErrorCodes m_iErrc; ///< Error code const QmuParserErrorMsg &m_ErrMsg; - /** - * @brief Replace all ocuurences of a substring with another string. - */ - static void ReplaceSubString ( QString &strSource, const QString &strFind, const QString &strReplaceWith ); void Reset(); }; diff --git a/src/libs/qmuparser/qmuparsertokenreader.cpp b/src/libs/qmuparser/qmuparsertokenreader.cpp index bbcf768bf..e7ae392f7 100644 --- a/src/libs/qmuparser/qmuparsertokenreader.cpp +++ b/src/libs/qmuparser/qmuparsertokenreader.cpp @@ -22,7 +22,6 @@ #include "qmuparsertokenreader.h" #include "qmuparserbase.h" - #include #include