From c52d0a045d747ba2b92aa8dfcd58b0f6b66d2bf2 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 3 Feb 2015 10:45:27 +0200 Subject: [PATCH] Refactoring. --HG-- branch : feature --- src/app/dialogs/tools/dialogalongline.cpp | 11 +++++------ src/app/dialogs/tools/dialogalongline.h | 3 --- src/app/dialogs/tools/dialogbisector.cpp | 13 ++++++------- src/app/dialogs/tools/dialogbisector.h | 3 --- src/app/dialogs/tools/dialogcurveintersectaxis.cpp | 10 ++++------ src/app/dialogs/tools/dialogcurveintersectaxis.h | 3 --- src/app/dialogs/tools/dialogendline.cpp | 10 ++++------ src/app/dialogs/tools/dialogendline.h | 3 --- src/app/dialogs/tools/dialogheight.cpp | 10 ++++------ src/app/dialogs/tools/dialogheight.h | 3 --- src/app/dialogs/tools/dialogline.cpp | 11 ++++------- src/app/dialogs/tools/dialogline.h | 2 -- src/app/dialogs/tools/dialoglineintersectaxis.cpp | 12 +++++------- src/app/dialogs/tools/dialoglineintersectaxis.h | 3 --- src/app/dialogs/tools/dialognormal.cpp | 12 +++++------- src/app/dialogs/tools/dialognormal.h | 3 --- src/app/dialogs/tools/dialogshoulderpoint.cpp | 12 +++++------- src/app/dialogs/tools/dialogshoulderpoint.h | 3 --- 18 files changed, 42 insertions(+), 85 deletions(-) diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index 2752ec77a..382b1c2f6 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -42,7 +42,7 @@ */ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId, QWidget *parent) :DialogTool(data, toolId, parent), ui(new Ui::DialogAlongLine), - typeLine(QString()), formula(QString()), formulaBaseHeight(0), line(nullptr), lineColor(VAbstractTool::ColorBlack) + formula(QString()), formulaBaseHeight(0), line(nullptr), lineColor(VAbstractTool::ColorBlack) { ui->setupUi(this); InitVariables(ui); @@ -180,14 +180,14 @@ void DialogAlongLine::ChosenObject(quint32 id, const SceneObject &type) void DialogAlongLine::SaveData() { pointName = ui->lineEditNamePoint->text(); - typeLine = GetTypeLine(ui->comboBoxLineType); + formula = ui->plainTextEditFormula->toPlainText(); formula.replace("\n", " "); line->setPoint1Id(getFirstPointId()); line->setPoint2Id(getSecondPointId()); line->setLength(formula); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(getTypeLine())); line->RefreshGeometry(); } @@ -245,9 +245,8 @@ void DialogAlongLine::setFormula(const QString &value) */ void DialogAlongLine::setTypeLine(const QString &value) { - typeLine = value; ChangeCurrentData(ui->comboBoxLineType, value); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(value)); } //--------------------------------------------------------------------------------------------------------------------- @@ -281,7 +280,7 @@ void DialogAlongLine::setPointName(const QString &value) */ QString DialogAlongLine::getTypeLine() const { - return typeLine; + return GetTypeLine(ui->comboBoxLineType); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogalongline.h b/src/app/dialogs/tools/dialogalongline.h index 636153379..d506e10c1 100644 --- a/src/app/dialogs/tools/dialogalongline.h +++ b/src/app/dialogs/tools/dialogalongline.h @@ -88,9 +88,6 @@ private: /** @brief ui keeps information about user interface */ Ui::DialogAlongLine *ui; - /** @brief typeLine type of line */ - QString typeLine; - /** @brief formula formula */ QString formula; diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index 70b159e9d..b1f46eca3 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -42,8 +42,8 @@ * @param parent parent widget */ DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogBisector), typeLine(QString()), - formula(QString()), formulaBaseHeight(0), line(nullptr) + :DialogTool(data, toolId, parent), ui(new Ui::DialogBisector), formula(QString()), formulaBaseHeight(0), + line(nullptr) { ui->setupUi(this); InitVariables(ui); @@ -216,9 +216,8 @@ void DialogBisector::setPointName(const QString &value) */ void DialogBisector::setTypeLine(const QString &value) { - typeLine = value; ChangeCurrentData(ui->comboBoxLineType, value); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(value)); } //--------------------------------------------------------------------------------------------------------------------- @@ -276,7 +275,7 @@ void DialogBisector::setThirdPointId(const quint32 &value) void DialogBisector::SaveData() { pointName = ui->lineEditNamePoint->text(); - typeLine = GetTypeLine(ui->comboBoxLineType); + formula = ui->plainTextEditFormula->toPlainText(); formula.replace("\n", " "); @@ -284,7 +283,7 @@ void DialogBisector::SaveData() line->setPoint2Id(getSecondPointId()); line->setPoint3Id(getThirdPointId()); line->setLength(formula); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(getTypeLine())); line->RefreshGeometry(); } @@ -302,7 +301,7 @@ void DialogBisector::closeEvent(QCloseEvent *event) */ QString DialogBisector::getTypeLine() const { - return typeLine; + return GetTypeLine(ui->comboBoxLineType); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogbisector.h b/src/app/dialogs/tools/dialogbisector.h index 63c45e67b..70b55cb6c 100644 --- a/src/app/dialogs/tools/dialogbisector.h +++ b/src/app/dialogs/tools/dialogbisector.h @@ -89,9 +89,6 @@ private: /** @brief ui keeps information about user interface */ Ui::DialogBisector *ui; - /** @brief typeLine type of line */ - QString typeLine; - /** @brief formula formula */ QString formula; diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp index d395fe276..74a706bd6 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp @@ -38,7 +38,7 @@ //--------------------------------------------------------------------------------------------------------------------- DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogCurveIntersectAxis), typeLine(QString()), + :DialogTool(data, toolId, parent), ui(new Ui::DialogCurveIntersectAxis), formulaAngle(QString()), formulaBaseHeightAngle(0), line(nullptr) { ui->setupUi(this); @@ -90,15 +90,14 @@ void DialogCurveIntersectAxis::setPointName(const QString &value) //--------------------------------------------------------------------------------------------------------------------- QString DialogCurveIntersectAxis::getTypeLine() const { - return typeLine; + return GetTypeLine(ui->comboBoxLineType); } //--------------------------------------------------------------------------------------------------------------------- void DialogCurveIntersectAxis::setTypeLine(const QString &value) { - typeLine = value; ChangeCurrentData(ui->comboBoxLineType, value); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(value)); } //--------------------------------------------------------------------------------------------------------------------- @@ -252,7 +251,6 @@ void DialogCurveIntersectAxis::ShowVisualization() void DialogCurveIntersectAxis::SaveData() { pointName = ui->lineEditNamePoint->text(); - typeLine = GetTypeLine(ui->comboBoxLineType); formulaAngle = ui->plainTextEditFormula->toPlainText(); formulaAngle.replace("\n", " "); @@ -260,7 +258,7 @@ void DialogCurveIntersectAxis::SaveData() line->setPoint1Id(getCurveId()); line->setAxisPointId(getBasePointId()); line->setAngle(formulaAngle); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(getTypeLine())); line->RefreshGeometry(); } diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.h b/src/app/dialogs/tools/dialogcurveintersectaxis.h index 516c193a1..19e03ad54 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.h +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.h @@ -77,9 +77,6 @@ private: Q_DISABLE_COPY(DialogCurveIntersectAxis) Ui::DialogCurveIntersectAxis *ui; - /** @brief typeLine type of line */ - QString typeLine; - QString formulaAngle; int formulaBaseHeightAngle; diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 8794d125c..fd9724d48 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -43,7 +43,7 @@ * @param parent parent widget */ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogEndLine), typeLine(QString()), + :DialogTool(data, toolId, parent), ui(new Ui::DialogEndLine), formulaLength(QString()), formulaAngle(QString()), formulaBaseHeight(0), formulaBaseHeightAngle(0), line(nullptr) { ui->setupUi(this); @@ -170,9 +170,8 @@ void DialogEndLine::setPointName(const QString &value) */ void DialogEndLine::setTypeLine(const QString &value) { - typeLine = value; ChangeCurrentData(ui->comboBoxLineType, value); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(value)); } //--------------------------------------------------------------------------------------------------------------------- @@ -273,7 +272,6 @@ void DialogEndLine::ShowVisualization() void DialogEndLine::SaveData() { pointName = ui->lineEditNamePoint->text(); - typeLine = GetTypeLine(ui->comboBoxLineType); formulaLength = ui->plainTextEditFormula->toPlainText(); formulaLength.replace("\n", " "); @@ -284,7 +282,7 @@ void DialogEndLine::SaveData() line->setPoint1Id(getBasePointId()); line->setLength(formulaLength); line->setAngle(formulaAngle); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(getTypeLine())); line->RefreshGeometry(); } @@ -313,7 +311,7 @@ DialogEndLine::~DialogEndLine() */ QString DialogEndLine::getTypeLine() const { - return typeLine; + return GetTypeLine(ui->comboBoxLineType); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogendline.h b/src/app/dialogs/tools/dialogendline.h index bbb836b5e..8cfbf2ade 100644 --- a/src/app/dialogs/tools/dialogendline.h +++ b/src/app/dialogs/tools/dialogendline.h @@ -90,9 +90,6 @@ private: /** @brief ui keeps information about user interface */ Ui::DialogEndLine *ui; - /** @brief typeLine type of line */ - QString typeLine; - /** @brief formula formula */ QString formulaLength; diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index fe4057a1a..4a463d516 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -42,7 +42,7 @@ * @param parent parent widget */ DialogHeight::DialogHeight(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogHeight), typeLine(QString()), line(nullptr) + :DialogTool(data, toolId, parent), ui(new Ui::DialogHeight), line(nullptr) { ui->setupUi(this); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); @@ -95,9 +95,8 @@ void DialogHeight::setPointName(const QString &value) */ void DialogHeight::setTypeLine(const QString &value) { - typeLine = value; ChangeCurrentData(ui->comboBoxLineType, value); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(value)); } //--------------------------------------------------------------------------------------------------------------------- @@ -196,12 +195,11 @@ void DialogHeight::ChosenObject(quint32 id, const SceneObject &type) void DialogHeight::SaveData() { pointName = ui->lineEditNamePoint->text(); - typeLine = GetTypeLine(ui->comboBoxLineType); line->setPoint1Id(getBasePointId()); line->setLineP1Id(getP1LineId()); line->setLineP2Id(getP2LineId()); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(getTypeLine())); line->RefreshGeometry(); } @@ -267,7 +265,7 @@ void DialogHeight::ShowVisualization() */ QString DialogHeight::getTypeLine() const { - return typeLine; + return GetTypeLine(ui->comboBoxLineType); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogheight.h b/src/app/dialogs/tools/dialogheight.h index 93f67574e..863ba0b94 100644 --- a/src/app/dialogs/tools/dialogheight.h +++ b/src/app/dialogs/tools/dialogheight.h @@ -77,9 +77,6 @@ private: /** @brief ui keeps information about user interface */ Ui::DialogHeight *ui; - /** @brief typeLine type of line */ - QString typeLine; - VisToolHeight *line; }; diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp index c864c49fa..b9f79a2cb 100644 --- a/src/app/dialogs/tools/dialogline.cpp +++ b/src/app/dialogs/tools/dialogline.cpp @@ -43,7 +43,7 @@ * @param parent parent widget */ DialogLine::DialogLine(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogLine), typeLine(QString()), line(nullptr) + :DialogTool(data, toolId, parent), ui(new Ui::DialogLine), line(nullptr) { ui->setupUi(this); InitOkCancelApply(ui); @@ -94,9 +94,8 @@ void DialogLine::setSecondPoint(const quint32 &value) */ void DialogLine::setTypeLine(const QString &value) { - typeLine = value; ChangeCurrentData(ui->comboBoxLineType, value); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(value)); } //--------------------------------------------------------------------------------------------------------------------- @@ -153,11 +152,9 @@ void DialogLine::ShowVisualization() //--------------------------------------------------------------------------------------------------------------------- void DialogLine::SaveData() { - typeLine = GetTypeLine(ui->comboBoxLineType); - line->setPoint1Id(getFirstPoint()); line->setPoint2Id(getSecondPoint()); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(getTypeLine())); line->RefreshGeometry(); } @@ -227,5 +224,5 @@ quint32 DialogLine::getSecondPoint() const */ QString DialogLine::getTypeLine() const { - return typeLine; + return GetTypeLine(ui->comboBoxLineType); } diff --git a/src/app/dialogs/tools/dialogline.h b/src/app/dialogs/tools/dialogline.h index 66ed3c18b..209bfadfe 100644 --- a/src/app/dialogs/tools/dialogline.h +++ b/src/app/dialogs/tools/dialogline.h @@ -72,8 +72,6 @@ private: /** @brief ui keeps information about user interface */ Ui::DialogLine *ui; - /** @brief typeLine type of line */ - QString typeLine; VisToolLine *line; }; diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.cpp b/src/app/dialogs/tools/dialoglineintersectaxis.cpp index f9c049390..4d8a8dd6e 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/app/dialogs/tools/dialoglineintersectaxis.cpp @@ -38,8 +38,8 @@ //--------------------------------------------------------------------------------------------------------------------- DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogLineIntersectAxis), typeLine(QString()), - formulaAngle(QString()), formulaBaseHeightAngle(0), line(nullptr) + :DialogTool(data, toolId, parent), ui(new Ui::DialogLineIntersectAxis), formulaAngle(QString()), + formulaBaseHeightAngle(0), line(nullptr) { ui->setupUi(this); InitVariables(ui); @@ -98,15 +98,14 @@ void DialogLineIntersectAxis::setPointName(const QString &value) //--------------------------------------------------------------------------------------------------------------------- QString DialogLineIntersectAxis::getTypeLine() const { - return typeLine; + return GetTypeLine(ui->comboBoxLineType); } //--------------------------------------------------------------------------------------------------------------------- void DialogLineIntersectAxis::setTypeLine(const QString &value) { - typeLine = value; ChangeCurrentData(ui->comboBoxLineType, value); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(value)); } //--------------------------------------------------------------------------------------------------------------------- @@ -316,7 +315,6 @@ void DialogLineIntersectAxis::ShowVisualization() void DialogLineIntersectAxis::SaveData() { pointName = ui->lineEditNamePoint->text(); - typeLine = GetTypeLine(ui->comboBoxLineType); formulaAngle = ui->plainTextEditFormula->toPlainText(); formulaAngle.replace("\n", " "); @@ -325,7 +323,7 @@ void DialogLineIntersectAxis::SaveData() line->setPoint2Id(getSecondPointId()); line->setAxisPointId(getBasePointId()); line->setAngle(formulaAngle); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(getTypeLine())); line->RefreshGeometry(); } diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.h b/src/app/dialogs/tools/dialoglineintersectaxis.h index afc1b3ce9..0c2476edf 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.h +++ b/src/app/dialogs/tools/dialoglineintersectaxis.h @@ -81,9 +81,6 @@ private: Q_DISABLE_COPY(DialogLineIntersectAxis) Ui::DialogLineIntersectAxis *ui; - /** @brief typeLine type of line */ - QString typeLine; - QString formulaAngle; int formulaBaseHeightAngle; diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 4e6dd7649..1d27aaef6 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -39,8 +39,8 @@ * @param parent parent widget */ DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogNormal), typeLine(QString()), - formula(QString()), angle(0), formulaBaseHeight(0), line(nullptr) + :DialogTool(data, toolId, parent), ui(new Ui::DialogNormal), formula(QString()), angle(0), formulaBaseHeight(0), + line(nullptr) { ui->setupUi(this); InitVariables(ui); @@ -173,7 +173,6 @@ void DialogNormal::ChosenObject(quint32 id, const SceneObject &type) void DialogNormal::SaveData() { pointName = ui->lineEditNamePoint->text(); - typeLine = GetTypeLine(ui->comboBoxLineType); formula = ui->plainTextEditFormula->toPlainText(); formula.replace("\n", " "); angle = ui->doubleSpinBoxAngle->value(); @@ -182,7 +181,7 @@ void DialogNormal::SaveData() line->setPoint2Id(getSecondPointId()); line->setLength(formula); line->setAngle(angle); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(getTypeLine())); line->RefreshGeometry(); } @@ -252,9 +251,8 @@ void DialogNormal::setFormula(const QString &value) */ void DialogNormal::setTypeLine(const QString &value) { - typeLine = value; ChangeCurrentData(ui->comboBoxLineType, value); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(value)); } //--------------------------------------------------------------------------------------------------------------------- @@ -275,7 +273,7 @@ void DialogNormal::setPointName(const QString &value) */ QString DialogNormal::getTypeLine() const { - return typeLine; + return GetTypeLine(ui->comboBoxLineType); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialognormal.h b/src/app/dialogs/tools/dialognormal.h index 7bde3c54b..46ff174b4 100644 --- a/src/app/dialogs/tools/dialognormal.h +++ b/src/app/dialogs/tools/dialognormal.h @@ -88,9 +88,6 @@ private: /** @brief ui keeps information about user interface */ Ui::DialogNormal *ui; - /** @brief typeLine type of line */ - QString typeLine; - /** @brief formula formula */ QString formula; diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index a274207f4..27fc22b31 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -42,8 +42,8 @@ * @param parent parent widget */ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogShoulderPoint), typeLine(QString()), - formula(QString()), formulaBaseHeight(0), line (nullptr) + :DialogTool(data, toolId, parent), ui(new Ui::DialogShoulderPoint), formula(QString()), + formulaBaseHeight(0), line (nullptr) { ui->setupUi(this); InitVariables(ui); @@ -201,7 +201,6 @@ void DialogShoulderPoint::ChosenObject(quint32 id, const SceneObject &type) void DialogShoulderPoint::SaveData() { pointName = ui->lineEditNamePoint->text(); - typeLine = GetTypeLine(ui->comboBoxLineType); formula = ui->plainTextEditFormula->toPlainText(); formula.replace("\n", " "); @@ -209,7 +208,7 @@ void DialogShoulderPoint::SaveData() line->setLineP1Id(getP1Line()); line->setLineP2Id(getP2Line()); line->setLength(formula); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(getTypeLine())); line->RefreshGeometry(); } @@ -278,9 +277,8 @@ void DialogShoulderPoint::setFormula(const QString &value) */ void DialogShoulderPoint::setTypeLine(const QString &value) { - typeLine = value; ChangeCurrentData(ui->comboBoxLineType, value); - line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); + line->setLineStyle(VAbstractTool::LineStyleToPenStyle(value)); } //--------------------------------------------------------------------------------------------------------------------- @@ -301,7 +299,7 @@ void DialogShoulderPoint::setPointName(const QString &value) */ QString DialogShoulderPoint::getTypeLine() const { - return typeLine; + return GetTypeLine(ui->comboBoxLineType); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogshoulderpoint.h b/src/app/dialogs/tools/dialogshoulderpoint.h index dd60b7c6f..62a829aaf 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.h +++ b/src/app/dialogs/tools/dialogshoulderpoint.h @@ -88,9 +88,6 @@ private: /** @brief ui keeps information about user interface */ Ui::DialogShoulderPoint *ui; - /** @brief typeLine type of line */ - QString typeLine; - /** @brief formula formula */ QString formula;