From 3ad624236bbb2e1495e263aecff1b7ee27982770 Mon Sep 17 00:00:00 2001 From: Abdullah Tahiri Date: Sun, 15 Oct 2023 17:23:49 +0200 Subject: [PATCH] Sketcher: DrawSketchHandler - refactor functions to draw/clear edit curve and markers --- src/Mod/Sketcher/Gui/DrawSketchHandler.cpp | 22 ++++++++++++++++------ src/Mod/Sketcher/Gui/DrawSketchHandler.h | 12 ++++++++---- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp index c7e3fcdc75..a7ded46a2c 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp @@ -337,8 +337,8 @@ void DrawSketchHandler::deactivate() ViewProviderSketchDrawSketchHandlerAttorney::setConstraintSelectability(*sketchgui, true); // clear temporary Curve and Markers from the scenograph - drawEdit(std::vector()); - drawEditMarkers(std::vector()); + clearEdit(); + clearEditMarkers(); resetPositionText(); unsetCursor(); setAngleSnapping(false); @@ -1087,17 +1087,17 @@ void DrawSketchHandler::resetPositionText() ViewProviderSketchDrawSketchHandlerAttorney::resetPositionText(*sketchgui); } -void DrawSketchHandler::drawEdit(const std::vector& EditCurve) +void DrawSketchHandler::drawEdit(const std::vector& EditCurve) const { ViewProviderSketchDrawSketchHandlerAttorney::drawEdit(*sketchgui, EditCurve); } -void DrawSketchHandler::drawEdit(const std::list>& list) +void DrawSketchHandler::drawEdit(const std::list>& list) const { ViewProviderSketchDrawSketchHandlerAttorney::drawEdit(*sketchgui, list); } -void DrawSketchHandler::drawEdit(const std::vector& geometries) +void DrawSketchHandler::drawEdit(const std::vector& geometries) const { static CurveConverter c; @@ -1106,6 +1106,16 @@ void DrawSketchHandler::drawEdit(const std::vector& geometries) drawEdit(list); } +void DrawSketchHandler::clearEdit() const +{ + drawEdit(std::vector()); +} + +void DrawSketchHandler::clearEditMarkers() const +{ + drawEditMarkers(std::vector()); +} + void DrawSketchHandler::drawPositionAtCursor(const Base::Vector2d& position) { setPositionText(position); @@ -1147,7 +1157,7 @@ QString DrawSketchHandler::getToolWidgetHeaderText() const } void DrawSketchHandler::drawEditMarkers(const std::vector& EditMarkers, - unsigned int augmentationlevel) + unsigned int augmentationlevel) const { ViewProviderSketchDrawSketchHandlerAttorney::drawEditMarkers(*sketchgui, EditMarkers, diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h index 5971842e23..cebeb7a8ae 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h @@ -262,11 +262,15 @@ protected: qreal devicePixelRatio(); //@} - void drawEdit(const std::vector& EditCurve); - void drawEdit(const std::list>& list); - void drawEdit(const std::vector& geometries); + void drawEdit(const std::vector& EditCurve) const; + void drawEdit(const std::list>& list) const; + void drawEdit(const std::vector& geometries) const; void drawEditMarkers(const std::vector& EditMarkers, - unsigned int augmentationlevel = 0); + unsigned int augmentationlevel = 0) const; + + void clearEdit() const; + void clearEditMarkers() const; + void setAxisPickStyle(bool on); void moveCursorToSketchPoint(Base::Vector2d point); void preselectAtPoint(Base::Vector2d point);