diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 8f778bb8a7..4acdcd094f 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -675,8 +675,6 @@ protected: { return isCreateGeoActive(getActiveGuiDocument()); } }; -extern char cursor_crosshair_color[]; - class DrawSketchHandlerGenConstraint: public DrawSketchHandler { public: diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 96d1edb630..88e6b8404a 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -192,26 +192,6 @@ void removeRedundantHorizontalVertical(Sketcher::SketchObject* psketch, /* Sketch commands =======================================================*/ -static const char cursor_crosshair_color_fmt[] = "+ c #%06lX"; -char cursor_crosshair_color[12]; - -void DrawSketchHandler::setCrosshairColor() -{ - unsigned long color = getCrosshairColor(); - sprintf(cursor_crosshair_color, cursor_crosshair_color_fmt, color); -} - -unsigned long DrawSketchHandler::getCrosshairColor() -{ - unsigned long color = 0xFFFFFFFF; // white - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath - ("User parameter:BaseApp/Preferences/View"); - color = hGrp->GetUnsigned("CursorCrosshairColor", color); - // from rgba to rgb - color = (color >> 8) & 0xFFFFFF; - return color; -} - class DrawSketchHandlerLine: public DrawSketchHandler { public: @@ -254,6 +234,7 @@ public: { if (Mode==STATUS_SEEK_First){ EditCurve[0] = onSketchPos; + Mode = STATUS_SEEK_Second; } else { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp index 89eab813df..2edd655d94 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp @@ -169,6 +169,17 @@ int DrawSketchHandler::getHighestCurveIndex(void) return sketchgui->getSketchObject()->getHighestCurveIndex(); } +unsigned long DrawSketchHandler::getCrosshairColor() +{ + unsigned long color = 0xFFFFFFFF; // white + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath + ("User parameter:BaseApp/Preferences/View"); + color = hGrp->GetUnsigned("CursorCrosshairColor", color); + // from rgba to rgb + color = (color >> 8) & 0xFFFFFF; + return color; +} + void DrawSketchHandler::setCrosshairCursor(const char* svgName) { QString cursorName = QString::fromLatin1(svgName); const unsigned long defaultCrosshairColor = 0xFFFFFF; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h index 1b46cdad7f..2901071db9 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h @@ -149,7 +149,6 @@ protected: void unsetCursor(void); void applyCursor(void); void applyCursor(QCursor &newCursor); - void setCrosshairColor(); unsigned long getCrosshairColor(); qreal devicePixelRatio(); void setCrosshairCursor(const char* svgName);