Refactoring DialogTool::GetComboBoxCurrentData. Returned wrong default value.

--HG--
branch : develop

src/libs/vtools/dialogs/tools/dialogalongline.cpp

@@ -332,7 +332,7 @@ void DialogAlongLine::SetTypeLine(const QString &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogAlongLine::GetLineColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineColor);
+    return GetComboBoxCurrentData(ui->comboBoxLineColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -359,7 +359,7 @@ void DialogAlongLine::SetPointName(const QString &value)
  */
 QString DialogAlongLine::GetTypeLine() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineType);
+    return GetComboBoxCurrentData(ui->comboBoxLineType, TypeLineLine);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogarc.cpp

@@ -164,7 +164,7 @@ void DialogArc::SetF2(const QString &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogArc::GetColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxColor);
+    return GetComboBoxCurrentData(ui->comboBoxColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp

@@ -192,7 +192,7 @@ void DialogArcWithLength::SetLength(const QString &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogArcWithLength::GetColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxColor);
+    return GetComboBoxCurrentData(ui->comboBoxColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogbisector.cpp

@@ -313,7 +313,7 @@ void DialogBisector::SetThirdPointId(const quint32 &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogBisector::GetLineColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineColor);
+    return GetComboBoxCurrentData(ui->comboBoxLineColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -355,7 +355,7 @@ void DialogBisector::closeEvent(QCloseEvent *event)
  */
 QString DialogBisector::GetTypeLine() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineType);
+    return GetComboBoxCurrentData(ui->comboBoxLineType, TypeLineLine);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp

@@ -110,7 +110,7 @@ void DialogCubicBezier::SetSpline(const VCubicBezier &spline)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogCubicBezier::GetColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxColor);
+    return GetComboBoxCurrentData(ui->comboBoxColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp

@@ -117,7 +117,7 @@ void DialogCubicBezierPath::SetPath(const VCubicBezierPath &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogCubicBezierPath::GetColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxColor);
+    return GetComboBoxCurrentData(ui->comboBoxColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp

@@ -108,7 +108,7 @@ void DialogCurveIntersectAxis::SetPointName(const QString &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogCurveIntersectAxis::GetTypeLine() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineType);
+    return GetComboBoxCurrentData(ui->comboBoxLineType, TypeLineLine);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -178,7 +178,7 @@ void DialogCurveIntersectAxis::setCurveId(const quint32 &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogCurveIntersectAxis::GetLineColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineColor);
+    return GetComboBoxCurrentData(ui->comboBoxLineColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogendline.cpp

@@ -281,7 +281,7 @@ void DialogEndLine::SetBasePointId(const quint32 &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogEndLine::GetLineColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineColor);
+    return GetComboBoxCurrentData(ui->comboBoxLineColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -375,7 +375,7 @@ DialogEndLine::~DialogEndLine()
  */
 QString DialogEndLine::GetTypeLine() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineType);
+    return GetComboBoxCurrentData(ui->comboBoxLineType, TypeLineLine);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogheight.cpp

@@ -164,7 +164,7 @@ void DialogHeight::SetP2LineId(const quint32 &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogHeight::GetLineColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineColor);
+    return GetComboBoxCurrentData(ui->comboBoxLineColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -295,7 +295,7 @@ void DialogHeight::ShowVisualization()
  */
 QString DialogHeight::GetTypeLine() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineType);
+    return GetComboBoxCurrentData(ui->comboBoxLineType, TypeLineLine);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogline.cpp

@@ -110,7 +110,7 @@ void DialogLine::SetTypeLine(const QString &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogLine::GetLineColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineColor);
+    return GetComboBoxCurrentData(ui->comboBoxLineColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -247,5 +247,5 @@ quint32 DialogLine::GetSecondPoint() const
  */
 QString DialogLine::GetTypeLine() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineType);
+    return GetComboBoxCurrentData(ui->comboBoxLineType, TypeLineLine);
 }

src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp

@@ -121,7 +121,7 @@ void DialogLineIntersectAxis::SetPointName(const QString &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogLineIntersectAxis::GetTypeLine() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineType);
+    return GetComboBoxCurrentData(ui->comboBoxLineType, TypeLineLine);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -207,7 +207,7 @@ void DialogLineIntersectAxis::SetSecondPointId(const quint32 &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogLineIntersectAxis::GetLineColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineColor);
+    return GetComboBoxCurrentData(ui->comboBoxLineColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialognormal.cpp

@@ -242,7 +242,7 @@ void DialogNormal::SetSecondPointId(const quint32 &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogNormal::GetLineColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineColor);
+    return GetComboBoxCurrentData(ui->comboBoxLineColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -331,7 +331,7 @@ void DialogNormal::SetPointName(const QString &value)
  */
 QString DialogNormal::GetTypeLine() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineType);
+    return GetComboBoxCurrentData(ui->comboBoxLineType, TypeLineLine);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp

@@ -267,7 +267,7 @@ void DialogShoulderPoint::SetP3(const quint32 &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogShoulderPoint::GetLineColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineColor);
+    return GetComboBoxCurrentData(ui->comboBoxLineColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -354,7 +354,7 @@ void DialogShoulderPoint::SetPointName(const QString &value)
  */
 QString DialogShoulderPoint::GetTypeLine() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxLineType);
+    return GetComboBoxCurrentData(ui->comboBoxLineType, TypeLineLine);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogspline.cpp

@@ -614,7 +614,7 @@ void DialogSpline::SetSpline(const VSpline &spline)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogSpline::GetColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxColor);
+    return GetComboBoxCurrentData(ui->comboBoxColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogsplinepath.cpp

@@ -172,7 +172,7 @@ void DialogSplinePath::SetPath(const VSplinePath &value)
 //---------------------------------------------------------------------------------------------------------------------
 QString DialogSplinePath::GetColor() const
 {
-    return GetComboBoxCurrentData(ui->comboBoxColor);
+    return GetComboBoxCurrentData(ui->comboBoxColor, ColorBlack);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/dialogtool.cpp

@@ -302,7 +302,7 @@ void DialogTool::FillComboBoxHCrossCurvesPoint(QComboBox *box) const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString DialogTool::GetComboBoxCurrentData(const QComboBox *box) const
+QString DialogTool::GetComboBoxCurrentData(const QComboBox *box, const QString &def) const
 {
     SCASSERT(box != nullptr)
     QString value;
@@ -313,7 +313,7 @@ QString DialogTool::GetComboBoxCurrentData(const QComboBox *box) const
 #endif
     if (value.isEmpty())
     {
-        value = TypeLineLine;
+        value = def;
     }
     return value;
 }

src/libs/vtools/dialogs/tools/dialogtool.h

@@ -224,7 +224,7 @@ protected:
     void             FillComboBoxHCrossCurvesPoint(QComboBox *box) const;
 
     virtual void     CheckState();
-    QString          GetComboBoxCurrentData(const QComboBox *box)const;
+    QString          GetComboBoxCurrentData(const QComboBox *box, const QString &def)const;
     void             ChangeCurrentData(QComboBox *box, const QVariant &value) const;
     void             ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer * timer, const QString &postfix = QString());
     void             ValFormulaChanged(bool &flag, QPlainTextEdit *edit, QTimer * timer,