add coordinate system datum

src/Mod/PartDesign/App/AppPartDesign.cpp

@@ -52,6 +52,7 @@
 #include "DatumPoint.h"
 #include "FeatureBoolean.h"
 #include "FeaturePrimitive.h"
+#include "DatumCS.h"
 
 namespace PartDesign {
 extern PyObject* initModule();
@@ -101,13 +102,15 @@ PyMODINIT_FUNC init_PartDesign()
     PartDesign::Plane              ::init();
     PartDesign::Line               ::init();
     PartDesign::Point              ::init();
+    PartDesign::CoordinateSystem   ::init();
     PartDesign::Boolean            ::init();
     PartDesign::FeaturePrimitive   ::init();
     PartDesign::Box                ::init();
     PartDesign::AdditiveBox        ::init();
     PartDesign::SubtractiveBox     ::init();
 
-    PartDesign::Point::initHints();
-    PartDesign::Line ::initHints();
-    PartDesign::Plane::initHints();
+    PartDesign::Point              ::initHints();
+    PartDesign::Line               ::initHints();
+    PartDesign::Plane              ::initHints();
+    PartDesign::CoordinateSystem   ::initHints();
 }

src/Mod/PartDesign/App/CMakeLists.txt

@@ -46,6 +46,8 @@ SET(DatumFeatures_SRCS
     DatumLine.h
     DatumPoint.cpp
     DatumPoint.h
+    DatumCS.h
+    DatumCS.cpp
 )
 SOURCE_GROUP("DatumFeatures" FILES ${DatumFeatures_SRCS})
 

src/Mod/PartDesign/App/FeaturePrimitive.cpp

@@ -27,32 +27,48 @@
 
 
 #include "FeaturePrimitive.h"
+#include "DatumPoint.h"
+#include <Mod/Part/App/modelRefine.h>
 #include <Base/Exception.h>
 #include <App/Document.h>
+#include <App/Application.h>
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <BRepBuilderAPI_GTransform.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
+#include <QObject>
 
 using namespace PartDesign;
 
 namespace PartDesign {
 
-
 PROPERTY_SOURCE(PartDesign::FeaturePrimitive, PartDesign::FeatureAddSub)
 
 FeaturePrimitive::FeaturePrimitive()
   :  primitiveType(Box)
 {
-    ADD_PROPERTY(References, (0,0));//, "Primitive", (App::PropertyType)(App::Prop_None), "References to build the location of the primitive");
+    ADD_PROPERTY_TYPE(CoordinateSystem, (0), "Primitive", App::Prop_None, "References to build the location of the primitive");
+}
+
+TopoDS_Shape FeaturePrimitive::refineShapeIfActive(const TopoDS_Shape& oldShape) const
+{
+    Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
+        .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/PartDesign");
+    if (hGrp->GetBool("RefineModel", false)) {
+        Part::BRepBuilderAPI_RefineModel mkRefine(oldShape);
+        TopoDS_Shape resShape = mkRefine.Shape();
+        return resShape;
+    }
+
+    return oldShape;
 }
 
 App::DocumentObjectExecReturn* FeaturePrimitive::execute(const TopoDS_Shape& primitiveShape)
 {
     try {
         //transform the primitive in the correct coordinance
-        BRepBuilderAPI_GTransform mkTrf(primitiveShape, getLocation().Transformation());
-        const TopoDS_Shape primitiveShape = mkTrf.Shape();
+        //BRepBuilderAPI_GTransform mkTrf(primitiveShape, getLocation().Transformation());
+        //const TopoDS_Shape primitiveShape = mkTrf.Shape();
         
         //if we have no base we just add the standart primitive shape
         TopoDS_Shape base;
@@ -81,6 +97,7 @@ App::DocumentObjectExecReturn* FeaturePrimitive::execute(const TopoDS_Shape& pri
             if (boolOp.IsNull())
                 return new App::DocumentObjectExecReturn("Resulting shape is not a solid");
             
+            boolOp = refineShapeIfActive(boolOp);
             Shape.setValue(boolOp);
             AddSubShape.setValue(primitiveShape);
         }
@@ -95,6 +112,7 @@ App::DocumentObjectExecReturn* FeaturePrimitive::execute(const TopoDS_Shape& pri
             if (boolOp.IsNull())
                 return new App::DocumentObjectExecReturn("Resulting shape is not a solid");
             
+            boolOp = refineShapeIfActive(boolOp);
             Shape.setValue(boolOp);
             AddSubShape.setValue(primitiveShape);
         }
@@ -109,9 +127,49 @@ App::DocumentObjectExecReturn* FeaturePrimitive::execute(const TopoDS_Shape& pri
     return App::DocumentObject::StdReturn;
 }
 
-TopLoc_Location FeaturePrimitive::calculateLocation()
-{
-    return TopLoc_Location();
+void FeaturePrimitive::onChanged(const App::Property* prop)
+{/*
+    if ((prop == &CoordinateSystem)) {
+        std::multiset<QString> refTypes;
+        std::vector<App::DocumentObject*> refs = References.getValues();
+        std::vector<std::string> refnames = References.getSubValues();
+        if (refs.size() != refnames.size())
+            return;
+
+        for (int r = 0; r < refs.size(); r++)
+            refTypes.insert(getRefType(refs[r], refnames[r]));
+
+        std::set<QString> hint;
+        if (hints.find(refTypes) != hints.end())
+           hint = hints[refTypes];
+        
+        if (!((hint.size() == 1) && (hint.find(QObject::tr("Done")) != hint.end())))
+            return; // incomplete references
+        
+        std::pair<Base::Vector3d, bool> origin = {Base::Vector3d(), false};
+        std::pair<Base::Vector3d, bool> dirX = {Base::Vector3d(), false};
+        std::pair<Base::Vector3d, bool> dirY = {Base::Vector3d(), false};
+        
+        for (int i = 0; i < refs.size(); i++) {
+            
+            if (refs[i]->getTypeId().isDerivedFrom(PartDesign::Point::getClassTypeId())) {
+                Base::Vector3d point = static_cast<PartDesign::Point*>(refs[i])->getPoint();
+                if (!origin.second)
+                    origin = {point, true};
+                else if(!dirX.second) {
+                    if((point-dirX.first).Sqr() < Precision::Confusion()) 
+                        return;
+                    dirX = {point, true};
+                }                
+                else if(!dirY.second) {
+                    if((origin.first-dirX.first).Sqr() < Precision::Confusion()) 
+                        return;
+                    dirY = {point, true};
+                }                
+            }            
+        }
+    }    */    
+    FeatureAddSub::onChanged(prop);
 }
 
 PROPERTY_SOURCE(PartDesign::Box, PartDesign::FeaturePrimitive)

src/Mod/PartDesign/App/FeaturePrimitive.h

@@ -48,19 +48,17 @@ public:
     virtual const char* getViewProviderName(void) const {
         return "PartDesignGui::ViewProviderPrimitive";
     }
-    Type getPrimitiveType() {return primitiveType;};
+    Type         getPrimitiveType() {return primitiveType;};      
+    TopoDS_Shape refineShapeIfActive(const TopoDS_Shape& oldShape) const;    
+    virtual void onChanged(const App::Property* prop);
     
-    /// The references defining the primtive base
-    App::PropertyLinkSubList References;
+    /// The references datum defining the primtive location
+    App::PropertyLink CoordinateSystem;
     
 protected:
     //make the boolean ops with the primitives provided by the derived features
     App::DocumentObjectExecReturn* execute(const TopoDS_Shape& primitiveShape);
-    
-    //calculate the position of the primitive from the support and the exis
-    TopLoc_Location calculateLocation();
-    
-    Type primitiveType;
+    Type primitiveType = Box;   
 };
 
 class PartDesignExport Box : public PartDesign::FeaturePrimitive {