Sketcher: Extend GeometryFacade and ExternaGeometryFacade to Geometry…

…Mode
FreeCAD · Dec 10, 2020 · eb929ad · eb929ad
1 parent 092a1ee
commit eb929ad
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 3 deletions.
diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp b/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp
@@ -36,7 +36,7 @@
 
 using namespace Sketcher;
 
-TYPESYSTEM_SOURCE(Sketcher::ExternalGeometryFacade,Part::GeometryExtension)
+TYPESYSTEM_SOURCE(Sketcher::ExternalGeometryFacade,Base::BaseClass)
 
 ExternalGeometryFacade::ExternalGeometryFacade(): Geo(nullptr), SketchGeoExtension(nullptr), ExternalGeoExtension(nullptr)
 {

diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacade.h b/src/Mod/Sketcher/App/ExternalGeometryFacade.h
@@ -83,6 +83,9 @@ TYPESYSTEM_HEADER_WITH_OVERRIDE();
     virtual InternalType::InternalType getInternalType() const override {return getGeoExt()->getInternalType();}
     virtual void setInternalType(InternalType::InternalType type) override {getGeoExt()->setInternalType(type);}
 
+    virtual bool testGeometryMode(int flag) const override { return getGeoExt()->testGeometryMode(flag); }
+    virtual void setGeometryMode(int flag, bool v=true) override { getGeoExt()->setGeometryMode(flag, v); }
+
     // Geometry Extension Information
     inline const std::string &getSketchExtensionName () const {return SketchGeoExtension->getName();}
     inline const std::string &getExternalExtensionName () const {return ExternalGeoExtension->getName();}

diff --git a/src/Mod/Sketcher/App/GeometryFacade.cpp b/src/Mod/Sketcher/App/GeometryFacade.cpp
@@ -36,7 +36,7 @@
 
 using namespace Sketcher;
 
-TYPESYSTEM_SOURCE(Sketcher::GeometryFacade,Part::GeometryExtension)
+TYPESYSTEM_SOURCE(Sketcher::GeometryFacade,Base::BaseClass)
 
 GeometryFacade::GeometryFacade(): Geo(nullptr), SketchGeoExtension(nullptr)
 {

diff --git a/src/Mod/Sketcher/App/GeometryFacade.h b/src/Mod/Sketcher/App/GeometryFacade.h
@@ -125,6 +125,12 @@ TYPESYSTEM_HEADER_WITH_OVERRIDE();
     virtual InternalType::InternalType getInternalType() const override {return getGeoExt()->getInternalType();}
     virtual void setInternalType(InternalType::InternalType type) override {getGeoExt()->setInternalType(type);}
 
+    virtual bool testGeometryMode(int flag) const override { return getGeoExt()->testGeometryMode(flag); }
+    virtual void setGeometryMode(int flag, bool v=true) override { getGeoExt()->setGeometryMode(flag, v); }
+
+    bool getBlocked() const { return this->testGeometryMode(GeometryMode::Blocked);}
+    void setBlocked(bool status = true) {this->setGeometryMode(GeometryMode::Blocked, status);}
+
     // Geometry Extension Information
     inline const std::string &getExtensionName () const {return SketchGeoExtension->getName();}
 

diff --git a/src/Mod/Sketcher/App/GeometryFacadePy.xml b/src/Mod/Sketcher/App/GeometryFacadePy.xml
@@ -26,11 +26,20 @@
     <Attribute Name="InternalType" ReadOnly="false">
         <Documentation>
             <UserDocu>
-                returns the Id of the SketchGeometryExtension.
+                returns the Internal Type of the Geometry.
             </UserDocu>
         </Documentation>
         <Parameter Name="InternalType" Type="String"/>
     </Attribute>
+    <Attribute Name="Blocked" ReadOnly="false">
+        <Documentation>
+            <UserDocu>
+                returns whether the geometry is blocked or not.
+            </UserDocu>
+        </Documentation>
+        <Parameter Name="Blocked" Type="Boolean"/>
+    </Attribute>
+
     <Methode Name="mirror">
       <Documentation>
         <UserDocu>Performs the symmetrical transformation of this geometric object</UserDocu>

diff --git a/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp b/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp
@@ -117,6 +117,17 @@ void GeometryFacadePy::setInternalType(Py::String arg)
     throw Py::ValueError("Argument is not a valid internal geometry type.");
 }
 
+Py::Boolean GeometryFacadePy::getBlocked(void) const
+{
+    return Py::Boolean(getGeometryFacadePtr()->getBlocked());
+}
+
+void GeometryFacadePy::setBlocked(Py::Boolean arg)
+{
+    getGeometryFacadePtr()->setBlocked(arg);
+}
+
+
 PyObject* GeometryFacadePy::mirror(PyObject *args)
 {
     PyObject* o;