diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index b041e9819..10b640c93 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -43,7 +43,7 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId, QWidget *parent) :DialogTool(data, toolId, parent), ui(new Ui::DialogAlongLine), number(0), typeLine(QString()), formula(QString()), firstPointId(NULL_ID), secondPointId(NULL_ID), formulaBaseHeight(0), - line(nullptr) + line(nullptr), lineColor(VAbstractTool::ColorBlack) { ui->setupUi(this); InitVariables(ui); @@ -249,10 +249,23 @@ void DialogAlongLine::setFormula(const QString &value) void DialogAlongLine::setTypeLine(const QString &value) { typeLine = value; - SetupTypeLine(ui->comboBoxLineType, value); + ChangeCurrentData(ui->comboBoxLineType, value); line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); } +//--------------------------------------------------------------------------------------------------------------------- +QString DialogAlongLine::getLineColor() const +{ + return lineColor; +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogAlongLine::setLineColor(const QString &value) +{ + lineColor = value; + ChangeCurrentData(ui->comboBoxLineColor, value); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief setPointName set name of point diff --git a/src/app/dialogs/tools/dialogalongline.h b/src/app/dialogs/tools/dialogalongline.h index 01dd498a5..667c42aea 100644 --- a/src/app/dialogs/tools/dialogalongline.h +++ b/src/app/dialogs/tools/dialogalongline.h @@ -53,6 +53,9 @@ public: QString getTypeLine() const; void setTypeLine(const QString &value); + QString getLineColor() const; + void setLineColor(const QString &value); + QString getFormula() const; void setFormula(const QString &value); @@ -103,6 +106,8 @@ private: /** @brief formulaBaseHeight base height defined by dialogui */ int formulaBaseHeight; VisToolAlongLine *line; + + QString lineColor; }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index 9329de8a3..015818202 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -218,7 +218,7 @@ void DialogBisector::setPointName(const QString &value) void DialogBisector::setTypeLine(const QString &value) { typeLine = value; - SetupTypeLine(ui->comboBoxLineType, value); + ChangeCurrentData(ui->comboBoxLineType, value); line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); } diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp index feeb9ef55..85728e8a1 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp @@ -103,7 +103,7 @@ QString DialogCurveIntersectAxis::getTypeLine() const void DialogCurveIntersectAxis::setTypeLine(const QString &value) { typeLine = value; - SetupTypeLine(ui->comboBoxLineType, value); + ChangeCurrentData(ui->comboBoxLineType, value); line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); } diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 8c25748a5..af11b8778 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -173,7 +173,7 @@ void DialogEndLine::setPointName(const QString &value) void DialogEndLine::setTypeLine(const QString &value) { typeLine = value; - SetupTypeLine(ui->comboBoxLineType, value); + ChangeCurrentData(ui->comboBoxLineType, value); line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); } diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index 2a6d17084..898ebcfe9 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -97,7 +97,7 @@ void DialogHeight::setPointName(const QString &value) void DialogHeight::setTypeLine(const QString &value) { typeLine = value; - SetupTypeLine(ui->comboBoxLineType, value); + ChangeCurrentData(ui->comboBoxLineType, value); line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); } diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp index 3f635a774..0c3cafc9c 100644 --- a/src/app/dialogs/tools/dialogline.cpp +++ b/src/app/dialogs/tools/dialogline.cpp @@ -96,7 +96,7 @@ void DialogLine::setSecondPoint(const quint32 &value) void DialogLine::setTypeLine(const QString &value) { typeLine = value; - SetupTypeLine(ui->comboBoxLineType, value); + ChangeCurrentData(ui->comboBoxLineType, value); line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); } diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.cpp b/src/app/dialogs/tools/dialoglineintersectaxis.cpp index 09cbb04e5..9e62e943b 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/app/dialogs/tools/dialoglineintersectaxis.cpp @@ -112,7 +112,7 @@ QString DialogLineIntersectAxis::getTypeLine() const void DialogLineIntersectAxis::setTypeLine(const QString &value) { typeLine = value; - SetupTypeLine(ui->comboBoxLineType, value); + ChangeCurrentData(ui->comboBoxLineType, value); line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); } diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 58947b0e4..53c934b03 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -255,7 +255,7 @@ void DialogNormal::setFormula(const QString &value) void DialogNormal::setTypeLine(const QString &value) { typeLine = value; - SetupTypeLine(ui->comboBoxLineType, value); + ChangeCurrentData(ui->comboBoxLineType, value); line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); } diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index 14ee285bb..cee6737cb 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -283,7 +283,7 @@ void DialogShoulderPoint::setFormula(const QString &value) void DialogShoulderPoint::setTypeLine(const QString &value) { typeLine = value; - SetupTypeLine(ui->comboBoxLineType, value); + ChangeCurrentData(ui->comboBoxLineType, value); line->setLineStyle(VAbstractTool::LineStyleToPenStyle(typeLine)); } diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index bcd73eab9..ba346bc1a 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -374,29 +374,13 @@ QString DialogTool::GetLineColor(const QComboBox *box) const return value; } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief SetupTypeLine setupe type of line - * @param box combobox - * @param value string from pattern file - */ -void DialogTool::SetupTypeLine(QComboBox *box, const QString &value) -{ - SCASSERT(box != nullptr) - const qint32 index = box->findData(value); - if (index != -1) - { - box->setCurrentIndex(index); - } -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief ChangeCurrentData select item in combobox by id * @param box combobox * @param value id of item */ -void DialogTool::ChangeCurrentData(QComboBox *box, const quint32 &value) const +void DialogTool::ChangeCurrentData(QComboBox *box, const QVariant &value) const { SCASSERT(box != nullptr) const qint32 index = box->findData(value); diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index aad677211..a488b3db2 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -224,8 +224,7 @@ protected: QString GetLineColor(const QComboBox *box)const; template void ShowVariable(const QMap var); - void SetupTypeLine(QComboBox *box, const QString &value); - void ChangeCurrentData(QComboBox *box, const quint32 &value) const; + void ChangeCurrentData(QComboBox *box, const QVariant &value) const; void PutValHere(QLineEdit *lineEdit, QListWidget *listWidget); void PutValHere(QPlainTextEdit *plainTextEdit, QListWidget *listWidget); void ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer * timer);