diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h index caad6afcd..c77fe9e32 100644 --- a/src/libs/ifc/xml/vabstractpattern.h +++ b/src/libs/ifc/xml/vabstractpattern.h @@ -40,7 +40,7 @@ enum class LabelType : char {NewPatternPiece, NewLabel}; // Don't touch values!!!. Same values stored in xml. enum class CrossCirclesPoint : char {FirstPoint = 1, SecondPoint = 2}; enum class VCrossCurvesPoint : char {HighestPoint = 1, LowestPoint = 2}; -enum class HCrossCurvesPoint : char {LeftPoint = 1, RightPoint = 2}; +enum class HCrossCurvesPoint : char {LeftmostPoint = 1, RightmostPoint = 2}; class VDataTool; class VContainer; diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp index 7e3b768a7..5cff1eb04 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp @@ -241,8 +241,8 @@ void DialogTool::FillComboBoxHCrossCurvesPoint(QComboBox *box) const { SCASSERT(box != nullptr); - box->addItem(tr("Leftmost point"), QVariant(static_cast(HCrossCurvesPoint::LeftPoint))); - box->addItem(tr("Rightmost point"), QVariant(static_cast(HCrossCurvesPoint::RightPoint))); + box->addItem(tr("Leftmost point"), QVariant(static_cast(HCrossCurvesPoint::LeftmostPoint))); + box->addItem(tr("Rightmost point"), QVariant(static_cast(HCrossCurvesPoint::RightmostPoint))); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp index 04f1716bd..a077d58d8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp @@ -217,7 +217,7 @@ QPointF VToolPointOfIntersectionCurves::FindPoint(const QVector &curve1 QPointF crossPoint = vIntersections.at(0); - if (hCrossPoint == HCrossCurvesPoint::RightPoint) + if (hCrossPoint == HCrossCurvesPoint::RightmostPoint) { qreal maxX = vIntersections.at(0).x(); diff --git a/src/libs/vtools/visualization/vistoolpointofintersectioncurves.cpp b/src/libs/vtools/visualization/vistoolpointofintersectioncurves.cpp index 7dc7f293f..cb62b75bd 100644 --- a/src/libs/vtools/visualization/vistoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/visualization/vistoolpointofintersectioncurves.cpp @@ -34,7 +34,7 @@ VisToolPointOfIntersectionCurves::VisToolPointOfIntersectionCurves(const VContai :VisPath(data, parent), object2Id(NULL_ID), vCrossPoint(VCrossCurvesPoint::HighestPoint), - hCrossPoint(HCrossCurvesPoint::LeftPoint), + hCrossPoint(HCrossCurvesPoint::LeftmostPoint), point(nullptr), visCurve2(nullptr) { diff --git a/src/test/ValentinaTest/tst_findpoint.cpp b/src/test/ValentinaTest/tst_findpoint.cpp index 31f10b20d..ab7c76923 100644 --- a/src/test/ValentinaTest/tst_findpoint.cpp +++ b/src/test/ValentinaTest/tst_findpoint.cpp @@ -50,7 +50,7 @@ void TST_FindPoint::TestPointOfIntersectionCurves_data() QVector points2; VCrossCurvesPoint v = VCrossCurvesPoint::HighestPoint; - HCrossCurvesPoint h = HCrossCurvesPoint::LeftPoint; + HCrossCurvesPoint h = HCrossCurvesPoint::LeftmostPoint; QPointF p; QTest::newRow("Empty lists of points") << points1 << points2 << static_cast(v) << static_cast(h) << p; @@ -91,12 +91,12 @@ void TST_FindPoint::TestPointOfIntersectionCurves_data() p = QPointF(19, 16); - h = HCrossCurvesPoint::LeftPoint; + h = HCrossCurvesPoint::LeftmostPoint; QTest::newRow("Two intersection points (highest point, leftmost point)") << points1 << points2 << static_cast(v) << static_cast(h) << p; - h = HCrossCurvesPoint::RightPoint; + h = HCrossCurvesPoint::RightmostPoint; QTest::newRow("Two intersection points (highest point, rightmost point)") << points1 << points2 << static_cast(v) << static_cast(h) << p; @@ -104,12 +104,12 @@ void TST_FindPoint::TestPointOfIntersectionCurves_data() v = VCrossCurvesPoint::LowestPoint; p = QPointF(19, 24); - h = HCrossCurvesPoint::LeftPoint; + h = HCrossCurvesPoint::LeftmostPoint; QTest::newRow("Two intersection points (lowest point, leftmost point)") << points1 << points2 << static_cast(v) << static_cast(h) << p; - h = HCrossCurvesPoint::RightPoint; + h = HCrossCurvesPoint::RightmostPoint; QTest::newRow("Two intersection points (lowest point, rightmost point)") << points1 << points2 << static_cast(v) << static_cast(h) << p; @@ -124,7 +124,7 @@ void TST_FindPoint::TestPointOfIntersectionCurves_data() points2.append(QPointF(20, 15)); points2.append(QPointF(30, 30)); - h = HCrossCurvesPoint::LeftPoint; + h = HCrossCurvesPoint::LeftmostPoint; p = QPointF(16.6667, 20); v = VCrossCurvesPoint::HighestPoint; @@ -137,7 +137,7 @@ void TST_FindPoint::TestPointOfIntersectionCurves_data() << static_cast(v) << static_cast(h) << p; - h = HCrossCurvesPoint::RightPoint; + h = HCrossCurvesPoint::RightmostPoint; p = QPointF(23.3333, 20); v = VCrossCurvesPoint::HighestPoint;