Task #3231: Sketcher Offset of a curve

Check the normal of filleting arc for correct orientation.

diff --git a/src/SketchPlugin/SketchPlugin_Offset.cpp b/src/SketchPlugin/SketchPlugin_Offset.cpp
index 97798f7a15ea6e0d3a2e2490d3a4492a680dc7e5..fbbbf9a0d496aa83ca7d8cfe66b8439b1574c7ed 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Offset.cpp
+++ b/src/SketchPlugin/SketchPlugin_Offset.cpp
@@ -63,6 +63,8 @@
 
 #include <iostream>
 
+static const double tolerance = 1.e-7;
+
 SketchPlugin_Offset::SketchPlugin_Offset()
 {
 }
@@ -100,7 +102,6 @@ void SketchPlugin_Offset::execute()
   AttributeDoublePtr aValueAttr = real(VALUE_ID());
   if (!aValueAttr->isInitialized()) return;
   double aValue = aValueAttr->value();
-  const double tolerance = 1.e-7;
   if (aValue < tolerance) return;
 
   // 2.a. Reversed?
@@ -498,13 +499,18 @@ void SketchPlugin_Offset::updateExistentOrCreateNew(const GeomShapePtr& theShape
 
     findOrCreateFeatureByKind(sketch(), SketchPlugin_Arc::ID(), theFeature, thePoolOfFeatures);
 
+    GeomDirPtr aCircNormal = aCircEdge->normal();
+    GeomDirPtr aSketchNormal = sketch()->coordinatePlane()->normal();
+    if (aSketchNormal->dot(aCircNormal) < -tolerance)
+      std::swap(aFP, aLP);
+
     bool aWasBlocked = theFeature->data()->blockSendAttributeUpdated(true);
     std::dynamic_pointer_cast<GeomDataAPI_Point2D>
-      (theFeature->attribute(SketchPlugin_Arc::CENTER_ID()))->setValue(aCP);
+      (theFeature->attribute(SketchPlugin_Arc::END_ID()))->setValue(aLP);
     std::dynamic_pointer_cast<GeomDataAPI_Point2D>
       (theFeature->attribute(SketchPlugin_Arc::START_ID()))->setValue(aFP);
     std::dynamic_pointer_cast<GeomDataAPI_Point2D>
-      (theFeature->attribute(SketchPlugin_Arc::END_ID()))->setValue(aLP);
+      (theFeature->attribute(SketchPlugin_Arc::CENTER_ID()))->setValue(aCP);
     theFeature->data()->blockSendAttributeUpdated(aWasBlocked);
   }
   else if (aResEdge->isCircle()) {