From 4325ea4e53712045cfe20ef6c74a9627adaec11e Mon Sep 17 00:00:00 2001
From: Sergo <usakhelo@users.noreply.github.com>
Date: Sun, 12 Mar 2017 00:55:33 -0500
Subject: [PATCH] same axis and profile only for sketches

---
 src/Mod/PartDesign/App/FeatureSketchBased.cpp | 72 +++++++++----------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
index 23538630ec..7fe4cc4a57 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp
+++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
@@ -913,26 +913,49 @@ void ProfileBased::getAxis(const App::DocumentObject *pcReferenceAxis, const std
         return;
 
     App::DocumentObject* profile = Profile.getValue();
-    Part::Part2DObject* sketch;
     gp_Pln sketchplane;
-    Base::Placement SketchPlm;
 
     if (profile->getTypeId().isDerivedFrom(Part::Part2DObject::getClassTypeId())) {
-        sketch = getVerifiedSketch();
-        SketchPlm = sketch->Placement.getValue();
-        Base::Vector3d SketchPos = SketchPlm.getPosition();
+        Part::Part2DObject* sketch = getVerifiedSketch();
+        Base::Placement SketchPlm = sketch->Placement.getValue();
+        Base::Vector3d SketchVector = Base::Vector3d(0, 0, 1);
         Base::Rotation SketchOrientation = SketchPlm.getRotation();
-        Base::Vector3d SketchVector(0, 0, 1);
         SketchOrientation.multVec(SketchVector, SketchVector);
+        Base::Vector3d SketchPos = SketchPlm.getPosition();
         sketchplane = gp_Pln(gp_Pnt(SketchPos.x, SketchPos.y, SketchPos.z), gp_Dir(SketchVector.x, SketchVector.y, SketchVector.z));
+
+        if (pcReferenceAxis == profile) {
+            bool hasValidAxis = false;
+            Base::Axis axis;
+            if (subReferenceAxis[0] == "V_Axis") {
+                hasValidAxis = true;
+                axis = sketch->getAxis(Part::Part2DObject::V_Axis);
+            }
+            else if (subReferenceAxis[0] == "H_Axis") {
+                hasValidAxis = true;
+                axis = sketch->getAxis(Part::Part2DObject::H_Axis);
+            }
+            else if (subReferenceAxis[0].size() > 4 && subReferenceAxis[0].substr(0, 4) == "Axis") {
+                int AxId = std::atoi(subReferenceAxis[0].substr(4, 4000).c_str());
+                if (AxId >= 0 && AxId < sketch->getAxisCount()) {
+                    hasValidAxis = true;
+                    axis = sketch->getAxis(AxId);
+                }
+            }
+            if (hasValidAxis) {
+                axis *= SketchPlm;
+                base = axis.getBase();
+                dir = axis.getDirection();
+                return;
+            } //else - an edge of the sketch was selected as an axis
+        }
+
     }
     else if (profile->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
-        Base::Placement SketchPos = getVerifiedObject()->Placement.getValue();
-        Base::Vector3d  SketchVector = getProfileNormal();
-        TopoDS_Shape sketchshape = getVerifiedFace();
-        gp_XYZ facePos = sketchshape.Location().Transformation().TranslationPart();
-        //sketchshape.Location().Transformation().TranslationPart())
-        sketchplane = gp_Pln(gp_Pnt(SketchPos.getPosition().x, SketchPos.getPosition().y, SketchPos.getPosition().z), gp_Dir(SketchVector.x, SketchVector.y, SketchVector.z));
+        Base::Placement SketchPlm = getVerifiedObject()->Placement.getValue();
+        Base::Vector3d SketchVector = getProfileNormal();
+        Base::Vector3d SketchPos = SketchPlm.getPosition();
+        sketchplane = gp_Pln(gp_Pnt(SketchPos.x, SketchPos.y, SketchPos.z), gp_Dir(SketchVector.x, SketchVector.y, SketchVector.z));
     }
 
     // get reference axis
@@ -958,31 +981,6 @@ void ProfileBased::getAxis(const App::DocumentObject *pcReferenceAxis, const std
         return;
     }
 
-    if (pcReferenceAxis == profile) {
-        //Part::Part2DObject* sketch = getVerifiedSketch();
-        bool hasValidAxis=false;
-        Base::Axis axis;
-        if (subReferenceAxis[0] == "V_Axis") {
-            hasValidAxis = true;
-            axis = sketch->getAxis(Part::Part2DObject::V_Axis);
-        } else if (subReferenceAxis[0] == "H_Axis") {
-            hasValidAxis = true;
-            axis = sketch->getAxis(Part::Part2DObject::H_Axis);
-        } else if (subReferenceAxis[0].size() > 4 && subReferenceAxis[0].substr(0,4) == "Axis") {
-            int AxId = std::atoi(subReferenceAxis[0].substr(4,4000).c_str());
-            if (AxId >= 0 && AxId < sketch->getAxisCount()) {
-                hasValidAxis = true;
-                axis = sketch->getAxis(AxId);
-            }
-        }
-        if (hasValidAxis) {
-            axis *= SketchPlm;
-            base=axis.getBase();
-            dir=axis.getDirection();
-            return;
-        } //else - an edge of the sketch was selected as an axis
-    }
-
     if (pcReferenceAxis->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
         if (subReferenceAxis.empty())
             throw Base::Exception("No rotation axis reference specified");