Merged develop into feature

--HG--
branch : feature

dist/ebuild/valentina-0.0.0(template_stable).ebuild

@@ -33,7 +33,7 @@ CDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtnetwork:5
 	app-text/poppler"
-RDEPEND="${CDEPEND}
+RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}
 	app-arch/unzip"
 	

dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild

@@ -35,7 +35,7 @@ CDEPEND="
 		dev-qt/qtprintsupport:5
 		dev-qt/qtnetwork:5
 		app-text/poppler"
-RDEPEND="${CDEPEND}
+RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}
 		dev-util/ccache"
 

src/app/tape/dialogs/dialogmdatabase.cpp

@@ -168,7 +168,7 @@ void DialogMDataBase::RetranslateGroups()
 QString DialogMDataBase::ImgTag(const QString &number)
 {
     QString imgUrl("<img src=\"wrong.png\" align=\"center\"/>"); // In case of error
-    const QString filePath = QString("://diagrams/%1.svg").arg(MapDiagrams(number));
+    const QString filePath = QString("://diagrams/%1.svg").arg(MapDiagrams(qApp->TrVars(), number));
     if (QFileInfo(filePath).exists())
     {
         // Load your SVG

src/libs/vmisc/def.cpp

@@ -1147,20 +1147,22 @@ QStringList ListPMSystems()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QStringList ListNumbers(const QStringList &listMeasurements)
+QStringList ListNumbers(const VTranslateMeasurements *trM, const QStringList &listMeasurements)
 {
+    SCASSERT(trM != nullptr);
+
     QStringList numbers;
     for (int i=0; i < listMeasurements.size(); ++i)
     {
-        numbers.append(qApp->TrVars()->MNumber(listMeasurements.at(i)));
+        numbers.append(trM->MNumber(listMeasurements.at(i)));
     }
     return numbers;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString MapDiagrams(const QString &number)
+QString MapDiagrams(const VTranslateMeasurements *trM, const QString &number)
 {
-    switch (ListNumbers(ListGroupA()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupA()).indexOf(number))
     {
         // A
         case 0: // A01
@@ -1213,7 +1215,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupB()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupB()).indexOf(number))
     {
         // B
         case 0: // B01
@@ -1230,7 +1232,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupC()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupC()).indexOf(number))
     {
         // C
         case 0: // C01
@@ -1243,7 +1245,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupD()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupD()).indexOf(number))
     {
         // D
         case 0: // D01
@@ -1260,7 +1262,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupE()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupE()).indexOf(number))
     {
         // E
         case 0: // E01
@@ -1275,7 +1277,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupF()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupF()).indexOf(number))
     {
         // F
         case 0: // F01
@@ -1294,7 +1296,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupG()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupG()).indexOf(number))
     {
         // G
         case 0: // G01
@@ -1393,7 +1395,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupH()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupH()).indexOf(number))
     {
         // H
         case 0: // H01
@@ -1484,7 +1486,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupI()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupI()).indexOf(number))
     {
         // I
         case 0: // I01
@@ -1519,7 +1521,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupJ()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupJ()).indexOf(number))
     {
         // J
         case 0: // J01
@@ -1546,7 +1548,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupK()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupK()).indexOf(number))
     {
         // K
         case 0: // K01
@@ -1579,7 +1581,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupL()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupL()).indexOf(number))
     {
         // L
         case 0: // L01
@@ -1630,7 +1632,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupM()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupM()).indexOf(number))
     {
         // M
         case 0: // M01
@@ -1665,7 +1667,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupN()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupN()).indexOf(number))
     {
         // N
         case 0: // N01
@@ -1688,7 +1690,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupO()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupO()).indexOf(number))
     {
         // O
         case 0: // O01
@@ -1723,7 +1725,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupP()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupP()).indexOf(number))
     {
         // P
         case 0: // P01
@@ -1754,7 +1756,7 @@ QString MapDiagrams(const QString &number)
             break;
     }
 
-    switch (ListNumbers(ListGroupQ()).indexOf(number))
+    switch (ListNumbers(trM, ListGroupQ()).indexOf(number))
     {
         // Q
         case 0: // Q01

src/libs/vmisc/def.h

@@ -51,6 +51,7 @@ template <class T> class QSharedPointer;
 
 class QComboBox;
 class QMarginsF;
+class VTranslateMeasurements;
 
 #define SceneSize 50000
 #define DefPointRadius 1.5//mm
@@ -499,8 +500,8 @@ QStringList ListGroupO();
 QStringList ListGroupP();
 QStringList ListGroupQ();
 
-QStringList ListNumbers(const QStringList & listMeasurements);
+QStringList ListNumbers(const VTranslateMeasurements *trM, const QStringList & listMeasurements);
-QString MapDiagrams(const QString &number);
+QString MapDiagrams(const VTranslateMeasurements *trM, const QString &number);
 
 // pattern making systems codes
 extern const QString p0_S;

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,