From 718ff2056a954820632e0ae305b5dca87efdc7e9 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Sat, 14 Aug 2021 15:18:15 +0300
Subject: [PATCH] Refactor names to avoid confusion.

---
 src/app/puzzle/scene/vpgraphicspiece.cpp |  2 +-
 src/libs/vdxf/vdxfengine.cpp             | 16 ++++++++--------
 src/libs/vlayout/vlayoutpiece.cpp        | 10 ++++++++--
 src/libs/vlayout/vlayoutpiece.h          |  3 ++-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/app/puzzle/scene/vpgraphicspiece.cpp b/src/app/puzzle/scene/vpgraphicspiece.cpp
index 16b7d0b1b..52322a75e 100644
--- a/src/app/puzzle/scene/vpgraphicspiece.cpp
+++ b/src/app/puzzle/scene/vpgraphicspiece.cpp
@@ -317,7 +317,7 @@ void VPGraphicsPiece::PaintPiece(QPainter *painter)
     }
 
     // initialises the place labels (buttons etc)
-    QVector<VLayoutPlaceLabel> placeLabels = m_piece->GetPlaceLabels();
+    QVector<VLayoutPlaceLabel> placeLabels = m_piece->GetMappedPlaceLabels();
     for(auto &placeLabel : placeLabels)
     {
         QPainterPath path = VPlaceLabelItem::LabelShapePath(placeLabel.shape);
diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp
index a1860df04..6fab0f9c1 100644
--- a/src/libs/vdxf/vdxfengine.cpp
+++ b/src/libs/vdxf/vdxfengine.cpp
@@ -727,7 +727,7 @@ void VDxfEngine::ExportAAMADraw(dx_ifaceBlock *detailBlock, const VLayoutPiece &
         }
     }
 
-    const QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(false);
+    const QVector<QVector<QPointF>> drawIntCut = detail.MappedInternalPathsForCut(false);
     for(auto &intCut : drawIntCut)
     {
         if (DRW_Entity *e = AAMAPolygon(intCut, QChar('8'), false))
@@ -736,7 +736,7 @@ void VDxfEngine::ExportAAMADraw(dx_ifaceBlock *detailBlock, const VLayoutPiece &
         }
     }
 
-    const QVector<VLayoutPlaceLabel> labels = detail.GetPlaceLabels();
+    const QVector<VLayoutPlaceLabel> labels = detail.GetMappedPlaceLabels();
     for(auto &label : labels)
     {
         if (label.type != PlaceLabelType::Doubletree && label.type != PlaceLabelType::Button
@@ -756,7 +756,7 @@ void VDxfEngine::ExportAAMADraw(dx_ifaceBlock *detailBlock, const VLayoutPiece &
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportAAMAIntcut(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(true);
+    QVector<QVector<QPointF>> drawIntCut = detail.MappedInternalPathsForCut(true);
     for(auto &intCut : drawIntCut)
     {
         if (DRW_Entity *e = AAMAPolygon(intCut, "11", false))
@@ -833,7 +833,7 @@ void VDxfEngine::ExportStyleSystemText(const QSharedPointer<dx_iface> &input, co
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportAAMADrill(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    const QVector<VLayoutPlaceLabel> labels = detail.GetPlaceLabels();
+    const QVector<VLayoutPlaceLabel> labels = detail.GetMappedPlaceLabels();
 
     for(auto &label : labels)
     {
@@ -953,7 +953,7 @@ void VDxfEngine::ExportASTMSewLine(dx_ifaceBlock *detailBlock, const VLayoutPiec
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportASTMInternalLine(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    const QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(false);
+    const QVector<QVector<QPointF>> drawIntCut = detail.MappedInternalPathsForCut(false);
     for(auto &intCut : drawIntCut)
     {
         // Internal line
@@ -969,7 +969,7 @@ void VDxfEngine::ExportASTMInternalLine(dx_ifaceBlock *detailBlock, const VLayou
         }
     }
 
-    const QVector<VLayoutPlaceLabel> labels = detail.GetPlaceLabels();
+    const QVector<VLayoutPlaceLabel> labels = detail.GetMappedPlaceLabels();
     for(auto &label : labels)
     {
         if (label.type != PlaceLabelType::Doubletree && label.type != PlaceLabelType::Button
@@ -996,7 +996,7 @@ void VDxfEngine::ExportASTMInternalLine(dx_ifaceBlock *detailBlock, const VLayou
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportASTMInternalCutout(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    QVector<QVector<QPointF>> drawIntCut = detail.InternalPathsForCut(true);
+    QVector<QVector<QPointF>> drawIntCut = detail.MappedInternalPathsForCut(true);
     for(auto &intCut : drawIntCut)
     {
         // Internal cutout
@@ -1026,7 +1026,7 @@ void VDxfEngine::ExportASTMAnnotationText(dx_ifaceBlock *detailBlock, const VLay
 //---------------------------------------------------------------------------------------------------------------------
 void VDxfEngine::ExportASTMDrill(dx_ifaceBlock *detailBlock, const VLayoutPiece &detail)
 {
-    const QVector<VLayoutPlaceLabel> labels = detail.GetPlaceLabels();
+    const QVector<VLayoutPlaceLabel> labels = detail.GetMappedPlaceLabels();
 
     for(auto &label : labels)
     {
diff --git a/src/libs/vlayout/vlayoutpiece.cpp b/src/libs/vlayout/vlayoutpiece.cpp
index d8124125a..d6a49e749 100644
--- a/src/libs/vlayout/vlayoutpiece.cpp
+++ b/src/libs/vlayout/vlayoutpiece.cpp
@@ -1083,11 +1083,17 @@ void VLayoutPiece::SetPassmarks(const QVector<VLayoutPassmark> &passmarks)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QVector<VLayoutPlaceLabel> VLayoutPiece::GetPlaceLabels() const
+QVector<VLayoutPlaceLabel> VLayoutPiece::GetMappedPlaceLabels() const
 {
     return Map(d->m_placeLabels);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+QVector<VLayoutPlaceLabel> VLayoutPiece::GetPlaceLabels() const
+{
+    return d->m_placeLabels;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VLayoutPiece::SetPlaceLabels(const QVector<VLayoutPlaceLabel> &labels)
 {
@@ -1095,7 +1101,7 @@ void VLayoutPiece::SetPlaceLabels(const QVector<VLayoutPlaceLabel> &labels)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QVector<QVector<QPointF> > VLayoutPiece::InternalPathsForCut(bool cut) const
+QVector<QVector<QPointF> > VLayoutPiece::MappedInternalPathsForCut(bool cut) const
 {
     QVector<QVector<QPointF> > paths;
 
diff --git a/src/libs/vlayout/vlayoutpiece.h b/src/libs/vlayout/vlayoutpiece.h
index a8fae0da2..c1d1e1f26 100644
--- a/src/libs/vlayout/vlayoutpiece.h
+++ b/src/libs/vlayout/vlayoutpiece.h
@@ -90,10 +90,11 @@ public:
     QVector<VLayoutPassmark> GetPassmarks() const;
     void SetPassmarks(const QVector<VLayoutPassmark> &passmarks);
 
+    QVector<VLayoutPlaceLabel> GetMappedPlaceLabels() const;
     QVector<VLayoutPlaceLabel> GetPlaceLabels() const;
     void SetPlaceLabels(const QVector<VLayoutPlaceLabel> &labels);
 
-    QVector<QVector<QPointF>> InternalPathsForCut(bool cut) const;
+    QVector<QVector<QPointF>> MappedInternalPathsForCut(bool cut) const;
     QVector<VLayoutPiecePath> GetInternalPaths() const;
     void SetInternalPaths(const QVector<VLayoutPiecePath> &internalPaths);