From 3e57f251ea919e14b285a04d9cf42ec952be31bd Mon Sep 17 00:00:00 2001 From: mdinger Date: Sun, 16 Mar 2014 21:00:16 -0400 Subject: [PATCH 1/3] Auto-snapping now works for 3 point curve. Factored GetCircleCenter function. --- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 52 +++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index a7d3fde..5c48446 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -78,9 +78,9 @@ Base::Vector2D GetCircleCenter (const Base::Vector2D &p1, const Base::Vector2D & { double m12p = (p1.fX - p2.fX) / (p2.fY - p1.fY); double m23p = (p2.fX - p3.fX) / (p3.fY - p2.fY); - double x = 1/( 2*(m12p - m23p) ) * ( (pow(p3.fX, 2) - pow(p2.fX, 2)) / (p3.fY - p2.fY) - - (pow(p2.fX, 2) - pow(p1.fX, 2)) / (p2.fY - p1.fY) + - p3.fY - p1.fY ); + double x = 1/( 2*(m12p - m23p) ) * ( m12p*(p1.fX + p2.fX) - + m23p*(p2.fX + p3.fX) + + p3.fY - p1.fY ); double y = m12p * ( x - (p1.fX + p2.fX)/2 ) + (p1.fY + p2.fY)/2; return Base::Vector2D(x, y); @@ -1363,19 +1363,39 @@ public: double angle2 = GetPointAngle(CenterPoint, SecondPoint); double angle3 = GetPointAngle(CenterPoint, onSketchPos); - // angle3 == angle1 or angle2 shouldn't be allowed but not sure...catch/try? + // Always build arc counter-clockwise // Point 3 is between Point 1 and 2 if ( angle3 > min(angle1, angle2) && angle3 < max(angle1, angle2) ) { - EditCurve[0] = angle2 > angle1 ? FirstPoint : SecondPoint; - EditCurve[29] = angle2 > angle1 ? SecondPoint : FirstPoint; + if (angle2 > angle1) { + EditCurve[0] = FirstPoint; + EditCurve[29] = SecondPoint; + arcPos1 = Sketcher::start; + arcPos2 = Sketcher::end; + } + else { + EditCurve[0] = SecondPoint; + EditCurve[29] = FirstPoint; + arcPos1 = Sketcher::end; + arcPos2 = Sketcher::start; + } startAngle = min(angle1, angle2); endAngle = max(angle1, angle2); arcAngle = endAngle - startAngle; } // Point 3 is not between Point 1 and 2 else { - EditCurve[0] = angle2 > angle1 ? SecondPoint : FirstPoint; - EditCurve[29] = angle2 > angle1 ? FirstPoint : SecondPoint; + if (angle2 > angle1) { + EditCurve[0] = SecondPoint; + EditCurve[29] = FirstPoint; + arcPos1 = Sketcher::end; + arcPos2 = Sketcher::start; + } + else { + EditCurve[0] = FirstPoint; + EditCurve[29] = SecondPoint; + arcPos1 = Sketcher::start; + arcPos2 = Sketcher::end; + } startAngle = max(angle1, angle2); endAngle = min(angle1, angle2); arcAngle = 2*M_PI - (startAngle - endAngle); @@ -1394,6 +1414,9 @@ public: sketchgui->drawEdit(EditCurve); if (seekAutoConstraint(sugConstr3, onSketchPos, Base::Vector2D(0.0,0.0))) { + // seekAutoConstraint doesn't handle this correctly because Coincident + // cannot snap to an arc yet it picks coincident because I click a point. + sugConstr3.back().Type = Sketcher::PointOnObject; renderSuggestConstraintsCursor(sugConstr3); return; } @@ -1447,21 +1470,21 @@ public: Gui::Command::commitCommand(); Gui::Command::updateActive(); - // Auto Constraint center point + // Auto Constraint first picked point if (sugConstr1.size() > 0) { - createAutoConstraints(sugConstr1, getHighestCurveIndex(), Sketcher::mid); + createAutoConstraints(sugConstr1, getHighestCurveIndex(), arcPos1); sugConstr1.clear(); } - // Auto Constraint first picked point + // Auto Constraint second picked point if (sugConstr2.size() > 0) { - createAutoConstraints(sugConstr2, getHighestCurveIndex(), (arcAngle > 0) ? Sketcher::start : Sketcher::end ); + createAutoConstraints(sugConstr2, getHighestCurveIndex(), arcPos2); sugConstr2.clear(); } - // Auto Constraint second picked point + // Auto Constraint third picked point if (sugConstr3.size() > 0) { - createAutoConstraints(sugConstr3, getHighestCurveIndex(), (arcAngle > 0) ? Sketcher::end : Sketcher::start); + createAutoConstraints(sugConstr3, getHighestCurveIndex(), Sketcher::none); sugConstr3.clear(); } @@ -1477,6 +1500,7 @@ protected: Base::Vector2D CenterPoint, FirstPoint, SecondPoint; double radius, startAngle, endAngle, arcAngle; std::vector sugConstr1, sugConstr2, sugConstr3; + Sketcher::PointPos arcPos1, arcPos2; }; -- 1.7.9 From 87a2dd59b31a0c3f1c8353c2f78b2f05c3153bc4 Mon Sep 17 00:00:00 2001 From: mdinger Date: Sun, 16 Mar 2014 21:01:36 -0400 Subject: [PATCH 2/3] Added and fixed comments. --- src/Mod/Sketcher/App/SketchObject.h | 2 +- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 2 +- src/Mod/Sketcher/Gui/ViewProviderSketch.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/Sketcher/App/SketchObject.h b/src/Mod/Sketcher/App/SketchObject.h index 5d19361..edb6282 100644 --- a/src/Mod/Sketcher/App/SketchObject.h +++ b/src/Mod/Sketcher/App/SketchObject.h @@ -130,7 +130,7 @@ public: /// retrieves for a Vertex number the corresponding GeoId and PosId void getGeoVertexIndex(int VertexId, int &GeoId, PointPos &PosId) const; - int getHighestVertexIndex(void) const { return VertexId2GeoId.size() - 1; } + int getHighestVertexIndex(void) const { return VertexId2GeoId.size() - 1; } // Most recently created int getHighestCurveIndex(void) const { return Geometry.getSize() - 1; } void rebuildVertexIndex(void); diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 69fb6cf..4b976bd 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -127,7 +127,7 @@ SbVec2s ViewProviderSketch::newCursorPos; //************************************************************************** // Edit data structure -/// Data structure while edit the sketch +/// Data structure while editing the sketch struct EditData { EditData(): sketchHandler(0), diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.h b/src/Mod/Sketcher/Gui/ViewProviderSketch.h index 0b7780b..f8e7143 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h @@ -67,7 +67,7 @@ class DrawSketchHandler; /** The Sketch ViewProvider * This class handles mainly the drawing and editing of the sketch. * It draws the geometry and the constraints applied to the sketch. - * It uses the class DrawSketchHandler to facilitade the creation + * It uses the class DrawSketchHandler to facilitate the creation * of new geometry while editing. */ class SketcherGuiExport ViewProviderSketch : public PartGui::ViewProvider2DObject, public Gui::SelectionObserver @@ -116,7 +116,7 @@ public: enum SketchMode{ STATUS_NONE, /**< enum value View provider is in neutral. */ STATUS_SELECT_Point, /**< enum value a point was selected. */ - STATUS_SELECT_Edge, /**< enum value a edge was selected. */ + STATUS_SELECT_Edge, /**< enum value an edge was selected. */ STATUS_SELECT_Constraint, /**< enum value a constraint was selected. */ STATUS_SELECT_Cross, /**< enum value the base coordinate system was selected. */ STATUS_SKETCH_DragPoint, /**< enum value while dragging a point. */ -- 1.7.9 From 415c62cb765b8314864732398c551fd4e677ff7e Mon Sep 17 00:00:00 2001 From: mdinger Date: Sun, 16 Mar 2014 21:20:04 -0400 Subject: [PATCH 3/3] Added/removed blank lines so separate tools always have 2 lines between them. Then it is more clear when one ends. --- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 5c48446..c40399a 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -51,6 +51,7 @@ using namespace std; using namespace SketcherGui; + /* helper functions ======================================================*/ // Return counter-clockwise angle from horizontal out of p1 to p2 in radians. @@ -86,7 +87,6 @@ Base::Vector2D GetCircleCenter (const Base::Vector2D &p1, const Base::Vector2D & return Base::Vector2D(x, y); } - void ActivateHandler(Gui::Document *doc,DrawSketchHandler *handler) { if (doc) { @@ -121,6 +121,7 @@ SketcherGui::ViewProviderSketch* getSketchViewprovider(Gui::Document *doc) return 0; } + /* Sketch commands =======================================================*/ /* XPM */ @@ -256,8 +257,6 @@ protected: std::vector sugConstr1, sugConstr2; }; - - DEF_STD_CMD_A(CmdSketcherCreateLine); CmdSketcherCreateLine::CmdSketcherCreateLine() @@ -464,8 +463,6 @@ protected: std::vector sugConstr1, sugConstr2; }; - - DEF_STD_CMD_A(CmdSketcherCreateRectangle); CmdSketcherCreateRectangle::CmdSketcherCreateRectangle() @@ -989,7 +986,6 @@ protected: } }; - DEF_STD_CMD_A(CmdSketcherCreatePolyline); CmdSketcherCreatePolyline::CmdSketcherCreatePolyline() @@ -1015,6 +1011,7 @@ bool CmdSketcherCreatePolyline::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } + // ====================================================================================== /* XPM */ @@ -1503,7 +1500,6 @@ protected: Sketcher::PointPos arcPos1, arcPos2; }; - DEF_STD_CMD_A(CmdSketcherCreate3PointArc); CmdSketcherCreate3PointArc::CmdSketcherCreate3PointArc() @@ -1529,6 +1525,7 @@ bool CmdSketcherCreate3PointArc::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } + DEF_STD_CMD_ACL(CmdSketcherCompCreateArc); CmdSketcherCompCreateArc::CmdSketcherCompCreateArc() @@ -1607,7 +1604,6 @@ bool CmdSketcherCompCreateArc::isActive(void) } - // ====================================================================================== /* XPM */ @@ -1784,6 +1780,7 @@ bool CmdSketcherCreateCircle::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } + // ====================================================================================== /* XPM */ @@ -1882,7 +1879,6 @@ protected: std::vector sugConstr; }; - DEF_STD_CMD_A(CmdSketcherCreatePoint); CmdSketcherCreatePoint::CmdSketcherCreatePoint() @@ -1908,6 +1904,7 @@ bool CmdSketcherCreatePoint::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } + // ====================================================================================== DEF_STD_CMD_A(CmdSketcherCreateText); @@ -1934,6 +1931,7 @@ bool CmdSketcherCreateText::isActive(void) return false; } + // ====================================================================================== DEF_STD_CMD_A(CmdSketcherCreateDraftLine); @@ -1960,6 +1958,7 @@ bool CmdSketcherCreateDraftLine::isActive(void) return false; } + // ====================================================================================== namespace SketcherGui { @@ -2004,6 +2003,7 @@ namespace SketcherGui { }; }; + /* XPM */ static const char *cursor_createfillet[]={ "32 32 3 1", @@ -2207,6 +2207,8 @@ bool CmdSketcherCreateFillet::isActive(void) { return isCreateGeoActive(getActiveGuiDocument()); } + + // ====================================================================================== namespace SketcherGui { @@ -2239,6 +2241,7 @@ namespace SketcherGui { }; }; + /* XPM */ static const char *cursor_trimming[]={ "32 32 3 1", @@ -2359,6 +2362,7 @@ bool CmdSketcherTrimming::isActive(void) return isCreateGeoActive(getActiveGuiDocument()); } + // ====================================================================================== namespace SketcherGui { @@ -2390,6 +2394,7 @@ namespace SketcherGui { }; }; + /* XPM */ static const char *cursor_external[]={ "32 32 3 1", -- 1.7.9