diff --git a/src/Mod/Assembly/App/AssemblyLinkPy.pyi b/src/Mod/Assembly/App/AssemblyLink.pyi similarity index 62% rename from src/Mod/Assembly/App/AssemblyLinkPy.pyi rename to src/Mod/Assembly/App/AssemblyLink.pyi index 14f4b03e11..e5305bef46 100644 --- a/src/Mod/Assembly/App/AssemblyLinkPy.pyi +++ b/src/Mod/Assembly/App/AssemblyLink.pyi @@ -5,18 +5,15 @@ from Base.Metadata import export from App.Part import Part @export( - Father="PartPy", - Name="AssemblyLinkPy", - Twin="AssemblyLink", - TwinPointer="AssemblyLink", Include="Mod/Assembly/App/AssemblyLink.h", Namespace="Assembly", - FatherInclude="App/PartPy.h", - FatherNamespace="App", ) -class AssemblyLinkPy(Part): +class AssemblyLink(Part): """ This class handles document objects in Assembly + + Author: Ondsel (development@ondsel.com) + License: LGPL-2.1-or-later """ Joints: Final[list] diff --git a/src/Mod/Assembly/App/AssemblyLinkPy.xml b/src/Mod/Assembly/App/AssemblyLinkPy.xml deleted file mode 100644 index e21a050895..0000000000 --- a/src/Mod/Assembly/App/AssemblyLinkPy.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - This class handles document objects in Assembly - - - - A list of all joints this assembly link has. - - - - - - diff --git a/src/Mod/Assembly/App/AssemblyObjectPy.pyi b/src/Mod/Assembly/App/AssemblyObject.pyi similarity index 92% rename from src/Mod/Assembly/App/AssemblyObjectPy.pyi rename to src/Mod/Assembly/App/AssemblyObject.pyi index 8d971b7d94..d72db28d34 100644 --- a/src/Mod/Assembly/App/AssemblyObjectPy.pyi +++ b/src/Mod/Assembly/App/AssemblyObject.pyi @@ -4,19 +4,13 @@ from Base.Metadata import constmethod, export from App.Part import Part -@export( - Father="PartPy", - Name="AssemblyObjectPy", - Twin="AssemblyObject", - TwinPointer="AssemblyObject", - Include="Mod/Assembly/App/AssemblyObject.h", - Namespace="Assembly", - FatherInclude="App/PartPy.h", - FatherNamespace="App", -) -class AssemblyObjectPy(Part): +@export(Include="Mod/Assembly/App/AssemblyObject.h", Namespace="Assembly") +class AssemblyObject(Part): """ This class handles document objects in Assembly + + Author: Ondsel (development@ondsel.com) + License: LGPL-2.1-or-later """ @constmethod diff --git a/src/Mod/Assembly/App/AssemblyObjectPy.xml b/src/Mod/Assembly/App/AssemblyObjectPy.xml deleted file mode 100644 index 335da8064b..0000000000 --- a/src/Mod/Assembly/App/AssemblyObjectPy.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - This class handles document objects in Assembly - - - - -Solve the assembly and update part placements. - -solve(enableRedo=False) -> int - -Args: -enableRedo: Whether the solve save the initial position of parts -to enable undoing it even without a transaction. -Defaults to `False` ie the solve cannot be undone if called -outside of a transaction. - -Returns: -0 in case of success, otherwise the following codes in this order of -priority: --6 if no parts are fixed. --4 if over-constrained, --3 if conflicting constraints, --5 if malformed constraints --1 if solver error, --2 if redundant constraints. - - - - - - -Generate the simulation. - -solve(simulationObject) -> int - -Args: -simulationObject: The simulation Object. - -Returns: -0 in case of success, otherwise the following codes in this order of -priority: --6 if no parts are fixed. --4 if over-constrained, --3 if conflicting constraints, --5 if malformed constraints --1 if solver error, --2 if redundant constraints. - - - - - - -Update entire assembly to frame number specified. - -updateForFrame(index) - -Args: index of frame. - -Returns: None - - - - - - -numberOfFrames() - -Args: None - -Returns: Number of frames - - - - - - -Undo the last solve of the assembly and return part placements to their initial position. - -undoSolve() - -Returns: None - - - - - - -Makes sure that LinkGroups or sub-assemblies have identity placements. - -ensureIdentityPlacements() - -Returns: None - - - - - - -Clear the registered undo positions. - -clearUndo() - -Returns: None - - - - - - -Check if a part is connected to the ground through joints. - -isPartConnected(obj) -> bool - -Args: document object to check. - -Returns: True if part is connected to ground - - - - - - -Check if a joint is connecting a part to the ground. - -isJointConnectingPartToGround(joint, propName) -> bool - -Args: -- joint: document object of the joint to check. -- propName: string 'Part1' or 'Part2' of the joint. - -Returns: True if part is connected to ground - - - - - - -Check if a part has a grounded joint. - -isPartGrounded(obj) -> bool - -Args: -- obj: document object of the part to check. - -Returns: True if part has grounded joint - - - - - - -Export the assembly in a text format called ASMT. - -exportAsASMT(fileName:str) - -Args: -fileName: The name of the file where the ASMT will be exported. - - - - - - A list of all joints this assembly has. - - - - - - diff --git a/src/Mod/Assembly/App/BomGroup.pyi b/src/Mod/Assembly/App/BomGroup.pyi new file mode 100644 index 0000000000..7157bc70ad --- /dev/null +++ b/src/Mod/Assembly/App/BomGroup.pyi @@ -0,0 +1,12 @@ +from Base.Metadata import export + +from App.DocumentObjectGroup import DocumentObjectGroup + +@export(Include="Mod/Assembly/App/BomGroup.h", Namespace="Assembly") +class BomGroup(DocumentObjectGroup): + """ + This class is a group subclass for boms. + + Author: Ondsel (development@ondsel.com) + License: LGPL-2.1-or-later + """ diff --git a/src/Mod/Assembly/App/BomGroupPy.pyi b/src/Mod/Assembly/App/BomGroupPy.pyi deleted file mode 100644 index 7ce2066a83..0000000000 --- a/src/Mod/Assembly/App/BomGroupPy.pyi +++ /dev/null @@ -1,18 +0,0 @@ -from Base.Metadata import export - -from App.DocumentObjectGroup import DocumentObjectGroup - -@export( - Father="DocumentObjectGroupPy", - Name="BomGroupPy", - Twin="BomGroup", - TwinPointer="BomGroup", - Include="Mod/Assembly/App/BomGroup.h", - Namespace="Assembly", - FatherInclude="App/DocumentObjectGroupPy.h", - FatherNamespace="App", -) -class BomGroupPy(DocumentObjectGroup): - """ - This class is a group subclass for boms. - """ diff --git a/src/Mod/Assembly/App/BomGroupPy.xml b/src/Mod/Assembly/App/BomGroupPy.xml deleted file mode 100644 index 2a5c48abf6..0000000000 --- a/src/Mod/Assembly/App/BomGroupPy.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - This class is a group subclass for boms. - - - - - diff --git a/src/Mod/Assembly/App/BomObjectPy.pyi b/src/Mod/Assembly/App/BomObject.pyi similarity index 65% rename from src/Mod/Assembly/App/BomObjectPy.pyi rename to src/Mod/Assembly/App/BomObject.pyi index a1847ab68d..9e6df7de1b 100644 --- a/src/Mod/Assembly/App/BomObjectPy.pyi +++ b/src/Mod/Assembly/App/BomObject.pyi @@ -2,16 +2,14 @@ from Base.Metadata import export from Spreadsheet.Sheet import Sheet @export( - Father="SheetPy", - Name="BomObjectPy", - Twin="BomObject", - TwinPointer="BomObject", Include="Mod/Assembly/App/BomObject.h", - Namespace="Assembly", FatherInclude="Mod/Spreadsheet/App/SheetPy.h", - FatherNamespace="Spreadsheet", + Namespace="Assembly", ) -class BomObjectPy(Sheet): +class BomObject(Sheet): """ This class is the BOM object of assemblies, it derives from Spreadsheet::Sheet. + + Author: Ondsel (development@ondsel.com) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/Assembly/App/BomObjectPy.xml b/src/Mod/Assembly/App/BomObjectPy.xml deleted file mode 100644 index b329fcc984..0000000000 --- a/src/Mod/Assembly/App/BomObjectPy.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - This class is the BOM object of assemblies, it derives from Spreadsheet::Sheet. - - - - - diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt index 6d944a784c..eb5882bf40 100644 --- a/src/Mod/Assembly/App/CMakeLists.txt +++ b/src/Mod/Assembly/App/CMakeLists.txt @@ -14,37 +14,29 @@ set(Assembly_LIBS OndselSolver ) -generate_from_xml(AssemblyObjectPy) -generate_from_xml(AssemblyLinkPy) -generate_from_xml(BomObjectPy) -generate_from_xml(BomGroupPy) -generate_from_xml(JointGroupPy) -generate_from_xml(ViewGroupPy) -generate_from_xml(SimulationGroupPy) - -generate_from_py_(AssemblyObjectPy) -generate_from_py_(AssemblyLinkPy) -generate_from_py_(BomObjectPy) -generate_from_py_(BomGroupPy) -generate_from_py_(JointGroupPy) -generate_from_py_(ViewGroupPy) -generate_from_py_(SimulationGroupPy) +generate_from_py(AssemblyObject) +generate_from_py(AssemblyLink) +generate_from_py(BomObject) +generate_from_py(BomGroup) +generate_from_py(JointGroup) +generate_from_py(ViewGroup) +generate_from_py(SimulationGroup) SET(Python_SRCS - AssemblyObjectPy.xml + AssemblyObject.pyi AssemblyObjectPyImp.cpp - AssemblyLinkPy.xml + AssemblyLink.pyi AssemblyLinkPyImp.cpp - BomObjectPy.xml + BomObject.pyi BomObjectPyImp.cpp - BomGroupPy.xml + BomGroup.pyi BomGroupPyImp.cpp - JointGroupPy.xml + JointGroup.pyi JointGroupPyImp.cpp - ViewGroupPy.xml + ViewGroup.pyi ViewGroupPyImp.cpp - SimulationGroupPy.xml + SimulationGroup.pyi SimulationGroupPyImp.cpp ) SOURCE_GROUP("Python" FILES ${Python_SRCS}) diff --git a/src/Mod/Assembly/App/JointGroup.pyi b/src/Mod/Assembly/App/JointGroup.pyi new file mode 100644 index 0000000000..1a23e0f5c5 --- /dev/null +++ b/src/Mod/Assembly/App/JointGroup.pyi @@ -0,0 +1,12 @@ +from Base.Metadata import export + +from App.DocumentObjectGroup import DocumentObjectGroup + +@export(Include="Mod/Assembly/App/JointGroup.h", Namespace="Assembly") +class JointGroup(DocumentObjectGroup): + """ + This class is a group subclass for joints. + + Author: Ondsel (development@ondsel.com) + License: LGPL-2.1-or-later + """ diff --git a/src/Mod/Assembly/App/JointGroupPy.pyi b/src/Mod/Assembly/App/JointGroupPy.pyi deleted file mode 100644 index 89388781aa..0000000000 --- a/src/Mod/Assembly/App/JointGroupPy.pyi +++ /dev/null @@ -1,18 +0,0 @@ -from Base.Metadata import export - -from App.DocumentObjectGroup import DocumentObjectGroup - -@export( - Father="DocumentObjectGroupPy", - Name="JointGroupPy", - Twin="JointGroup", - TwinPointer="JointGroup", - Include="Mod/Assembly/App/JointGroup.h", - Namespace="Assembly", - FatherInclude="App/DocumentObjectGroupPy.h", - FatherNamespace="App", -) -class JointGroupPy(DocumentObjectGroup): - """ - This class is a group subclass for joints. - """ diff --git a/src/Mod/Assembly/App/JointGroupPy.xml b/src/Mod/Assembly/App/JointGroupPy.xml deleted file mode 100644 index d3b8555461..0000000000 --- a/src/Mod/Assembly/App/JointGroupPy.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - This class is a group subclass for joints. - - - - - diff --git a/src/Mod/Assembly/App/SimulationGroup.pyi b/src/Mod/Assembly/App/SimulationGroup.pyi new file mode 100644 index 0000000000..bcd589cd8c --- /dev/null +++ b/src/Mod/Assembly/App/SimulationGroup.pyi @@ -0,0 +1,12 @@ +from Base.Metadata import export + +from App.DocumentObjectGroup import DocumentObjectGroup + +@export(Include="Mod/Assembly/App/SimulationGroup.h", Namespace="Assembly") +class SimulationGroup(DocumentObjectGroup): + """ + This class is a group subclass for joints. + + Author: Ondsel (development@ondsel.com) + License: LGPL-2.1-or-later + """ diff --git a/src/Mod/Assembly/App/SimulationGroupPy.pyi b/src/Mod/Assembly/App/SimulationGroupPy.pyi deleted file mode 100644 index fc1c82a0e0..0000000000 --- a/src/Mod/Assembly/App/SimulationGroupPy.pyi +++ /dev/null @@ -1,18 +0,0 @@ -from Base.Metadata import export - -from App.DocumentObjectGroup import DocumentObjectGroup - -@export( - Father="DocumentObjectGroupPy", - Name="SimulationGroupPy", - Twin="SimulationGroup", - TwinPointer="SimulationGroup", - Include="Mod/Assembly/App/SimulationGroup.h", - Namespace="Assembly", - FatherInclude="App/DocumentObjectGroupPy.h", - FatherNamespace="App", -) -class SimulationGroupPy(DocumentObjectGroup): - """ - This class is a group subclass for joints. - """ diff --git a/src/Mod/Assembly/App/SimulationGroupPy.xml b/src/Mod/Assembly/App/SimulationGroupPy.xml deleted file mode 100644 index cab1c61da8..0000000000 --- a/src/Mod/Assembly/App/SimulationGroupPy.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - This class is a group subclass for joints. - - - - - diff --git a/src/Mod/Assembly/App/ViewGroup.pyi b/src/Mod/Assembly/App/ViewGroup.pyi new file mode 100644 index 0000000000..c5d3ad26e3 --- /dev/null +++ b/src/Mod/Assembly/App/ViewGroup.pyi @@ -0,0 +1,12 @@ +from Base.Metadata import export + +from App.DocumentObjectGroup import DocumentObjectGroup + +@export(Include="Mod/Assembly/App/ViewGroup.h", Namespace="Assembly") +class ViewGroup(DocumentObjectGroup): + """ + This class is a group subclass for joints. + + Author: Ondsel (development@ondsel.com) + License: LGPL-2.1-or-later + """ diff --git a/src/Mod/Assembly/App/ViewGroupPy.pyi b/src/Mod/Assembly/App/ViewGroupPy.pyi deleted file mode 100644 index 5229d081ce..0000000000 --- a/src/Mod/Assembly/App/ViewGroupPy.pyi +++ /dev/null @@ -1,18 +0,0 @@ -from Base.Metadata import export - -from App.DocumentObjectGroup import DocumentObjectGroup - -@export( - Father="DocumentObjectGroupPy", - Name="ViewGroupPy", - Twin="ViewGroup", - TwinPointer="ViewGroup", - Include="Mod/Assembly/App/ViewGroup.h", - Namespace="Assembly", - FatherInclude="App/DocumentObjectGroupPy.h", - FatherNamespace="App", -) -class ViewGroupPy(DocumentObjectGroup): - """ - This class is a group subclass for joints. - """ diff --git a/src/Mod/Assembly/App/ViewGroupPy.xml b/src/Mod/Assembly/App/ViewGroupPy.xml deleted file mode 100644 index 69446cba20..0000000000 --- a/src/Mod/Assembly/App/ViewGroupPy.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - This class is a group subclass for joints. - - - - - diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt index c69ae788fa..1fc1e84dfc 100644 --- a/src/Mod/Assembly/Gui/CMakeLists.txt +++ b/src/Mod/Assembly/Gui/CMakeLists.txt @@ -22,8 +22,7 @@ qt_add_resources(AssemblyResource_SRCS Resources/Assembly.qrc ${Assembly_TR_QRC} SOURCE_GROUP("Resources" FILES ${AssemblyResource_SRCS}) -generate_from_xml(ViewProviderAssemblyPy) -generate_from_py_(ViewProviderAssemblyPy) +generate_from_py(ViewProviderAssembly) set(AssemblyGui_UIC_SRCS TaskAssemblyCreateBom.ui @@ -35,7 +34,7 @@ set(AssemblyGui_UIC_SRCS ) SET(Python_SRCS - ViewProviderAssemblyPy.xml + ViewProviderAssembly.pyi ViewProviderAssemblyPyImp.cpp ) SOURCE_GROUP("Python" FILES ${Python_SRCS}) diff --git a/src/Mod/Assembly/Gui/ViewProviderAssemblyPy.pyi b/src/Mod/Assembly/Gui/ViewProviderAssembly.pyi similarity index 74% rename from src/Mod/Assembly/Gui/ViewProviderAssemblyPy.pyi rename to src/Mod/Assembly/Gui/ViewProviderAssembly.pyi index 4739c4f7b8..7d7e36313b 100644 --- a/src/Mod/Assembly/Gui/ViewProviderAssemblyPy.pyi +++ b/src/Mod/Assembly/Gui/ViewProviderAssembly.pyi @@ -4,19 +4,13 @@ from Base.Metadata import export from Gui.ViewProvider import ViewProvider -@export( - Father="ViewProviderPy", - Name="ViewProviderAssemblyPy", - Twin="ViewProviderAssembly", - TwinPointer="ViewProviderAssembly", - Include="Mod/Assembly/Gui/ViewProviderAssembly.h", - Namespace="AssemblyGui", - FatherInclude="Gui/ViewProviderPy.h", - FatherNamespace="Gui", -) -class ViewProviderAssemblyPy(ViewProvider): +@export(Include="Mod/Assembly/Gui/ViewProviderAssembly.h", Namespace="AssemblyGui") +class ViewProviderAssembly(ViewProvider): """ This is the ViewProviderAssembly class + + Author: Ondsel (development@ondsel.com) + License: LGPL-2.1-or-later """ def isInEditMode(self) -> Any: diff --git a/src/Mod/Assembly/Gui/ViewProviderAssemblyPy.xml b/src/Mod/Assembly/Gui/ViewProviderAssemblyPy.xml deleted file mode 100644 index 34db07a03d..0000000000 --- a/src/Mod/Assembly/Gui/ViewProviderAssemblyPy.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - This is the ViewProviderAssembly class - - - - - - Return true if the assembly object is currently in edit mode. - - isInEditMode() -> bool - - - - - - - Return the assembly dragger coin object. - - getDragger() -> SoTransformDragger - - Returns: dragger coin object of the assembly - - - - - - Enable moving the parts by clicking and dragging. - - - - - - If enabled, only the preselected object will move. - - - - - - If enabled, each move will be wrapped in a command. - - - - - - Show or hide the assembly dragger. - - - - - - Placement of the assembly dragger object. - - - - - diff --git a/src/Mod/CAM/App/AreaPy.pyi b/src/Mod/CAM/App/Area.pyi similarity index 93% rename from src/Mod/CAM/App/AreaPy.pyi rename to src/Mod/CAM/App/Area.pyi index 6c2a62ca2d..69a6c81679 100644 --- a/src/Mod/CAM/App/AreaPy.pyi +++ b/src/Mod/CAM/App/Area.pyi @@ -4,19 +4,12 @@ from Base.BaseClass import BaseClass from Base.Metadata import export @export( - Father="BaseClassPy", - Name="AreaPy", - Twin="Area", - TwinPointer="Area", Include="Mod/CAM/App/Area.h", Namespace="Path", - FatherInclude="Base/BaseClassPy.h", - FatherNamespace="Base", - ReadOnly=["Sections", "Shapes"], Constructor=True, Delete=True, ) -class AreaPy(BaseClass): +class Area(BaseClass): """ FreeCAD python wrapper of libarea @@ -24,6 +17,9 @@ class AreaPy(BaseClass): The constructor accepts the same parameters as setParams(...) to configure the object All arguments are optional. + + Author: Zheng, Lei (realthunder.dev@gmail.com) + License: LGPL-2.1-or-later """ def add(self, **kwargs) -> Any: diff --git a/src/Mod/CAM/App/AreaPy.xml b/src/Mod/CAM/App/AreaPy.xml deleted file mode 100644 index 32ecad002f..0000000000 --- a/src/Mod/CAM/App/AreaPy.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - -FreeCAD python wrapper of libarea - -Path.Area(key=value ...) - -The constructor accepts the same parameters as setParams(...) to configure the object -All arguments are optional. - - - - - - - - - - setPlane(shape): Set the working plane. - -The supplied shape does not need to be planar. Area will try to find planar -sub-shape (face, wire or edge). If more than one planar sub-shape is found, it -will prefer the top plane parallel to XY0 plane. If no working plane are set, -Area will try to find a working plane from the added children shape using the -same algorithm - - - - - getShape(index=-1,rebuild=False): Return the resulting shape - - -* index (-1): the index of the section. -1 means all sections. No effect on planar shape. - - -* rebuild: clean the internal cache and rebuild - - - - - Make an offset of the shape. - - - - - Generate pocket toolpath of the shape. - - - - - Make a list of area holding the sectioned children shapes on given heights. - - - - - Gets the area cleared when a tool of the specified diameter follows the gcode represented in the path, ignoring cleared space above zmax and path segments that don't affect space within the x/y space of bbox. - - - - - Rest machining: Gets the area left to be machined, assuming some of this area has already been cleared by previous tool paths. - - - - - Convert the Area object to a TopoShape. - - - - - Set algorithm parameters. - - - - - Static method to set the default parameters of all following Path.Area, plus the following additional parameters. - - - - - Static method to return the current default parameters. - - - - - Returns a list of supported parameters and their descriptions. - - - - - Get current algorithm parameters as a dictionary. - - - - - Abort the current operation. - - - - - List of sections in this area. - - - - - - The current workplane. If no plane is set, it is derived from the added shapes. - - - - - - A list of tuple: [(shape,op), ...] containing the added shapes together with their operation code - - - - - diff --git a/src/Mod/CAM/App/CMakeLists.txt b/src/Mod/CAM/App/CMakeLists.txt index 616896c5a6..d8aee8962e 100644 --- a/src/Mod/CAM/App/CMakeLists.txt +++ b/src/Mod/CAM/App/CMakeLists.txt @@ -21,44 +21,34 @@ set(Path_LIBS FreeCADApp ) -generate_from_xml(CommandPy) -generate_from_xml(PathPy) -generate_from_xml(FeaturePathCompoundPy) -generate_from_xml(AreaPy) -generate_from_xml(FeatureAreaPy) -generate_from_xml(VoronoiPy) -generate_from_xml(VoronoiCellPy) -generate_from_xml(VoronoiEdgePy) -generate_from_xml(VoronoiVertexPy) - -generate_from_py_(CommandPy) -generate_from_py_(PathPy) -generate_from_py_(FeaturePathCompoundPy) -generate_from_py_(AreaPy) -generate_from_py_(FeatureAreaPy) -generate_from_py_(VoronoiPy) -generate_from_py_(VoronoiCellPy) -generate_from_py_(VoronoiEdgePy) -generate_from_py_(VoronoiVertexPy) +generate_from_py(Command) +generate_from_py(Path) +generate_from_py(FeaturePathCompound) +generate_from_py(Area) +generate_from_py(FeatureArea) +generate_from_py(Voronoi) +generate_from_py(VoronoiCell) +generate_from_py(VoronoiEdge) +generate_from_py(VoronoiVertex) SET(Python_SRCS - CommandPy.xml + Command.pyi CommandPyImp.cpp - PathPy.xml + Path.pyi PathPyImp.cpp - FeaturePathCompoundPy.xml + FeaturePathCompound.pyi FeaturePathCompoundPyImp.cpp - AreaPy.xml + Area.pyi AreaPyImp.cpp - FeatureAreaPy.xml + FeatureArea.pyi FeatureAreaPyImp.cpp - VoronoiPy.xml + Voronoi.pyi VoronoiPyImp.cpp - VoronoiCellPy.xml + VoronoiCell.pyi VoronoiCellPyImp.cpp - VoronoiEdgePy.xml + VoronoiEdge.pyi VoronoiEdgePyImp.cpp - VoronoiVertexPy.xml + VoronoiVertex.pyi VoronoiVertexPyImp.cpp ) diff --git a/src/Mod/CAM/App/CommandPy.pyi b/src/Mod/CAM/App/Command.pyi similarity index 86% rename from src/Mod/CAM/App/CommandPy.pyi rename to src/Mod/CAM/App/Command.pyi index e9350af99b..15775ff52a 100644 --- a/src/Mod/CAM/App/CommandPy.pyi +++ b/src/Mod/CAM/App/Command.pyi @@ -3,19 +3,13 @@ from Base.Persistence import Persistence from Base.Placement import Placement @export( - Father="PersistencePy", - Name="CommandPy", - Twin="Command", - TwinPointer="Command", Include="Mod/CAM/App/Command.h", Namespace="Path", - FatherInclude="Base/PersistencePy.h", - FatherNamespace="Base", Delete=True, Constructor=True, ) @class_declarations("mutable Py::Dict parameters_copy_dict;") -class CommandPy(Persistence): +class Command(Persistence): """ Command([name],[parameters]): Represents a basic Gcode command name (optional) is the name of the command, ex. G1 diff --git a/src/Mod/CAM/App/CommandPy.xml b/src/Mod/CAM/App/CommandPy.xml deleted file mode 100644 index 0c933c2334..0000000000 --- a/src/Mod/CAM/App/CommandPy.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - Command([name],[parameters]): Represents a basic Gcode command -name (optional) is the name of the command, ex. G1 -parameters (optional) is a dictionary containing string:number -pairs, or a placement, or a vector - - - - The name of the command - - - - - - The parameters of the command - - - - - - The coordinates of the endpoint of the command - - - - - - toGCode(): returns a GCode representation of the command - - - - - setFromGCode(): sets the path from the contents of the given GCode string - - - - - transform(Placement): returns a copy of this command transformed by the given placement - - - mutable Py::Dict parameters_copy_dict; - - diff --git a/src/Mod/CAM/App/FeatureAreaPy.pyi b/src/Mod/CAM/App/FeatureArea.pyi similarity index 76% rename from src/Mod/CAM/App/FeatureAreaPy.pyi rename to src/Mod/CAM/App/FeatureArea.pyi index 0a20e8c859..c8827527fe 100644 --- a/src/Mod/CAM/App/FeatureAreaPy.pyi +++ b/src/Mod/CAM/App/FeatureArea.pyi @@ -5,18 +5,15 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="FeatureAreaPy", - Twin="FeatureArea", - TwinPointer="FeatureArea", Include="Mod/CAM/App/FeatureArea.h", Namespace="Path", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", ) -class FeatureAreaPy(DocumentObject): +class FeatureArea(DocumentObject): """ This class handles Path Area features + + Author: Zheng, Lei (realthunder.dev@gmail.com) + License: LGPL-2.1-or-later """ def getArea(self) -> Any: diff --git a/src/Mod/CAM/App/FeatureAreaPy.xml b/src/Mod/CAM/App/FeatureAreaPy.xml deleted file mode 100644 index aeef6162e6..0000000000 --- a/src/Mod/CAM/App/FeatureAreaPy.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - This class handles Path Area features - - - - Return a copy of the encapsulated Python Area object. - - - - - setParams(key=value...): Convenient function to configure this feature. - -Same usage as Path.Area.setParams(). This function stores the parameters in the properties. - - - - - The current workplane. If no plane is set, it is derived from the added shapes. - - - - - - diff --git a/src/Mod/CAM/App/FeaturePathCompoundPy.pyi b/src/Mod/CAM/App/FeaturePathCompound.pyi similarity index 68% rename from src/Mod/CAM/App/FeaturePathCompoundPy.pyi rename to src/Mod/CAM/App/FeaturePathCompound.pyi index 7e0833a5a1..1337d465a3 100644 --- a/src/Mod/CAM/App/FeaturePathCompoundPy.pyi +++ b/src/Mod/CAM/App/FeaturePathCompound.pyi @@ -5,18 +5,16 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="FeaturePathCompoundPy", - Twin="FeaturePathCompound", - TwinPointer="FeatureCompound", Include="Mod/CAM/App/FeaturePathCompound.h", + TwinPointer="FeatureCompound", Namespace="Path", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", ) -class FeaturePathCompoundPy(DocumentObject): +class FeaturePathCompound(DocumentObject): """ This class handles Path Compound features + + Author: Yorik van Havre (yorik@uncreated.net) + License: LGPL-2.1-or-later """ def addObject(self) -> Any: diff --git a/src/Mod/CAM/App/FeaturePathCompoundPy.xml b/src/Mod/CAM/App/FeaturePathCompoundPy.xml deleted file mode 100644 index 886c471f8e..0000000000 --- a/src/Mod/CAM/App/FeaturePathCompoundPy.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - This class handles Path Compound features - - - - Add an object to the group - - - - - Remove an object from the group - - - - - diff --git a/src/Mod/CAM/App/PathPy.pyi b/src/Mod/CAM/App/Path.pyi similarity index 89% rename from src/Mod/CAM/App/PathPy.pyi rename to src/Mod/CAM/App/Path.pyi index e5d9f405e4..b6b69550ab 100644 --- a/src/Mod/CAM/App/PathPy.pyi +++ b/src/Mod/CAM/App/Path.pyi @@ -4,22 +4,20 @@ from Base.Metadata import constmethod, export from Base.Persistence import Persistence @export( - Father="PersistencePy", - Name="PathPy", + Include="Mod/CAM/App/Path.h", Twin="Toolpath", TwinPointer="Toolpath", - Include="Mod/CAM/App/Path.h", Namespace="Path", - FatherInclude="Base/PersistencePy.h", - FatherNamespace="Base", - ReadOnly=["Length", "Size", "BoundBox"], Delete=True, Constructor=True, ) -class PathPy(Persistence): +class Path(Persistence): """ Path([commands]): Represents a basic Gcode path commands (optional) is a list of Path commands + + Author: Yorik van Havre (yorik@uncreated.net) + License: LGPL-2.1-or-later """ def addCommands(self) -> Any: diff --git a/src/Mod/CAM/App/PathPy.xml b/src/Mod/CAM/App/PathPy.xml deleted file mode 100644 index d0d6dac98c..0000000000 --- a/src/Mod/CAM/App/PathPy.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - Path([commands]): Represents a basic Gcode path -commands (optional) is a list of Path commands - - - - the total length of this path in mm - - - - - - the number of commands in this path - - - - - - the list of commands of this path - - - - - - the center position for all rotational parameters - - - - - - the extent of this path - - - - - - adds a command or a list of commands at the end of the path - - - - - insertCommand(Command,[int]): -adds a command at the given position or at the end of the path - - - - - deleteCommand([int]): -deletes the command found at the given position or from the end of the path - - - - - sets the contents of the path from a gcode string - - - - - returns a gcode string representing the path - - - - - returns a copy of this path - - - - - return the cycle time estimation for this path in s - - - - - - diff --git a/src/Mod/CAM/App/VoronoiPy.pyi b/src/Mod/CAM/App/Voronoi.pyi similarity index 90% rename from src/Mod/CAM/App/VoronoiPy.pyi rename to src/Mod/CAM/App/Voronoi.pyi index 9e9852d57d..3549103dfc 100644 --- a/src/Mod/CAM/App/VoronoiPy.pyi +++ b/src/Mod/CAM/App/Voronoi.pyi @@ -4,21 +4,17 @@ from Base.BaseClass import BaseClass from Base.Metadata import constmethod, export @export( - Father="BaseClassPy", - Name="VoronoiPy", - PythonName="Path.Voronoi.Diagram", - Twin="Voronoi", - TwinPointer="Voronoi", Include="Mod/CAM/App/Voronoi.h", Namespace="Path", - FatherInclude="Base/BaseClassPy.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class VoronoiPy(BaseClass): +class Voronoi(BaseClass): """ Voronoi([segments]): Create voronoi for given collection of line segments + + Author: sliptonic (shopinthewoods@gmail.com) + License: LGPL-2.1-or-later """ @constmethod diff --git a/src/Mod/CAM/App/VoronoiCellPy.pyi b/src/Mod/CAM/App/VoronoiCell.pyi similarity index 83% rename from src/Mod/CAM/App/VoronoiCellPy.pyi rename to src/Mod/CAM/App/VoronoiCell.pyi index 6978cf942f..80a23597bd 100644 --- a/src/Mod/CAM/App/VoronoiCellPy.pyi +++ b/src/Mod/CAM/App/VoronoiCell.pyi @@ -4,22 +4,18 @@ from Base.BaseClass import BaseClass from Base.Metadata import constmethod, export @export( - Father="BaseClassPy", - Name="VoronoiCellPy", - Twin="VoronoiCell", - PythonName="Path.Voronoi.Cell", - TwinPointer="VoronoiCell", Include="Mod/CAM/App/VoronoiCell.h", Namespace="Path", - FatherInclude="Base/BaseClassPy.h", - FatherNamespace="Base", Constructor=True, RichCompare=True, Delete=True, ) -class VoronoiCellPy(BaseClass): +class VoronoiCell(BaseClass): """ Cell of a Voronoi diagram + + Author: sliptonic (shopinthewoods@gmail.com) + License: LGPL-2.1-or-later """ @constmethod diff --git a/src/Mod/CAM/App/VoronoiCellPy.xml b/src/Mod/CAM/App/VoronoiCellPy.xml deleted file mode 100644 index 45643bd857..0000000000 --- a/src/Mod/CAM/App/VoronoiCellPy.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - Cell of a Voronoi diagram - - - - Internal id of the element. - - - - - - Assigned color of the receiver. - - - - - - Returns the index of the cell's source - - - - - - Returns the cell's category as an integer - - - - - - Returns the cell's category as a string - - - - - - Incident edge of the cell - if exists - - - - - - Returns true if the cell contains a point site - - - - - Returns true if the cell contains a segment site - - - - - Returns true if the cell doesn't have an incident edge - - - - - Returns the Source for the cell - - - - diff --git a/src/Mod/CAM/App/VoronoiEdgePy.pyi b/src/Mod/CAM/App/VoronoiEdge.pyi similarity index 89% rename from src/Mod/CAM/App/VoronoiEdgePy.pyi rename to src/Mod/CAM/App/VoronoiEdge.pyi index 6ff72bf7a9..fae416b14c 100644 --- a/src/Mod/CAM/App/VoronoiEdgePy.pyi +++ b/src/Mod/CAM/App/VoronoiEdge.pyi @@ -4,22 +4,18 @@ from Base.BaseClass import BaseClass from Base.Metadata import constmethod, export @export( - Father="BaseClassPy", - Name="VoronoiEdgePy", - Twin="VoronoiEdge", - TwinPointer="VoronoiEdge", - PythonName="Path.Voronoi.Edge", Include="Mod/CAM/App/VoronoiEdge.h", Namespace="Path", - FatherInclude="Base/BaseClassPy.h", - FatherNamespace="Base", RichCompare=True, Constructor=True, Delete=True, ) -class VoronoiEdgePy(BaseClass): +class VoronoiEdge(BaseClass): """ Edge of a Voronoi diagram + + Author: sliptonic (shopinthewoods@gmail.com) + License: LGPL-2.1-or-later """ @constmethod diff --git a/src/Mod/CAM/App/VoronoiEdgePy.xml b/src/Mod/CAM/App/VoronoiEdgePy.xml deleted file mode 100644 index a554957cc2..0000000000 --- a/src/Mod/CAM/App/VoronoiEdgePy.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - Edge of a Voronoi diagram - - - - Internal id of the element. - - - - - - Assigned color of the receiver. - - - - - - cell the edge belongs to - - - - - - Begin and End voronoi vertex - - - - - - CCW next edge within voronoi cell - - - - - - CCW previous edge within voronoi cell - - - - - - Rotated CCW next edge within voronoi cell - - - - - - Rotated CCW previous edge within voronoi cell - - - - - - Twin edge - - - - - - Returns true if both vertices are finite - - - - - Returns true if the end vertex is infinite - - - - - Returns true if edge is straight - - - - - Returns true if edge is curved - - - - - Returns false if edge goes through endpoint of the segment site - - - - - Returns true if edge goes through endpoint of the segment site - - - - - Returns true if the point is on the segment - - - - - Returns a shape for the edge - - - - - Returns the distance of the vertices to the input source - - - - - Returns the angle (in degree) of the segments if the edge was formed by two segments - - - - diff --git a/src/Mod/CAM/App/VoronoiPy.xml b/src/Mod/CAM/App/VoronoiPy.xml deleted file mode 100644 index c54b4cccd0..0000000000 --- a/src/Mod/CAM/App/VoronoiPy.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - Voronoi([segments]): Create voronoi for given collection of line segments - - - - List of all cells of the voronoi diagram - - - - - - List of all edges of the voronoi diagram - - - - - - List of all vertices of the voronoi diagram - - - - - - Return number of cells - - - - - Return number of edges - - - - - Return number of vertices - - - - - addPoint(vector|vector2d) add given point to input collection - - - - - addSegment(vector|vector2d, vector|vector2d) add given segment to input collection - - - - - constructs the voronoi diagram from the input collections - - - - - assign given color to all exterior edges and vertices - - - - - assign given color to all twins of edges (which one is considered a twin is arbitrary) - - - - - assign given color to all edges sourced by two segments almost in line with each other (optional angle in degrees) - - - - - assign color 0 to all elements with the given color - - - - - Get list of all input points. - - - - - Return number of input points - - - - - Get list of all input segments. - - - - - Return number of input segments - - - - diff --git a/src/Mod/CAM/App/VoronoiVertexPy.pyi b/src/Mod/CAM/App/VoronoiVertex.pyi similarity index 72% rename from src/Mod/CAM/App/VoronoiVertexPy.pyi rename to src/Mod/CAM/App/VoronoiVertex.pyi index b36e3159df..a694091baa 100644 --- a/src/Mod/CAM/App/VoronoiVertexPy.pyi +++ b/src/Mod/CAM/App/VoronoiVertex.pyi @@ -4,22 +4,18 @@ from Base.BaseClass import BaseClass from Base.Metadata import constmethod, export @export( - Father="BaseClassPy", - Name="VoronoiVertexPy", - PythonName="Path.Voronoi.Vertex", - Twin="VoronoiVertex", - TwinPointer="VoronoiVertex", Include="Mod/CAM/App/VoronoiVertex.h", Namespace="Path", - FatherInclude="Base/BaseClassPy.h", - FatherNamespace="Base", Constructor=True, RichCompare=True, Delete=True, ) -class VoronoiVertexPy(BaseClass): +class VoronoiVertex(BaseClass): """ Vertex of a Voronoi diagram + + Author: sliptonic (shopinthewoods@gmail.com) + License: LGPL-2.1-or-later """ @constmethod diff --git a/src/Mod/CAM/App/VoronoiVertexPy.xml b/src/Mod/CAM/App/VoronoiVertexPy.xml deleted file mode 100644 index a04cba6e1b..0000000000 --- a/src/Mod/CAM/App/VoronoiVertexPy.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - Vertex of a Voronoi diagram - - - - Internal id of the element. - - - - - - Assigned color of the receiver. - - - - - - X position - - - - - - Y position - - - - - - Y position - - - - - - Returns a Vector - or None if not possible - - - - diff --git a/src/Mod/CAM/PathSimulator/App/CMakeLists.txt b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt index 0a7bd99782..7f76df0187 100644 --- a/src/Mod/CAM/PathSimulator/App/CMakeLists.txt +++ b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt @@ -14,7 +14,7 @@ set(PathSimulator_LIBS ) SET(Python_SRCS - PathSimPy.xml + PathSim.pyi PathSimPyImp.cpp ) @@ -30,8 +30,7 @@ SET(PathSimulator_SRCS ${Python_SRCS} ) -generate_from_xml(PathSimPy) -generate_from_py_(PathSimPy) +generate_from_py(PathSim) SOURCE_GROUP("Python" FILES ${Python_SRCS}) diff --git a/src/Mod/CAM/PathSimulator/App/PathSimPy.pyi b/src/Mod/CAM/PathSimulator/App/PathSim.pyi similarity index 86% rename from src/Mod/CAM/PathSimulator/App/PathSimPy.pyi rename to src/Mod/CAM/PathSimulator/App/PathSim.pyi index b85b022a89..257f54ed03 100644 --- a/src/Mod/CAM/PathSimulator/App/PathSimPy.pyi +++ b/src/Mod/CAM/PathSimulator/App/PathSim.pyi @@ -4,25 +4,22 @@ from Base.BaseClass import BaseClass from Base.Metadata import export @export( - Father="BaseClassPy", - Name="PathSimPy", - Twin="PathSim", - TwinPointer="PathSim", FatherInclude="Base/BaseClassPy.h", - FatherNamespace="Base", Include="Mod/CAM/PathSimulator/App/PathSim.h", Namespace="PathSimulator", - ReadOnly=["Tool"], Constructor=True, Delete=True, ) -class PathSimPy(BaseClass): +class PathSim(BaseClass): """ FreeCAD python wrapper of PathSimulator PathSimulator.PathSim(): Create a path simulator object + + Author: Shai Seger (shaise_at_g-mail) + License: LGPL-2.1-or-later """ def BeginSimulation(self, **kwargs) -> Any: diff --git a/src/Mod/CAM/PathSimulator/App/PathSimPy.xml b/src/Mod/CAM/PathSimulator/App/PathSimPy.xml deleted file mode 100644 index a6ebbc2cb9..0000000000 --- a/src/Mod/CAM/PathSimulator/App/PathSimPy.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - FreeCAD python wrapper of PathSimulator - -PathSimulator.PathSim(): - -Create a path simulator object - - - - - BeginSimulation(stock, resolution): - -Start a simulation process on a box shape stock with given resolution - - - - - - SetToolShape(shape): - -Set the shape of the tool to be used for simulation - - - - - - - GetResultMesh(): - - Return the current mesh result of the simulation. - - - - - - - - ApplyCommand(placement, command): - - Apply a single path command on the stock starting from placement. - - - - - - - Return current simulation tool. - - - - - diff --git a/src/Mod/CAM/PathSimulator/AppGL/CAMSimPy.pyi b/src/Mod/CAM/PathSimulator/AppGL/CAMSim.pyi similarity index 90% rename from src/Mod/CAM/PathSimulator/AppGL/CAMSimPy.pyi rename to src/Mod/CAM/PathSimulator/AppGL/CAMSim.pyi index 083ea1bc1c..5b565b3fac 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/CAMSimPy.pyi +++ b/src/Mod/CAM/PathSimulator/AppGL/CAMSim.pyi @@ -5,24 +5,22 @@ from Base.Metadata import export from Metadata import no_args @export( - Father="BaseClassPy", - Name="CAMSimPy", - Twin="CAMSim", - TwinPointer="CAMSim", Include="Mod/CAM/PathSimulator/AppGL/CAMSim.h", FatherInclude="Base/BaseClassPy.h", - FatherNamespace="Base", Namespace="CAMSimulator", Constructor=True, Delete=True, ) -class CAMSimPy(BaseClass): +class CAMSim(BaseClass): """ FreeCAD python wrapper of CAMSimulator CAMSimulator.CAMSim(): Create a path simulator object + + Author: Shai Seger (shaise_at_g-mail) + License: LGPL-2.1-or-later """ def BeginSimulation(self, **kwargs) -> Any: diff --git a/src/Mod/CAM/PathSimulator/AppGL/CAMSimPy.xml b/src/Mod/CAM/PathSimulator/AppGL/CAMSimPy.xml deleted file mode 100644 index fe3117b3a7..0000000000 --- a/src/Mod/CAM/PathSimulator/AppGL/CAMSimPy.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - FreeCAD python wrapper of CAMSimulator - - CAMSimulator.CAMSim(): - - Create a path simulator object - - - - - - BeginSimulation(stock, resolution): - - Start a simulation process on a box shape stock with given resolution - - - - - - - ResetSimulation(): - - Clear the simulation and all gcode commands - - - - - - - AddTool(shape, toolnumber, diameter, resolution): - - Set the shape of the tool to be used for simulation - - - - - - - SetBaseShape(shape, resolution): - - Set the shape of the base object of the job - - - - - - - AddCommand(command): - - Add a path command to the simulation. - - - - - diff --git a/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt b/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt index d8ec1ed88b..97d9a120ff 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt +++ b/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt @@ -16,7 +16,7 @@ set(CAMSimulator_LIBS ) SET(CAMSimulator_SRCS_Python - CAMSimPy.xml + CAMSim.pyi CAMSimPyImp.cpp ) @@ -66,9 +66,7 @@ SET(CAMSimulator_SRCS_Core TextureLoader.h ) - -generate_from_xml(CAMSimPy) -generate_from_py_(CAMSimPy) +generate_from_py(CAMSim) SOURCE_GROUP("Module" FILES ${CAMSimulator_SRCS_Module}) SOURCE_GROUP("Python" FILES ${CAMSimulator_SRCS_Python}) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 0622345b51..1dc92677f1 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -49,12 +49,11 @@ else() endif() -generate_from_xml(FemMeshPy) -generate_from_py_(FemMeshPy) +generate_from_py(FemMesh) SET(Python_SRCS - FemMeshPy.xml + FemMesh.pyi FemMeshPyImp.cpp HypothesisPy.cpp HypothesisPy.h @@ -64,24 +63,19 @@ SET(Python_SRCS if(BUILD_FEM_VTK) SET(Python_SRCS ${Python_SRCS} - FemPostObjectPy.xml + FemPostObject.pyi FemPostObjectPyImp.cpp - FemPostPipelinePy.xml + FemPostPipeline.pyi FemPostPipelinePyImp.cpp - FemPostFilterPy.xml + FemPostFilter.pyi FemPostFilterPyImp.cpp - FemPostBranchFilterPy.xml + FemPostBranchFilter.pyi FemPostBranchFilterPyImp.cpp ) - generate_from_xml(FemPostObjectPy) - generate_from_xml(FemPostPipelinePy) - generate_from_xml(FemPostFilterPy) - generate_from_xml(FemPostBranchFilterPy) - - generate_from_py_(FemPostObjectPy) - generate_from_py_(FemPostPipelinePy) - generate_from_py_(FemPostFilterPy) - generate_from_py_(FemPostBranchFilterPy) + generate_from_py(FemPostObject) + generate_from_py(FemPostPipeline) + generate_from_py(FemPostFilter) + generate_from_py(FemPostBranchFilter) endif(BUILD_FEM_VTK) SOURCE_GROUP("Python" FILES ${Python_SRCS}) diff --git a/src/Mod/Fem/App/FemMeshPy.pyi b/src/Mod/Fem/App/FemMesh.pyi similarity index 98% rename from src/Mod/Fem/App/FemMeshPy.pyi rename to src/Mod/Fem/App/FemMesh.pyi index e648678403..04f2fa8f3b 100644 --- a/src/Mod/Fem/App/FemMeshPy.pyi +++ b/src/Mod/Fem/App/FemMesh.pyi @@ -5,19 +5,18 @@ from Base.Metadata import constmethod, export from App.ComplexGeoData import ComplexGeoData @export( - Father="ComplexGeoDataPy", - Name="FemMeshPy", - Twin="FemMesh", - TwinPointer="FemMesh", Include="Mod/Fem/App/FemMesh.h", Namespace="Fem", FatherInclude="App/ComplexGeoDataPy.h", FatherNamespace="Data", Constructor=True, ) -class FemMeshPy(ComplexGeoData): +class FemMesh(ComplexGeoData): """ FemMesh class + + Author: Juergen Riegel (Juergen.Riegel@web.de) + License: LGPL-2.1-or-later """ def setShape(self) -> Any: diff --git a/src/Mod/Fem/App/FemMeshPy.xml b/src/Mod/Fem/App/FemMeshPy.xml deleted file mode 100755 index e3f11ca5e8..0000000000 --- a/src/Mod/Fem/App/FemMeshPy.xml +++ /dev/null @@ -1,391 +0,0 @@ - - - - - - FemMesh class - - - - Set the Part shape to mesh - - - - - Update the internal mesh structure - - - - - Add hypothesis - - - - - Set some standard hypotheses for the whole shape - - - - - Add a node by setting (x,y,z). - - - - - Add an edge by setting two node indices. - - - - - Add list of edges by list of node indices and list of nodes per edge. - - - - - Add a face by setting three node indices. - - - - - Add list of faces by list of node indices and list of nodes per face. - - - - - Add a quad by setting four node indices. - - - - - Add a volume by setting an arbitrary number of node indices. - - - - - Add list of volumes by list of node indices and list of nodes per volume. - - - - - Read in a various FEM mesh file formats. - read(file.endingToExportTo) - supported formats: DAT, INP, MED, STL, UNV, VTK, Z88 - - - - - Write out various FEM mesh file formats. - write(file.endingToExportTo) - supported formats: BDF, DAT, INP, MED, STL, UNV, VTK, Z88 - - - - - - Write out as ABAQUS inp - writeABAQUS(file, int elemParam, bool groupParam, str volVariant, str faceVariant, str edgeVariant) - - elemParam: - 0: All elements - 1: Highest elements only - 2: FEM elements only (only edges not belonging to faces and faces not belonging to volumes) - - groupParam: - True: Write group data - False: Do not write group data - - volVariant: Volume elements - "standard": Tetra4 -> C3D4, Penta6 -> C3D6, Hexa8 -> C3D8, Tetra10 -> C3D10, Penta15 -> C3D15, Hexa20 -> C3D20 - "reduced": Hexa8 -> C3D8R, Hexa20 -> C3D20R - "incompatible": Hexa8 -> C3D8I - "modified": Tetra10 -> C3D10T - "fluid": Tetra4 -> F3D4, Penta6 -> F3D6, Hexa8 -> F3D8 - - faceVariant: Face elements - "shell": Tria3 -> S3, Quad4 -> S4, Tria6 -> S6, Quad8 -> S8 - "shell reduced": Tria3 -> S3, Quad4 -> S4R, Tria6 -> S6, Quad8 -> S8R - "membrane": Tria3 -> M3D3, Quad4 -> M3D4, Tria6 -> M3D6, Quad8 -> M3D8 - "membrane reduced": Tria3 -> M3D3, Quad4 -> M3D4R, Tria6 -> M3D6, Quad8 -> M3D8R - "stress": Tria3 -> CPS3, Quad4 -> CPS4, Tria6 -> CPS6, Quad8 -> CPS8 - "stress reduced": Tria3 -> CPS3, Quad4 -> CPS4R, Tria6 -> CPS6, Quad8 -> CPS8R - "strain": Tria3 -> CPE3, Quad4 -> CPE4, Tria6 -> CPE6, Quad8 -> CPE8 - "strain reduced": Tria3 -> CPE3, Quad4 -> CPE4R, Tria6 -> CPE6, Quad8 -> CPE8R - "axisymmetric": Tria3 -> CAX3, Quad4 -> CAX4, Tria6 -> CAX6, Quad8 -> CAX8 - "axisymmetric reduced": Tria3 -> CAX3, Quad4 -> CAX4R, Tria6 -> CAX6, Quad8 -> CAX8R - - edgeVariant: Edge elements - "beam": Seg2 -> B31, Seg3 -> B32 - "beam reduced": Seg2 -> B31R, Seg3 -> B32R - "truss": Seg2 -> T3D2, eg3 -> T3D3 - "network": Seg3 -> D - - Elements are selected according to CalculiX availability. - For example if volume variant "modified" is selected, Tetra10 mesh - elements are assigned to C3D10T and remain elements uses "standard". - Axisymmetric, plane strain and plane stress elements expect nodes in the plane z=0. - - - - - Use a Placement object to perform a translation or rotation - - - - - Make a copy of this FEM mesh. - - - - - Return a list of face IDs which belong to a TopoFace - - - - - Return a list of edge IDs which belong to a TopoEdge - - - - - Return a dict of volume IDs and face IDs which belong to a TopoFace - - - - - Return a dict of volume IDs and ccx face numbers which belong to a TopoFace - - - - - Get the node position vector by a Node-ID - - - - - Return a list of node IDs which belong to a TopoSolid - - - - - Return a list of node IDs which belong to a TopoFace - - - - - Return a list of node IDs which belong to a TopoEdge - - - - - Return a list of node IDs which belong to a TopoVertex - - - - - Return a tuple of node IDs to a given element ID - - - - - Return a tuple of specific element IDs associated to a given node ID - - - - - Return a string of group name to a given group ID - - - - - Return a string of group element type to a given group ID - - - - - Return a tuple of ElementIDs to a given group ID - - - - - Add a group to mesh with specific name and type - addGroup(name, typestring, [id]) - name: string - typestring: "All", "Node", "Edge", "Face", "Volume", "0DElement", "Ball" - id: int - Optional id is used to force specific id for group, but does - not work, yet. - - - - - - Add a tuple of ElementIDs to a given group ID - addGroupElements(groupid, list_of_elements) - groupid: int - list_of_elements: list of int - Notice that the elements have to be in the mesh. - - - - - - Remove a group with a given group ID - removeGroup(groupid) - groupid: int - Returns boolean. - - - - - - Return the element type of a given ID - - - - - Return a tuple of IDs to a given element type - - - - - Dictionary of Nodes by ID (int ID:Vector()) - - - - - - Number of nodes in the Mesh. - - - - - - Tuple of edge IDs - - - - - - Tuple of edge IDs which does not belong to any face (and thus not belong to any volume too) - - - - - - Number of edges in the Mesh. - - - - - - Tuple of face IDs - - - - - - Tuple of face IDs which does not belong to any volume - - - - - - Number of Faces in the Mesh. - - - - - - Number of Triangles in the Mesh. - - - - - - Number of Quadrangles in the Mesh. - - - - - - Number of Quadrangles in the Mesh. - - - - - - Tuple of volume IDs - - - - - - Number of Volumes in the Mesh. - - - - - - Number of Tetras in the Mesh. - - - - - - Number of Hexas in the Mesh. - - - - - - Number of Pyramids in the Mesh. - - - - - - Number of Prisms in the Mesh. - - - - - - Number of Polyhedrons in the Mesh. - - - - - - Number of SubMeshs in the Mesh. - - - - - - Number of Groups in the Mesh. - - - - - - Tuple of Group IDs. - - - - - - Volume of the mesh. - - - - - diff --git a/src/Mod/Fem/App/FemPostBranchFilterPy.pyi b/src/Mod/Fem/App/FemPostBranchFilter.pyi similarity index 81% rename from src/Mod/Fem/App/FemPostBranchFilterPy.pyi rename to src/Mod/Fem/App/FemPostBranchFilter.pyi index b6b2c45f20..ece7da0df6 100644 --- a/src/Mod/Fem/App/FemPostBranchFilterPy.pyi +++ b/src/Mod/Fem/App/FemPostBranchFilter.pyi @@ -5,18 +5,17 @@ from Base.Metadata import export from Fem.FemPostFilter import FemPostFilter @export( - Father="FemPostFilterPy", - Name="FemPostBranchFilterPy", - Twin="FemPostBranchFilter", - TwinPointer="FemPostBranchFilter", Include="Mod/Fem/App/FemPostBranchFilter.h", Namespace="Fem", FatherInclude="Mod/Fem/App/FemPostFilterPy.h", FatherNamespace="Fem", ) -class FemPostBranchFilterPy(FemPostFilter): +class FemPostBranchFilter(FemPostFilter): """ The FemPostBranch class. + + Author: Stefan Tröger (stefantroeger@gmx.net) + License: LGPL-2.1-or-later """ def getFilter(self) -> Any: diff --git a/src/Mod/Fem/App/FemPostBranchFilterPy.xml b/src/Mod/Fem/App/FemPostBranchFilterPy.xml deleted file mode 100644 index c288488672..0000000000 --- a/src/Mod/Fem/App/FemPostBranchFilterPy.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - The FemPostBranch class. - - - - Returns all filters, that this pipeline uses (non recursive, result does not contain branch child filters) - - - - - Recomputes all children of the pipeline - - - - - Get the last post-processing object - - - - - Check if this pipeline holds a given post-processing object - - - - diff --git a/src/Mod/Fem/App/FemPostFilterPy.pyi b/src/Mod/Fem/App/FemPostFilter.pyi similarity index 92% rename from src/Mod/Fem/App/FemPostFilterPy.pyi rename to src/Mod/Fem/App/FemPostFilter.pyi index 784afe9779..aa11328dcd 100644 --- a/src/Mod/Fem/App/FemPostFilterPy.pyi +++ b/src/Mod/Fem/App/FemPostFilter.pyi @@ -5,18 +5,17 @@ from Base.Metadata import export from Fem.FemPostObject import FemPostObject @export( - Father="FemPostObjectPy", - Name="FemPostFilterPy", - Twin="FemPostFilter", - TwinPointer="FemPostFilter", Include="Mod/Fem/App/FemPostFilter.h", Namespace="Fem", FatherInclude="Mod/Fem/App/FemPostObjectPy.h", FatherNamespace="Fem", ) -class FemPostFilterPy(FemPostObject): +class FemPostFilter(FemPostObject): """ The FemPostFilter class. + + Author: Stefan Tröger (stefantroeger@gmx.net) + License: LGPL-2.1-or-later """ def addFilterPipeline(self) -> Any: diff --git a/src/Mod/Fem/App/FemPostFilterPy.xml b/src/Mod/Fem/App/FemPostFilterPy.xml deleted file mode 100644 index 3fe0e4fd88..0000000000 --- a/src/Mod/Fem/App/FemPostFilterPy.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - The FemPostFilter class. - - - - Registers a new vtk filter pipeline for data processing. Arguments are (name, source algorithm, target algorithm). - - - - - Sets the filter pipeline that shall be used for data processing. Argument is the name of the filter pipeline to activate. - - - - - Returns the postprocessing group the filter is in (e.g. a pipeline or branch object). None is returned if not in any. - - - - - -Returns the dataset available at the filter's input. -Note: Can lead to a full recompute of the whole pipeline, hence best to call this only in "execute", where the user expects long calculation cycles. - - - - - - -Returns the names of all vector fields available on this filter's input. -Note: Can lead to a full recompute of the whole pipeline, hence best to call this only in "execute", where the user expects long calculation cycles. - - - - - - -Returns the names of all scalar fields available on this filter's input. -Note: Can lead to a full recompute of the whole pipeline, hence best to call this only in "execute", where the user expects long calculation cycles. - - - - - - -Returns the filters vtk algorithm currently used as output (the one generating the Data field). Note that the output algorithm may change depending on filter settings. - - - " - - diff --git a/src/Mod/Fem/App/FemPostObjectPy.pyi b/src/Mod/Fem/App/FemPostObject.pyi similarity index 87% rename from src/Mod/Fem/App/FemPostObjectPy.pyi rename to src/Mod/Fem/App/FemPostObject.pyi index b37a02302e..7f40fd4e04 100644 --- a/src/Mod/Fem/App/FemPostObjectPy.pyi +++ b/src/Mod/Fem/App/FemPostObject.pyi @@ -5,18 +5,17 @@ from Base.Metadata import export from App.GeoFeature import GeoFeature @export( - Father="GeoFeaturePy", - Name="FemPostObjectPy", - Twin="FemPostObject", - TwinPointer="FemPostObject", Include="Mod/Fem/App/FemPostObject.h", Namespace="Fem", - FatherInclude="App/GeoFeaturePy.h", FatherNamespace="App", + FatherInclude="App/GeoFeaturePy.h", ) -class FemPostObjectPy(GeoFeature): +class FemPostObject(GeoFeature): """ The FemPostObject class. + + Author: Mario Passaglia (mpassaglia@cbc.uba.ar) + License: LGPL-2.1-or-later """ def writeVTK(self) -> Any: diff --git a/src/Mod/Fem/App/FemPostObjectPy.xml b/src/Mod/Fem/App/FemPostObjectPy.xml deleted file mode 100644 index 8f5603234b..0000000000 --- a/src/Mod/Fem/App/FemPostObjectPy.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - The FemPostObject class. - - - - writeVTK(filename) -> None - -Write data object to VTK file. - -filename: str - File extension is automatically detected from data type. - - - - - getDataset() -> vtkDataSet - -Returns the current output dataset. For normal filters this is equal to the objects Data property output. However, a pipelines Data property could store multiple frames, and hence Data can be of type vtkCompositeData, which is not a vtkDataset. To simplify implementations this function always returns a vtkDataSet, and for a pipeline it will be the dataset of the currently selected frame. Note that the returned value could be None, if no data is set at all. - - - - - diff --git a/src/Mod/Fem/App/FemPostPipelinePy.pyi b/src/Mod/Fem/App/FemPostPipeline.pyi similarity index 93% rename from src/Mod/Fem/App/FemPostPipelinePy.pyi rename to src/Mod/Fem/App/FemPostPipeline.pyi index 67923666e3..9541c17c3b 100644 --- a/src/Mod/Fem/App/FemPostPipelinePy.pyi +++ b/src/Mod/Fem/App/FemPostPipeline.pyi @@ -5,18 +5,17 @@ from Base.Metadata import export from Fem.FemPostObject import FemPostObject @export( - Father="FemPostObjectPy", - Name="FemPostPipelinePy", - Twin="FemPostPipeline", - TwinPointer="FemPostPipeline", Include="Mod/Fem/App/FemPostPipeline.h", Namespace="Fem", FatherInclude="Mod/Fem/App/FemPostObjectPy.h", FatherNamespace="Fem", ) -class FemPostPipelinePy(FemPostObject): +class FemPostPipeline(FemPostObject): """ The FemPostPipeline class. + + Author: Stefan Tröger (stefantroeger@gmx.net) + License: LGPL-2.1-or-later """ def read(self) -> Any: diff --git a/src/Mod/Fem/App/FemPostPipelinePy.xml b/src/Mod/Fem/App/FemPostPipelinePy.xml deleted file mode 100644 index ab15496be9..0000000000 --- a/src/Mod/Fem/App/FemPostPipelinePy.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - The FemPostPipeline class. - - - - -read(filepath) -read([filepaths], [values], unit, frame_type) - -Reads in a single vtk file or creates a multiframe result by reading in multiple result files. If multiframe is wanted, 4 argumenhts are needed: -1. List of result files each being one frame, -2. List of values valid for each frame (e.g. [s] if time data), -3. the unit of the value as FreeCAD.Units.Unit, -4. the Description of the frame type - - - - - - scale the points of a loaded vtk file - - - - - -load(result_object) -load([result_objects], [values], unit, frame_type) - -Load a single result object or create a multiframe result by loading multiple result frames. If multiframe is wanted, 4 argumenhts are needed: -1. List of result files each being one frame, -2. List of values valid for each frame (e.g. [s] if time data), -3. the unit of the value as FreeCAD.Units.Unit, -4. the Description of the frame type - - - - - - Returns all filters, that this pipeline uses (non recursive, result does not contain branch child filters) - - - - - Recomputes all children of the pipeline - - - - - Get the last post-processing object - - - - - Check if this pipeline holds a given post-processing object - - - - - Change name of data arrays - - - - - -Returns the pipeline vtk algorithm, which generates the data passed to the pipelines filters. Note that the output algorithm may change depending on pipeline settings. - - - " - - diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index c514f78d9d..a4350ee4bb 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -33,28 +33,23 @@ set(FemGui_LIBS PartGui ) -generate_from_xml(ViewProviderFemConstraintPy) -generate_from_xml(ViewProviderFemMeshPy) -generate_from_xml(ViewProviderFemPostPipelinePy) -generate_from_xml(ViewProviderFemPostFilterPy) - -generate_from_py_(ViewProviderFemConstraintPy) -generate_from_py_(ViewProviderFemMeshPy) -generate_from_py_(ViewProviderFemPostPipelinePy) -generate_from_py_(ViewProviderFemPostFilterPy) +generate_from_py(ViewProviderFemConstraint) +generate_from_py(ViewProviderFemMesh) +generate_from_py(ViewProviderFemPostPipeline) +generate_from_py(ViewProviderFemPostFilter) SET(Python_SRCS - ViewProviderFemConstraintPy.xml + ViewProviderFemConstraint.pyi ViewProviderFemConstraintPyImp.cpp - ViewProviderFemMeshPy.xml + ViewProviderFemMesh.pyi ViewProviderFemMeshPyImp.cpp ) if(BUILD_FEM_VTK) set(Python_SRCS ${Python_SRCS} - ViewProviderFemPostPipelinePy.xml + ViewProviderFemPostPipeline.pyi ViewProviderFemPostPipelinePyImp.cpp - ViewProviderFemPostFilterPy.xml + ViewProviderFemPostFilter.pyi ViewProviderFemPostFilterPyImp.cpp ) endif(BUILD_FEM_VTK) diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPy.pyi b/src/Mod/Fem/Gui/ViewProviderFemConstraint.pyi similarity index 76% rename from src/Mod/Fem/Gui/ViewProviderFemConstraintPy.pyi rename to src/Mod/Fem/Gui/ViewProviderFemConstraint.pyi index 71416fd783..25bbf21b09 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPy.pyi +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.pyi @@ -5,18 +5,15 @@ from Base.Metadata import export from Gui.ViewProviderGeometryObject import ViewProviderGeometryObject @export( - Father="ViewProviderGeometryObjectPy", - Name="ViewProviderFemConstraintPy", - Twin="ViewProviderFemConstraint", - TwinPointer="ViewProviderFemConstraint", Include="Mod/Fem/Gui/ViewProviderFemConstraint.h", Namespace="FemGui", - FatherInclude="Gui/ViewProviderGeometryObjectPy.h", - FatherNamespace="Gui", ) -class ViewProviderFemConstraintPy(ViewProviderGeometryObject): +class ViewProviderFemConstraint(ViewProviderGeometryObject): """ This is the ViewProviderFemConstraint class + + Author: Mario Passaglia (mpassaglia@cbc.uba.ar) + License: LGPL-2.1-or-later """ def loadSymbol(self) -> Any: diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPy.xml b/src/Mod/Fem/Gui/ViewProviderFemConstraintPy.xml deleted file mode 100644 index c679c82b89..0000000000 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPy.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - This is the ViewProviderFemConstraint class - - - - loadSymbol(filename) -> None - -Load constraint symbol from Open Inventor file. -The file structure should be as follows: -A separator containing a separator with the symbol used in -multiple copies at points on the surface and an optional -separator with a symbol excluded from multiple copies. - -filename : str - Open Inventor file. - - - - - A pivy SoSeparator with the nodes of the constraint symbols - - - - - - A pivy SoSeparator with the nodes of the constraint extra symbols - - - - - - Apply rotation on copies of the constraint symbol - - - - - diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshPy.pyi b/src/Mod/Fem/Gui/ViewProviderFemMesh.pyi similarity index 83% rename from src/Mod/Fem/Gui/ViewProviderFemMeshPy.pyi rename to src/Mod/Fem/Gui/ViewProviderFemMesh.pyi index 0e007384f0..12d32a201b 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshPy.pyi +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.pyi @@ -5,18 +5,15 @@ from Base.Metadata import export from Gui.ViewProviderGeometryObject import ViewProviderGeometryObject @export( - Father="ViewProviderGeometryObjectPy", - Name="ViewProviderFemMeshPy", - Twin="ViewProviderFemMesh", - TwinPointer="ViewProviderFemMesh", Include="Mod/Fem/Gui/ViewProviderFemMesh.h", Namespace="FemGui", - FatherInclude="Gui/ViewProviderGeometryObjectPy.h", - FatherNamespace="Gui", ) -class ViewProviderFemMeshPy(ViewProviderGeometryObject): +class ViewProviderFemMesh(ViewProviderGeometryObject): """ ViewProviderFemMesh class + + Author: Juergen Riegel (Juergen.Riegel@web.de) + License: LGPL-2.1-or-later """ def applyDisplacement(self) -> Any: diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml b/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml deleted file mode 100644 index e887c882bb..0000000000 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - ViewProviderFemMesh class - - - - - - - - - Reset color set by method setNodeColorByScalars. - - - - - Reset displacements set by method setNodeDisplacementByVectors. - - - - - Reset highlighted nodes. - - - - - Sets mesh node colors using element list and value list. - - - - - - - - - - Postprocessing color of the nodes. The faces between the nodes get interpolated. - - - - - - Postprocessing color of the elements. All faces of the element get the same color. - - - - - - Postprocessing color of the nodes. The faces between the nodes get interpolated. - - - - - - List of nodes which get highlighted. - - - - - - List of elements and faces which are actually shown. These are all surface faces of the mesh. - - - - - diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFilterPy.pyi b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.pyi similarity index 80% rename from src/Mod/Fem/Gui/ViewProviderFemPostFilterPy.pyi rename to src/Mod/Fem/Gui/ViewProviderFemPostFilter.pyi index dff8b94df8..31df8d37cc 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFilterPy.pyi +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.pyi @@ -5,18 +5,18 @@ from Base.Metadata import export from Gui.ViewProviderDocumentObject import ViewProviderDocumentObject @export( - Father="ViewProviderDocumentObjectPy", - Name="ViewProviderFemPostFilterPy", Twin="ViewProviderFemPostObject", TwinPointer="ViewProviderFemPostObject", Include="Mod/Fem/Gui/ViewProviderFemPostObject.h", Namespace="FemGui", FatherInclude="Gui/ViewProviderDocumentObjectPy.h", - FatherNamespace="Gui", ) -class ViewProviderFemPostFilterPy(ViewProviderDocumentObject): +class ViewProviderFemPostFilter(ViewProviderDocumentObject): """ ViewProviderFemPostPipeline class + + Author: Stefan Tröger (stefantroeger@gmx.net) + License: LGPL-2.1-or-later """ def createDisplayTaskWidget(self) -> Any: diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFilterPy.xml b/src/Mod/Fem/Gui/ViewProviderFemPostFilterPy.xml deleted file mode 100644 index 9a41e8e972..0000000000 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFilterPy.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - ViewProviderFemPostPipeline class - - - - Returns the display option task panel for a post processing edit task dialog. - - - - - Returns the data extraction task panel for a post processing edit task dialog. - - - - diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePy.pyi b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.pyi similarity index 61% rename from src/Mod/Fem/Gui/ViewProviderFemPostPipelinePy.pyi rename to src/Mod/Fem/Gui/ViewProviderFemPostPipeline.pyi index 0300860b21..5b839711aa 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePy.pyi +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.pyi @@ -5,18 +5,15 @@ from Base.Metadata import export from Gui.ViewProviderDocumentObject import ViewProviderDocumentObject @export( - Father="ViewProviderDocumentObjectPy", - Name="ViewProviderFemPostPipelinePy", - Twin="ViewProviderFemPostPipeline", - TwinPointer="ViewProviderFemPostPipeline", Include="Mod/Fem/Gui/ViewProviderFemPostPipeline.h", Namespace="FemGui", - FatherInclude="Gui/ViewProviderDocumentObjectPy.h", - FatherNamespace="Gui", ) -class ViewProviderFemPostPipelinePy(ViewProviderDocumentObject): +class ViewProviderFemPostPipeline(ViewProviderDocumentObject): """ ViewProviderFemPostPipeline class + + Author: Uwe Stöhr (uwestoehr@lyx.org) + License: LGPL-2.1-or-later """ def transformField(self) -> Any: diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePy.xml b/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePy.xml deleted file mode 100644 index ad42ced3c4..0000000000 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePy.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - ViewProviderFemPostPipeline class - - - - Scales values of given result mesh field by given factor - - - - - Update coloring of pipeline and its childs - - - - diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt index 823aae31da..10baab56f6 100644 --- a/src/Mod/Import/App/CMakeLists.txt +++ b/src/Mod/Import/App/CMakeLists.txt @@ -29,7 +29,7 @@ SET(Import_SRCS ReaderIges.h ReaderStep.cpp ReaderStep.h - StepShapePy.xml + StepShape.pyi StepShape.h StepShape.cpp StepShapePyImp.cpp @@ -76,8 +76,7 @@ SET(SCL_Resources ) SOURCE_GROUP("SCL" FILES ${SCL_Resources}) -generate_from_xml(StepShapePy) -generate_from_py_(StepShapePy) +generate_from_py(StepShape) add_library(Import SHARED ${Import_SRCS}) target_link_libraries(Import ${Import_LIBS}) diff --git a/src/Mod/Import/App/StepShapePy.pyi b/src/Mod/Import/App/StepShape.pyi similarity index 70% rename from src/Mod/Import/App/StepShapePy.pyi rename to src/Mod/Import/App/StepShape.pyi index 5a0b319c94..d72609d138 100644 --- a/src/Mod/Import/App/StepShapePy.pyi +++ b/src/Mod/Import/App/StepShape.pyi @@ -4,21 +4,18 @@ from Base.Metadata import export from Base.PyObjectBase import PyObjectBase @export( - Father="PyObjectBase", - Name="StepShapePy", - Twin="StepShape", - TwinPointer="StepShape", Include="Mod/Import/App/StepShape.h", Namespace="Import", - FatherInclude="Base/PyObjectBase.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class StepShapePy(PyObjectBase): +class StepShape(PyObjectBase): """ StepShape in Import This class gives a interface to retrieve TopoShapes out of an loaded STEP file of any kind. + + Author: Juergen Riegel (Juergen.Riegel@web.de) + License: LGPL-2.1-or-later """ def read(self) -> Any: diff --git a/src/Mod/Import/App/StepShapePy.xml b/src/Mod/Import/App/StepShapePy.xml deleted file mode 100644 index 9605bc1e52..0000000000 --- a/src/Mod/Import/App/StepShapePy.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - StepShape in a Import - StepShape in Import -This class gives a interface to retrieve TopoShapes out of an loaded STEP file of any kind. - - - - - method read() -Read a STEP file into memory and make it accessible - - - - - - diff --git a/src/Mod/Measure/App/CMakeLists.txt b/src/Mod/Measure/App/CMakeLists.txt index c10dfd202a..75f30bbe6c 100644 --- a/src/Mod/Measure/App/CMakeLists.txt +++ b/src/Mod/Measure/App/CMakeLists.txt @@ -10,16 +10,13 @@ set(Measure_LIBS FreeCADApp ) -generate_from_xml(MeasurementPy) -generate_from_xml(MeasureBasePy) - -generate_from_py_(MeasurementPy) -generate_from_py_(MeasureBasePy) +generate_from_py(Measurement) +generate_from_py(MeasureBase) SET(Python_SRCS - MeasurementPy.xml + Measurement.pyi MeasurementPyImp.cpp - MeasureBasePy.xml + MeasureBase.pyi MeasureBasePyImp.cpp ) SOURCE_GROUP("Python" FILES ${Python_SRCS}) diff --git a/src/Mod/Measure/App/MeasureBasePy.pyi b/src/Mod/Measure/App/MeasureBase.pyi similarity index 50% rename from src/Mod/Measure/App/MeasureBasePy.pyi rename to src/Mod/Measure/App/MeasureBase.pyi index 6337c2b977..24d6c6f527 100644 --- a/src/Mod/Measure/App/MeasureBasePy.pyi +++ b/src/Mod/Measure/App/MeasureBase.pyi @@ -3,17 +3,14 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="MeasureBasePy", - Twin="MeasureBase", - TwinPointer="MeasureBase", Include="Mod/Measure/App/MeasureBase.h", Namespace="Measure", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", Constructor=True, ) -class MeasureBasePy(DocumentObject): +class MeasureBase(DocumentObject): """ User documentation here + + Author: David Friedli(hlorus) (david@friedli-be.ch) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/Measure/App/MeasureBasePy.xml b/src/Mod/Measure/App/MeasureBasePy.xml deleted file mode 100644 index c56bf805d1..0000000000 --- a/src/Mod/Measure/App/MeasureBasePy.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - User documentation here - - Developer documentation here - - - diff --git a/src/Mod/Measure/App/MeasurementPy.pyi b/src/Mod/Measure/App/Measurement.pyi similarity index 88% rename from src/Mod/Measure/App/MeasurementPy.pyi rename to src/Mod/Measure/App/Measurement.pyi index 5aee411fff..8034ebffb7 100644 --- a/src/Mod/Measure/App/MeasurementPy.pyi +++ b/src/Mod/Measure/App/Measurement.pyi @@ -4,19 +4,16 @@ from Base.BaseClass import BaseClass from Base.Metadata import export @export( - Father="BaseClassPy", - Name="MeasurementPy", - Twin="Measurement", - TwinPointer="Measurement", Include="Mod/Measure/App/Measurement.h", Namespace="Measure", - FatherInclude="Base/BaseClassPy.h", - FatherNamespace="Base", Constructor=True, ) -class MeasurementPy(BaseClass): +class Measurement(BaseClass): """ Make a measurement + + Author: Luke Parry (l.parry@warwick.ac.uk) + License: LGPL-2.1-or-later """ def addReference3D(self) -> Any: diff --git a/src/Mod/Measure/App/MeasurementPy.xml b/src/Mod/Measure/App/MeasurementPy.xml deleted file mode 100644 index d6a994409d..0000000000 --- a/src/Mod/Measure/App/MeasurementPy.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - Make a measurement - - - - add a geometric reference - - - - - does Measurement have links to 3D geometry - - - - - measure the difference between references to obtain resultant vector - - - - - measure the difference between references to obtain resultant vector - - - - - measure the length of the references - - - - - measure the volume of the references - - - - - measure the area of the references - - - - - measure the line-Line Distance of the references. Returns 0 if references are not 2 lines. - - - - - measure the plane-plane distance of the references. Returns 0 if references are not 2 planes. - - - - - measure the angle between two edges - - - - - measure the radius of an arc or circle edge - - - - - measure the center of mass for selected volumes - - - - diff --git a/src/Mod/Measure/Gui/CMakeLists.txt b/src/Mod/Measure/Gui/CMakeLists.txt index 3650f0cb7b..594a2a1c73 100644 --- a/src/Mod/Measure/Gui/CMakeLists.txt +++ b/src/Mod/Measure/Gui/CMakeLists.txt @@ -28,8 +28,7 @@ SET(MeasureGui_UIC_SRCS DlgPrefsMeasureAppearanceImp.ui ) -generate_from_xml(QuickMeasurePy) -generate_from_py_(QuickMeasurePy) +generate_from_py(QuickMeasure) SET(MeasureGui_SRCS ${CMAKE_SOURCE_DIR}/src/Mod/Measure/InitGui.py @@ -39,7 +38,7 @@ SET(MeasureGui_SRCS Resources/Measure.qrc PreCompiled.cpp PreCompiled.h - QuickMeasurePy.xml + QuickMeasure.pyi QuickMeasurePyImp.cpp QuickMeasure.cpp QuickMeasure.h diff --git a/src/Mod/Measure/Gui/QuickMeasurePy.pyi b/src/Mod/Measure/Gui/QuickMeasure.pyi similarity index 55% rename from src/Mod/Measure/Gui/QuickMeasurePy.pyi rename to src/Mod/Measure/Gui/QuickMeasure.pyi index d87878eaf8..d265bbea34 100644 --- a/src/Mod/Measure/Gui/QuickMeasurePy.pyi +++ b/src/Mod/Measure/Gui/QuickMeasure.pyi @@ -2,18 +2,15 @@ from Base.Metadata import export from Base.PyObjectBase import PyObjectBase @export( - Father="PyObjectBase", - Name="QuickMeasurePy", - Twin="QuickMeasure", - TwinPointer="QuickMeasure", Include="Mod/Measure/Gui/QuickMeasure.h", Namespace="MeasureGui", - FatherInclude="Base/PyObjectBase.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class QuickMeasurePy(PyObjectBase): +class QuickMeasure(PyObjectBase): """ Selection Observer for the QuickMeasure label. + + Author: Ondsel (development@ondsel.com) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/Measure/Gui/QuickMeasurePy.xml b/src/Mod/Measure/Gui/QuickMeasurePy.xml deleted file mode 100644 index 24a1f70d15..0000000000 --- a/src/Mod/Measure/Gui/QuickMeasurePy.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - Selection Observer for the QuickMeasure label. - - - diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt index 96ece0f970..99b4479ff3 100644 --- a/src/Mod/Mesh/App/CMakeLists.txt +++ b/src/Mod/Mesh/App/CMakeLists.txt @@ -30,24 +30,18 @@ list(APPEND Mesh_LIBS ${QtConcurrent_LIBRARIES} ) -generate_from_xml(EdgePy) -generate_from_xml(FacetPy) -generate_from_xml(MeshFeaturePy) -generate_from_xml(MeshPointPy) -generate_from_xml(MeshPy) - -generate_from_py_(EdgePy) -generate_from_py_(FacetPy) -generate_from_py_(MeshFeaturePy) -generate_from_py_(MeshPointPy) -generate_from_py_(MeshPy) +generate_from_py(Edge) +generate_from_py(Facet) +generate_from_py(MeshFeature) +generate_from_py(MeshPoint) +generate_from_py(Mesh) SET(Mesh_XML_SRCS - EdgePy.xml - FacetPy.xml - MeshFeaturePy.xml - MeshPointPy.xml - MeshPy.xml + Edge.pyi + Facet.pyi + MeshFeature.pyi + MeshPoint.pyi + Mesh.pyi ) SOURCE_GROUP("XML" FILES ${Mesh_XML_SRCS}) diff --git a/src/Mod/Mesh/App/EdgePy.pyi b/src/Mod/Mesh/App/Edge.pyi similarity index 89% rename from src/Mod/Mesh/App/EdgePy.pyi rename to src/Mod/Mesh/App/Edge.pyi index f2dc9872de..548234e5c8 100644 --- a/src/Mod/Mesh/App/EdgePy.pyi +++ b/src/Mod/Mesh/App/Edge.pyi @@ -4,22 +4,19 @@ from Base.Metadata import export from Base.PyObjectBase import PyObjectBase @export( - Father="PyObjectBase", - Name="EdgePy", - Twin="Edge", - TwinPointer="Edge", Include="Mod/Mesh/App/Edge.h", Namespace="Mesh", - FatherInclude="Base/PyObjectBase.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class EdgePy(PyObjectBase): +class Edge(PyObjectBase): """ Edge in mesh This is an edge of a facet in a MeshObject. You can get it by e.g. iterating over the facets of a mesh and calling getEdge(index). + + Author: Werner Mayer (wmayer[at]users.sourceforge.net) + License: LGPL-2.1-or-later """ def intersectWithEdge(self) -> Any: diff --git a/src/Mod/Mesh/App/EdgePy.xml b/src/Mod/Mesh/App/EdgePy.xml deleted file mode 100644 index 4416925a1d..0000000000 --- a/src/Mod/Mesh/App/EdgePy.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - Edge in a Mesh - Edge in mesh -This is an edge of a facet in a MeshObject. You can get it by e.g. iterating over the facets of a -mesh and calling getEdge(index). - - - - - intersectWithEdge(Edge) -> list -Get a list of intersection points with another edge. - - - - - - isParallel(Edge) -> bool -Checks if the two edges are parallel. - - - - - - isCollinear(Edge) -> bool -Checks if the two edges are collinear. - - - - - - method unbound() -Cut the connection to a MeshObject. The edge becomes -free and is more or less a simple edge. -After calling unbound() no topological operation will -work! - - - - - - The index of this edge of the facet - - - - - - A list of points of the edge - - - - - - The index tuple of point vertices of the mesh this edge is built of - - - - - - The index tuple of neighbour facets of the mesh this edge is adjacent with - - - - - - The length of the edge - - - - - - Bound state of the edge - - - - - diff --git a/src/Mod/Mesh/App/FacetPy.pyi b/src/Mod/Mesh/App/Facet.pyi similarity index 93% rename from src/Mod/Mesh/App/FacetPy.pyi rename to src/Mod/Mesh/App/Facet.pyi index 3768508193..01eab62741 100644 --- a/src/Mod/Mesh/App/FacetPy.pyi +++ b/src/Mod/Mesh/App/Facet.pyi @@ -4,18 +4,12 @@ from Base.Metadata import export from Base.PyObjectBase import PyObjectBase @export( - Father="PyObjectBase", - Name="FacetPy", - Twin="Facet", - TwinPointer="Facet", Include="Mod/Mesh/App/Facet.h", Namespace="Mesh", - FatherInclude="Base/PyObjectBase.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class FacetPy(PyObjectBase): +class Facet(PyObjectBase): """ Facet in mesh This is a facet in a MeshObject. You can get it by e.g. iterating a @@ -23,6 +17,9 @@ class FacetPy(PyObjectBase): topological operations. It is also possible to create an unbounded facet e.g. to create a mesh. In this case the topological operations will fail. The same is when you cut the bound to the mesh by calling unbound(). + + Author: Juergen Riegel (Juergen.Riegel@web.de) + License: LGPL-2.1-or-later """ def unbound(self) -> Any: diff --git a/src/Mod/Mesh/App/FacetPy.xml b/src/Mod/Mesh/App/FacetPy.xml deleted file mode 100644 index dcf12f12bd..0000000000 --- a/src/Mod/Mesh/App/FacetPy.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - Facet in a Mesh - Facet in mesh -This is a facet in a MeshObject. You can get it by e.g. iterating a -mesh. The facet has a connection to its mesh and allows therefore -topological operations. It is also possible to create an unbounded facet e.g. to create -a mesh. In this case the topological operations will fail. The same is -when you cut the bound to the mesh by calling unbound(). - - - - - method unbound() -Cut the connection to a MeshObject. The facet becomes -free and is more or less a simple facet. -After calling unbound() no topological operation will -work! - - - - - - intersect(Facet) -> list -Get a list of intersection points with another triangle. - - - - - - isDegenerated([float]) -> boolean -Returns true if the facet is degenerated, otherwise false. - - - - - - isDegenerated(MinAngle, MaxAngle) -> boolean -Returns true if the facet is deformed, otherwise false. -A triangle is considered deformed if an angle is less than MinAngle -or higher than MaxAngle. -The two angles are given in radian. - - - - - - getEdge(int) -> Edge -Returns the edge of the facet. - - - - - - The index of this facet in the MeshObject - - - - - - Bound state of the facet - - - - - - Normal vector of the facet. - - - - - - A list of points of the facet - - - - - - The index tuple of point vertices of the mesh this facet is built of - - - - - - The index tuple of neighbour facets of the mesh this facet is adjacent with - - - - - - The area of the facet - - - - - - The aspect ratio of the facet computed by longest edge and its height - - - - - - The aspect ratio of the facet computed by radius of circum-circle and in-circle - - - - - - The roundness of the facet - - - - - - The center and radius of the circum-circle - - - - - - The center and radius of the in-circle - - - - - diff --git a/src/Mod/Mesh/App/MeshPy.pyi b/src/Mod/Mesh/App/Mesh.pyi similarity index 98% rename from src/Mod/Mesh/App/MeshPy.pyi rename to src/Mod/Mesh/App/Mesh.pyi index fe925667b6..7a6b65cf4e 100644 --- a/src/Mod/Mesh/App/MeshPy.pyi +++ b/src/Mod/Mesh/App/Mesh.pyi @@ -5,8 +5,6 @@ from Base.Metadata import constmethod, export from App.ComplexGeoData import ComplexGeoData @export( - Father="ComplexGeoDataPy", - Name="MeshPy", Twin="MeshObject", TwinPointer="MeshObject", Include="Mod/Mesh/App/Mesh.h", @@ -21,8 +19,9 @@ from App.ComplexGeoData import ComplexGeoData friend class PropertyMeshKernel; class PropertyMeshKernel* parentProperty = nullptr;""" ) -class MeshPy(ComplexGeoData): - """Mesh() -- Create an empty mesh object. +class Mesh(ComplexGeoData): + """ + Mesh() -- Create an empty mesh object. This class allows one to manipulate the mesh object by adding new facets, deleting facets, importing from an STL file, transforming the mesh and much more. @@ -36,6 +35,9 @@ class MeshPy(ComplexGeoData): f = d.addObject("Mesh::Feature", "Mesh") # Create a mesh feature f.Mesh = m # Assign the mesh object to the internal property d.recompute() + + Author: Juergen Riegel (Juergen.Riegel@web.de) + License: LGPL-2.1-or-later """ def read(self, **kwargs) -> Any: diff --git a/src/Mod/Mesh/App/MeshFeaturePy.pyi b/src/Mod/Mesh/App/MeshFeature.pyi similarity index 95% rename from src/Mod/Mesh/App/MeshFeaturePy.pyi rename to src/Mod/Mesh/App/MeshFeature.pyi index 13237b3284..6f795a5230 100644 --- a/src/Mod/Mesh/App/MeshFeaturePy.pyi +++ b/src/Mod/Mesh/App/MeshFeature.pyi @@ -5,21 +5,21 @@ from Base.Metadata import export from App.GeoFeature import GeoFeature @export( - Father="GeoFeaturePy", - Name="MeshFeaturePy", Twin="Feature", TwinPointer="Feature", Include="Mod/Mesh/App/MeshFeature.h", Namespace="Mesh", FatherInclude="App/GeoFeaturePy.h", - FatherNamespace="App", ) -class MeshFeaturePy(GeoFeature): +class MeshFeature(GeoFeature): """ The Mesh::Feature class handles meshes. The Mesh.MeshFeature() function is for internal use only and cannot be used to create instances of this class. Therefore you must have a reference to a document, e.g. 'd' then you can create an instance with d.addObject("Mesh::Feature"). + + Author: Werner Mayer (wmayer@users.sourceforge.net) + License: LGPL-2.1-or-later """ def countPoints(self) -> Any: diff --git a/src/Mod/Mesh/App/MeshFeaturePy.xml b/src/Mod/Mesh/App/MeshFeaturePy.xml deleted file mode 100644 index 3049d4296e..0000000000 --- a/src/Mod/Mesh/App/MeshFeaturePy.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - The Mesh::Feature class handles meshes. -The Mesh.MeshFeature() function is for internal use only and cannot be used to create instances of this class. -Therefore you must have a reference to a document, e.g. 'd' then you can create an instance with -d.addObject("Mesh::Feature"). - - - - - Return the number of vertices of the mesh object - - - - - Return the number of facets of the mesh object - - - - - Adjust wrong oriented facets - - - - - Smooth the mesh data - - - - - -Decimate the mesh -decimate(tolerance(Float), reduction(Float)) -tolerance: maximum error -reduction: reduction factor must be in the range [0.0,1.0] -Example: -mesh.decimate(0.5, 0.1) # reduction by up to 10 percent -mesh.decimate(0.5, 0.9) # reduction by up to 90 percent - -or - -decimate(targwt size(int)) -mesh.decimate(mesh.CountFacets/2) - - - - - - Remove non-manifolds - - - - - Remove non-manifold points - - - - - Repair any invalid indices - - - - - Remove degenerated facets - - - - - Remove duplicated facets - - - - - Remove duplicated points - - - - - Repair self-intersections - - - - - Remove folds on surfaces - - - - - Remove points with invalid coordinates (NaN) - - - - diff --git a/src/Mod/Mesh/App/MeshPointPy.pyi b/src/Mod/Mesh/App/MeshPoint.pyi similarity index 86% rename from src/Mod/Mesh/App/MeshPointPy.pyi rename to src/Mod/Mesh/App/MeshPoint.pyi index 90df79a66d..eed777ebd0 100644 --- a/src/Mod/Mesh/App/MeshPointPy.pyi +++ b/src/Mod/Mesh/App/MeshPoint.pyi @@ -4,18 +4,12 @@ from Base.Metadata import export from Base.PyObjectBase import PyObjectBase @export( - Father="PyObjectBase", - Name="MeshPointPy", - Twin="MeshPoint", - TwinPointer="MeshPoint", Include="Mod/Mesh/App/MeshPoint.h", Namespace="Mesh", - FatherInclude="Base/PyObjectBase.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class MeshPointPy(PyObjectBase): +class MeshPoint(PyObjectBase): """ Point in mesh This is a point in a MeshObject. You can get it by e.g. iterating a @@ -23,6 +17,9 @@ class MeshPointPy(PyObjectBase): topological operations. It is also possible to create an unbounded mesh point e.g. to create a mesh. In this case the topological operations will fail. The same is when you cut the bound to the mesh by calling unbound(). + + Author: Juergen Riegel (FreeCAD@juergen-riegel.net) + License: LGPL-2.1-or-later """ def unbound(self) -> Any: diff --git a/src/Mod/Mesh/App/MeshPointPy.xml b/src/Mod/Mesh/App/MeshPointPy.xml deleted file mode 100644 index a701386272..0000000000 --- a/src/Mod/Mesh/App/MeshPointPy.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - Point in a Mesh - Point in mesh -This is a point in a MeshObject. You can get it by e.g. iterating a -mesh. The point has a connection to its mesh and allows therefore -topological operations. It is also possible to create an unbounded mesh point e.g. to create -a mesh. In this case the topological operations will fail. The same is -when you cut the bound to the mesh by calling unbound(). - - - - - method unbound() -Cut the connection to a MeshObject. The point becomes -free and is more or less a simple vector/point. -After calling unbound() no topological operation will -work! - - - - - - The index of this point in the MeshObject - - - - - - Bound state of the point - - - - - - Normal vector of the point computed by the surrounding mesh. - - - - - - Vector of the point. - - - - - - The X component of the point. - - - - - - The Y component of the point. - - - - - - The Z component of the point. - - - - - diff --git a/src/Mod/Mesh/App/MeshPy.xml b/src/Mod/Mesh/App/MeshPy.xml deleted file mode 100644 index d68f43574f..0000000000 --- a/src/Mod/Mesh/App/MeshPy.xml +++ /dev/null @@ -1,621 +0,0 @@ - - - - - - Mesh() -- Create an empty mesh object. - -This class allows one to manipulate the mesh object by adding new facets, deleting facets, importing from an STL file, -transforming the mesh and much more. -For a complete overview of what can be done see also the documentation of mesh. -A mesh object cannot be added to an existing document directly. Therefore the document must create an object -with a property class that supports meshes. -Example: -m = Mesh.Mesh() -... # Manipulate the mesh -d = FreeCAD.activeDocument() # Get a reference to the actie document -f = d.addObject("Mesh::Feature", "Mesh") # Create a mesh feature -f.Mesh = m # Assign the mesh object to the internal property -d.recompute() - - - - Read in a mesh object from file. -mesh.read(Filename='mymesh.stl') -mesh.read(Stream=file,Format='STL') - - - - - Write the mesh object into file. -mesh.write(Filename='mymesh.stl',[Format='STL',Name='Object name',Material=colors]) -mesh.write(Stream=file,Format='STL',[Name='Object name',Material=colors]) - - - - - Write the mesh in OpenInventor format to a string. - - - - - Create a copy of this mesh - - - - - Move the point along their normals - - - - - Move the point along their normals - - - - - Get cross-sections of the mesh through several planes - - - - - Union of this and the given mesh object. - - - - - Intersection of this and the given mesh object. - - - - - Difference of this and the given mesh object. - - - - - Get the part inside of the intersection - - - - - Get the part outside the intersection - - - - - Get the section curves of this and the given mesh object. -lines = mesh.section(mesh2, [ConnectLines=True, MinDist=0.0001]) - - - - - - Apply a translation to the mesh - - - - - Apply a rotation to the mesh - - - - - Apply a transformation to the mesh - - - - - Transform the mesh to its eigenbase - - - - - Get Eigen base of the mesh - - - - - Add a facet to the mesh - - - - - Add a list of facets to the mesh - - - - - Remove a list of facet indices from the mesh - - - - - Remove all edges that are smaller than a given length - - - - - Remove facets whose all three points are on the boundary - - - - - Builds a list of facet indices with triangles that are inside a volume mesh - - - - - Repairs the neighbourhood which might be broken - - - - - Combine this mesh with another mesh. - - - - - -setPoint(int, Vector) -Sets the point at index. - - - - - - -movePoint(int, Vector) -This method moves the point in the mesh along the -given vector. This affects the geometry of the mesh. -Be aware that moving points may cause self-intersections. - - - - - - -getPointNormals() -Get the normals of the points. - - - - - - Add a list of facet indices that describes a segment to the mesh - - - - - Get the number of segments which may also be 0 - - - - - Get a list of facet indices that describes a segment - - - - - -Returns a list containing the different -components (separated areas) of the mesh as separate meshes - -import Mesh -for c in mesh.getSeparatecomponents(): -Mesh.show(c) - - - - - - - Get a list of the indices of selected facets - - - - - Get a list of the indices of selected points - - - - - Create a mesh from segment - - - - - Clear the mesh - - - - - Check if the mesh is a solid - - - - - Check if the mesh has non-manifolds - - - - - Remove non-manifolds - - - - - Remove non-manifold points - - - - - Check if the mesh intersects itself - - - - - Returns a tuple of indices of intersecting triangles - - - - - Repair self-intersections - - - - - Remove folds on surfaces - - - - - Check if the mesh has facets with inconsistent orientation - - - - - Get the number of wrong oriented facets - - - - - Get a tuple of wrong oriented facets - - - - - Check if the mesh has points with invalid coordinates (NaN) - - - - - Remove points with invalid coordinates (NaN) - - - - - Check if points lie on edges - - - - - removePointsOnEdge(FillBoundary=False) -Remove points that lie on edges. -If FillBoundary is True then the holes by removing the affected facets -will be re-filled. - - - - - Check if the mesh has invalid neighbourhood indices - - - - - Check if the mesh has point indices that are out of range - - - - - Check if the mesh has facet indices that are out of range - - - - - Check if the mesh has corrupted facets - - - - - Get the number of topologic independent areas - - - - - Remove components with less or equal to number of given facets - - - - - Repair any invalid indices - - - - - Repair caps by swapping the edge - - - - - Repair deformed facets - - - - - Remove degenerated facets - - - - - Remove duplicated points - - - - - Remove duplicated facets - - - - - Refine the mesh - - - - - Split all edges - - - - - Split edge - - - - - Split facet - - - - - Swap the common edge with the neighbour - - - - - Remove an edge and both facets that share this edge - - - - - Remove a facet - - - - - Remove a list of facets - - - - - Insert a vertex into a facet - - - - - Insert a new facet at the border - - - - - Get detailed information about the mesh - - - - - Get a list of facet indices and intersection points - - - - - Cuts the mesh with a given closed polygon -cut(list, int) -> None -The argument list is an array of points, a polygon -The argument int is the mode: 0=inner, 1=outer - - - - - - Trims the mesh with a given closed polygon -trim(list, int) -> None -The argument list is an array of points, a polygon -The argument int is the mode: 0=inner, 1=outer - - - - - - Trims the mesh with a given plane -trimByPlane(Vector, Vector) -> None -The plane is defined by a base and normal vector. Depending on the -direction of the normal the part above or below will be kept. - - - - - - - Adjust wrong oriented facets - - - - - Flip the mesh normals - - - - - Fillup holes - - - - - Smooth the mesh -smooth([iteration=1,maxError=FLT_MAX]) - - - - - -Decimate the mesh -decimate(tolerance(Float), reduction(Float)) -tolerance: maximum error -reduction: reduction factor must be in the range [0.0,1.0] -Example: -mesh.decimate(0.5, 0.1) # reduction by up to 10 percent -mesh.decimate(0.5, 0.9) # reduction by up to 90 percent - - - - - - Merge facets to optimize topology - - - - - Optimize the edges to get nicer facets - - - - - Optimize the edges to get nicer facets - - - - - - nearestFacetOnRay(tuple, tuple) -> dict -Get the index and intersection point of the nearest facet to a ray. -The first parameter is a tuple of three floats the base point of the ray, -the second parameter is ut uple of three floats for the direction. -The result is a dictionary with an index and the intersection point or -an empty dictionary if there is no intersection. - - - - - - getPlanarSegments(dev,[min faces=0]) -> list -Get all planes of the mesh as segment. -In the worst case each triangle can be regarded as single -plane if none of its neighbours is coplanar. - - - - - getSegmentsOfType(type, dev,[min faces=0]) -> list -Get all segments of type. -Type can be Plane, Cylinder or Sphere - - - - - getSegmentsByCurvature(list) -> list -The argument list gives a list if tuples where it defines the preferred maximum curvature, -the preferred minimum curvature, the tolerances and the number of minimum faces for the segment. -Example: -c=(1.0, 0.0, 0.1, 0.1, 500) # search for a cylinder with radius 1.0 -p=(0.0, 0.0, 0.1, 0.1, 500) # search for a plane -mesh.getSegmentsByCurvature([c,p]) - - - - - - -getCurvaturePerVertex() -> list -The items in the list contains minimum and maximum curvature with their directions - - - - - - A collection of the mesh points -With this attribute it is possible to get access to the points of the mesh -for p in mesh.Points: - print p.x, p.y, p.z - - - - - - Return the number of vertices of the mesh object. - - - - - - Return the number of edges of the mesh object. - - - - - - A collection of facets -With this attribute it is possible to get access to the facets of the mesh -for p in mesh.Facets: - print p - - - - - - Return the number of facets of the mesh object. - - - - - - Return the points and face indices as tuple. - - - - - - Return the area of the mesh object. - - - - - - Return the volume of the mesh object. - - - - - private: - friend class PropertyMeshKernel; - class PropertyMeshKernel* parentProperty = nullptr; - - diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 4bda63c12a..2f6e3aab83 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/src/Mod/Mesh/Gui/CMakeLists.txt @@ -15,11 +15,10 @@ set(MeshGui_LIBS FreeCADGui ) -generate_from_xml(ViewProviderMeshPy) -generate_from_py_(ViewProviderMeshPy) +generate_from_py(ViewProviderMesh) SET(MeshGui_XML_SRCS - ViewProviderMeshPy.xml + ViewProviderMesh.pyi ) SOURCE_GROUP("XML" FILES ${MeshGui_XML_SRCS}) diff --git a/src/Mod/Mesh/Gui/ViewProviderMeshPy.pyi b/src/Mod/Mesh/Gui/ViewProviderMesh.pyi similarity index 77% rename from src/Mod/Mesh/Gui/ViewProviderMeshPy.pyi rename to src/Mod/Mesh/Gui/ViewProviderMesh.pyi index f5fa59bc01..2120989a25 100644 --- a/src/Mod/Mesh/Gui/ViewProviderMeshPy.pyi +++ b/src/Mod/Mesh/Gui/ViewProviderMesh.pyi @@ -3,18 +3,15 @@ from Gui.ViewProviderGeometryObject import ViewProviderGeometryObject from Base.Metadata import export @export( - Father="ViewProviderGeometryObjectPy", - Name="ViewProviderMeshPy", - Twin="ViewProviderMesh", - TwinPointer="ViewProviderMesh", Include="Mod/Mesh/Gui/ViewProvider.h", Namespace="MeshGui", - FatherInclude="Gui/ViewProviderGeometryObjectPy.h", - FatherNamespace="Gui", ) -class ViewProviderMeshPy(ViewProviderGeometryObject): +class ViewProviderMesh(ViewProviderGeometryObject): """ This is the ViewProvider base class + + Author: Werner Mayer (wmayer@users.sourceforge.net) + License: LGPL-2.1-or-later """ def setSelection(self) -> Any: diff --git a/src/Mod/Mesh/Gui/ViewProviderMeshPy.xml b/src/Mod/Mesh/Gui/ViewProviderMeshPy.xml deleted file mode 100644 index aee4a45e9c..0000000000 --- a/src/Mod/Mesh/Gui/ViewProviderMeshPy.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - This is the ViewProvider base class - - - - Select list of facets - - - - - Add list of facets to selection - - - - - Remove list of facets from selection - - - - - Invert the selection - - - - - Clear the selection - - - - - Highlights the segments of a mesh with a given list of colors. -The number of elements of this list must be equal to the number of mesh segments. - - - - - diff --git a/src/Mod/Points/App/CMakeLists.txt b/src/Mod/Points/App/CMakeLists.txt index 8b9f59e2b8..2dccb8d184 100644 --- a/src/Mod/Points/App/CMakeLists.txt +++ b/src/Mod/Points/App/CMakeLists.txt @@ -38,15 +38,14 @@ list(APPEND Points_LIBS ${QtConcurrent_LIBRARIES} ) -generate_from_xml(PointsPy) -generate_from_py_(PointsPy) +generate_from_py(Points) SET(Points_SRCS AppPoints.cpp AppPointsPy.cpp Points.cpp Points.h - PointsPy.xml + Points.pyi PointsPyImp.cpp PointsAlgos.cpp PointsAlgos.h diff --git a/src/Mod/Points/App/PointsPy.pyi b/src/Mod/Points/App/Points.pyi similarity index 94% rename from src/Mod/Points/App/PointsPy.pyi rename to src/Mod/Points/App/Points.pyi index fa30353feb..f84dabb13e 100644 --- a/src/Mod/Points/App/PointsPy.pyi +++ b/src/Mod/Points/App/Points.pyi @@ -5,7 +5,6 @@ from Data import object @export( Father="ComplexGeoDataPy", - Name="PointsPy", Twin="PointKernel", TwinPointer="PointKernel", Include="Mod/Points/App/Points.h", @@ -14,12 +13,15 @@ from Data import object FatherNamespace="Data", Constructor=True, ) -class PointsPy(object): +class Points(object): """ Points() -- Create an empty points object. This class allows one to manipulate the Points object by adding new points, deleting facets, importing from an STL file, transforming and much more. + + Author: Juergen Riegel (Juergen.Riegel@web.de) + License: LGPL-2.1-or-later """ @constmethod diff --git a/src/Mod/Points/App/PointsPy.xml b/src/Mod/Points/App/PointsPy.xml deleted file mode 100644 index 0ab784731d..0000000000 --- a/src/Mod/Points/App/PointsPy.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Points() -- Create an empty points object. - -This class allows one to manipulate the Points object by adding new points, deleting facets, importing from an STL file, -transforming and much more. - - - - - - Create a copy of this points object - - - - - Read in a points object from file. - - - - - Write the points object into file. - - - - - Write the points in OpenInventor format to a string. - - - - - add one or more (list of) points to the object - - - - - Get a new point object from a given segment - - - - - Get a new point object from points with valid coordinates (i.e. that are not NaN) - - - - - Return the number of vertices of the points object. - - - - - - A collection of points -With this attribute it is possible to get access to the points of the object - -for p in pnt.Points: - print p - - - - - - diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index c55547411e..729c9a7201 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -20,26 +20,21 @@ set(Robot_LIBS FreeCADApp ) -generate_from_xml(Robot6AxisPy) -generate_from_xml(TrajectoryPy) -generate_from_xml(WaypointPy) -generate_from_xml(RobotObjectPy) - -generate_from_py_(Robot6AxisPy) -generate_from_py_(TrajectoryPy) -generate_from_py_(WaypointPy) -generate_from_py_(RobotObjectPy) +generate_from_py(Robot6Axis) +generate_from_py(Trajectory) +generate_from_py(Waypoint) +generate_from_py(RobotObject) SET(Python_SRCS - Robot6AxisPy.xml + Robot6Axis.pyi Robot6AxisPyImp.cpp - TrajectoryPy.xml + Trajectory.pyi TrajectoryPyImp.cpp - RobotObjectPy.xml + RobotObject.pyi RobotObjectPyImp.cpp - WaypointPy.xml + Waypoint.pyi WaypointPyImp.cpp ) diff --git a/src/Mod/Robot/App/Robot6AxisPy.pyi b/src/Mod/Robot/App/Robot6Axis.pyi similarity index 81% rename from src/Mod/Robot/App/Robot6AxisPy.pyi rename to src/Mod/Robot/App/Robot6Axis.pyi index 55817cab9f..267c1bc606 100644 --- a/src/Mod/Robot/App/Robot6AxisPy.pyi +++ b/src/Mod/Robot/App/Robot6Axis.pyi @@ -4,20 +4,17 @@ from Base.Metadata import export from Base.Persistence import Persistence @export( - Father="PersistencePy", - Name="Robot6AxisPy", - Twin="Robot6Axis", - TwinPointer="Robot6Axis", Include="Mod/Robot/App/Robot6Axis.h", Namespace="Robot", - FatherInclude="Base/PersistencePy.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class Robot6AxisPy(Persistence): +class Robot6Axis(Persistence): """ Robot6Axis class + + Author: Juergen Riegel (Juergen.Riegel@web.de) + License: LGPL-2.1-or-later """ def check(self) -> Any: diff --git a/src/Mod/Robot/App/Robot6AxisPy.xml b/src/Mod/Robot/App/Robot6AxisPy.xml deleted file mode 100644 index fba8feebf0..0000000000 --- a/src/Mod/Robot/App/Robot6AxisPy.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - Robot6Axis class - - - - Checks the shape and report errors in the shape structure. -This is a more detailed check as done in isValid(). - - - - - Pose of Axis 1 in degrees - - - - - - Pose of Axis 2 in degrees - - - - - - Pose of Axis 3 in degrees - - - - - - Pose of Axis 4 in degrees - - - - - - Pose of Axis 5 in degrees - - - - - - Pose of Axis 6 in degrees - - - - - - Tool center point frame. Where the tool of the robot is - - - - - - Actual Base system in respect to the robot world system - - - - - diff --git a/src/Mod/Robot/App/RobotObjectPy.pyi b/src/Mod/Robot/App/RobotObject.pyi similarity index 64% rename from src/Mod/Robot/App/RobotObjectPy.pyi rename to src/Mod/Robot/App/RobotObject.pyi index 3cb536ff56..14b7b6729d 100644 --- a/src/Mod/Robot/App/RobotObjectPy.pyi +++ b/src/Mod/Robot/App/RobotObject.pyi @@ -5,18 +5,15 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="RobotObjectPy", - Twin="RobotObject", - TwinPointer="RobotObject", Include="Mod/Robot/App/RobotObject.h", Namespace="Robot", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", ) -class RobotObjectPy(DocumentObject): +class RobotObject(DocumentObject): """ Robot document object + + Author: Juergen Riegel (FreeCAD@juergen-riegel.net) + License: LGPL-2.1-or-later """ def getRobot(self) -> Any: diff --git a/src/Mod/Robot/App/RobotObjectPy.xml b/src/Mod/Robot/App/RobotObjectPy.xml deleted file mode 100644 index d964509698..0000000000 --- a/src/Mod/Robot/App/RobotObjectPy.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - Robot document object - - - - -Returns a copy of the robot. Be aware, the robot behaves the same -like the robot of the object but is a copy! - - - - - diff --git a/src/Mod/Robot/App/TrajectoryPy.pyi b/src/Mod/Robot/App/Trajectory.pyi similarity index 82% rename from src/Mod/Robot/App/TrajectoryPy.pyi rename to src/Mod/Robot/App/Trajectory.pyi index 12ed781157..5c3263398c 100644 --- a/src/Mod/Robot/App/TrajectoryPy.pyi +++ b/src/Mod/Robot/App/Trajectory.pyi @@ -4,20 +4,17 @@ from Base.Metadata import export from Base.Persistence import Persistence @export( - Father="PersistencePy", - Name="TrajectoryPy", - Twin="Trajectory", - TwinPointer="Trajectory", Include="Mod/Robot/App/Trajectory.h", Namespace="Robot", - FatherInclude="Base/PersistencePy.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class TrajectoryPy(Persistence): +class Trajectory(Persistence): """ Trajectory class + + Author: Juergen Riegel (Juergen.Riegel@web.de) + License: LGPL-2.1-or-later """ def insertWaypoints(self) -> Any: diff --git a/src/Mod/Robot/App/TrajectoryPy.xml b/src/Mod/Robot/App/TrajectoryPy.xml deleted file mode 100644 index 2b83e16f7b..0000000000 --- a/src/Mod/Robot/App/TrajectoryPy.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - Trajectory class - - - - - adds one or a list of waypoint to the end of the trajectory - - - - - - - returns a Frame to a given time in the trajectory - - - - - - - returns the velocity to a given time in the trajectory - - - - - - -deleteLast(n) - delete n waypoints at the end -deleteLast() - delete the last waypoint - - - - - - duration of the trajectory - - - - - - length of the trajectory - - - - - - waypoints of this trajectory - - - - - - diff --git a/src/Mod/Robot/App/WaypointPy.pyi b/src/Mod/Robot/App/Waypoint.pyi similarity index 80% rename from src/Mod/Robot/App/WaypointPy.pyi rename to src/Mod/Robot/App/Waypoint.pyi index 54984237f7..375e49c63f 100644 --- a/src/Mod/Robot/App/WaypointPy.pyi +++ b/src/Mod/Robot/App/Waypoint.pyi @@ -4,20 +4,17 @@ from Base.Metadata import export from Base.Persistence import Persistence @export( - Father="PersistencePy", - Name="WaypointPy", - Twin="Waypoint", - TwinPointer="Waypoint", Include="Mod/Robot/App/Waypoint.h", Namespace="Robot", - FatherInclude="Base/PersistencePy.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class WaypointPy(Persistence): +class Waypoint(Persistence): """ Waypoint class + + Author: Juergen Riegel (Juergen.Riegel@web.de) + License: LGPL-2.1-or-later """ Name: str diff --git a/src/Mod/Robot/App/WaypointPy.xml b/src/Mod/Robot/App/WaypointPy.xml deleted file mode 100644 index cf600b6950..0000000000 --- a/src/Mod/Robot/App/WaypointPy.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - Waypoint class - - - - Name of the waypoint - - - - - - Type of the waypoint[PTP|LIN|CIRC|WAIT] - - - - - - End position (destination) of the waypoint - - - - - - Control the continuity to the next waypoint in the trajectory - - - - - - Control the velocity to the next waypoint in the trajectory -In Case of PTP 0-100% Axis speed -In Case of LIN m/s -In Case of WAIT s wait time - - - - - - - Describe which tool frame to use for that point - - - - - - Describe which Base frame to use for that point - - - - - diff --git a/src/Mod/Spreadsheet/App/CMakeLists.txt b/src/Mod/Spreadsheet/App/CMakeLists.txt index f94f791a35..031d016b9d 100644 --- a/src/Mod/Spreadsheet/App/CMakeLists.txt +++ b/src/Mod/Spreadsheet/App/CMakeLists.txt @@ -19,19 +19,19 @@ set(Spreadsheet_SRCS PreCompiled.h PropertySheet.cpp PropertySheet.h - PropertySheetPy.xml + PropertySheet.pyi PropertySheetPyImp.cpp PropertyColumnWidths.cpp PropertyColumnWidths.h - PropertyColumnWidthsPy.xml + PropertyColumnWidths.pyi PropertyColumnWidthsPyImp.cpp PropertyRowHeights.cpp PropertyRowHeights.h - PropertyRowHeightsPy.xml + PropertyRowHeights.pyi PropertyRowHeightsPyImp.cpp Sheet.cpp Sheet.h - SheetPy.xml + Sheet.pyi SheetPyImp.cpp SheetObserver.cpp SheetObserver.h @@ -40,15 +40,10 @@ set(Spreadsheet_SRCS AppSpreadsheet.cpp ) -generate_from_xml(SheetPy) -generate_from_xml(PropertySheetPy) -generate_from_xml(PropertyColumnWidthsPy) -generate_from_xml(PropertyRowHeightsPy) - -generate_from_py_(SheetPy) -generate_from_py_(PropertySheetPy) -generate_from_py_(PropertyColumnWidthsPy) -generate_from_py_(PropertyRowHeightsPy) +generate_from_py(Sheet) +generate_from_py(PropertySheet) +generate_from_py(PropertyColumnWidths) +generate_from_py(PropertyRowHeights) if(FREECAD_USE_PCH) add_definitions(-D_PreComp_) diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.pyi b/src/Mod/Spreadsheet/App/PropertyColumnWidths.pyi new file mode 100644 index 0000000000..0bcb7c9cd0 --- /dev/null +++ b/src/Mod/Spreadsheet/App/PropertyColumnWidths.pyi @@ -0,0 +1,15 @@ +from Base.Metadata import export +from Base.Persistence import Persistence + +@export( + Include="Mod/Spreadsheet/App/PropertyColumnWidths.h", + Namespace="Spreadsheet", + Constructor=True, +) +class PropertyColumnWidths(Persistence): + """ + Internal spreadsheet object + + Author: Eivind Kvedalen (eivind@kvedalen.name) + License: LGPL-2.1-or-later + """ diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidthsPy.pyi b/src/Mod/Spreadsheet/App/PropertyColumnWidthsPy.pyi deleted file mode 100644 index 3882644be1..0000000000 --- a/src/Mod/Spreadsheet/App/PropertyColumnWidthsPy.pyi +++ /dev/null @@ -1,18 +0,0 @@ -from Base.Metadata import export -from Base.Persistence import Persistence - -@export( - Father="PersistencePy", - Name="PropertyColumnWidthsPy", - Twin="PropertyColumnWidths", - TwinPointer="PropertyColumnWidths", - Include="Mod/Spreadsheet/App/PropertyColumnWidths.h", - Namespace="Spreadsheet", - FatherInclude="Base/PersistencePy.h", - FatherNamespace="Base", - Constructor=True, -) -class PropertyColumnWidthsPy(Persistence): - """ - Internal spreadsheet object - """ diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidthsPy.xml b/src/Mod/Spreadsheet/App/PropertyColumnWidthsPy.xml deleted file mode 100644 index fb1fdce762..0000000000 --- a/src/Mod/Spreadsheet/App/PropertyColumnWidthsPy.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Internal spreadsheet object - - - diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeightsPy.pyi b/src/Mod/Spreadsheet/App/PropertyRowHeights.pyi similarity index 50% rename from src/Mod/Spreadsheet/App/PropertyRowHeightsPy.pyi rename to src/Mod/Spreadsheet/App/PropertyRowHeights.pyi index 663b76ea5c..6f27b86034 100644 --- a/src/Mod/Spreadsheet/App/PropertyRowHeightsPy.pyi +++ b/src/Mod/Spreadsheet/App/PropertyRowHeights.pyi @@ -2,17 +2,14 @@ from Base.Metadata import export from Base.Persistence import Persistence @export( - Father="PersistencePy", - Name="PropertyRowHeightsPy", - Twin="PropertyRowHeights", - TwinPointer="PropertyRowHeights", Include="Mod/Spreadsheet/App/PropertyRowHeights.h", Namespace="Spreadsheet", - FatherInclude="Base/PersistencePy.h", - FatherNamespace="Base", Constructor=True, ) -class PropertyRowHeightsPy(Persistence): +class PropertyRowHeights(Persistence): """ Internal spreadsheet object + + Author: Eivind Kvedalen (eivind@kvedalen.name) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeightsPy.xml b/src/Mod/Spreadsheet/App/PropertyRowHeightsPy.xml deleted file mode 100644 index 95b1c6e0ba..0000000000 --- a/src/Mod/Spreadsheet/App/PropertyRowHeightsPy.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Internal spreadsheet object - - - diff --git a/src/Mod/Spreadsheet/App/PropertySheetPy.pyi b/src/Mod/Spreadsheet/App/PropertySheet.pyi similarity index 57% rename from src/Mod/Spreadsheet/App/PropertySheetPy.pyi rename to src/Mod/Spreadsheet/App/PropertySheet.pyi index 42d0f4a13d..f8be8e14f0 100644 --- a/src/Mod/Spreadsheet/App/PropertySheetPy.pyi +++ b/src/Mod/Spreadsheet/App/PropertySheet.pyi @@ -2,20 +2,17 @@ from Base.Metadata import export, sequence_protocol from Base.Persistence import Persistence @export( - Father="PersistencePy", - Name="PropertySheetPy", - Twin="PropertySheet", - TwinPointer="PropertySheet", Include="Mod/Spreadsheet/App/PropertySheet.h", Namespace="Spreadsheet", - FatherInclude="Base/PersistencePy.h", - FatherNamespace="Base", Constructor=True, ) @sequence_protocol( mp_subscript="true", ) -class PropertySheetPy(Persistence): +class PropertySheet(Persistence): """ Internal spreadsheet object + + Author: Eivind Kvedalen (eivind@kvedalen.name) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/Spreadsheet/App/PropertySheetPy.xml b/src/Mod/Spreadsheet/App/PropertySheetPy.xml deleted file mode 100644 index c739b3353e..0000000000 --- a/src/Mod/Spreadsheet/App/PropertySheetPy.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - Internal spreadsheet object - - - - - diff --git a/src/Mod/Spreadsheet/App/SheetPy.pyi b/src/Mod/Spreadsheet/App/Sheet.pyi similarity index 95% rename from src/Mod/Spreadsheet/App/SheetPy.pyi rename to src/Mod/Spreadsheet/App/Sheet.pyi index e93da1a33e..d71ff4e19a 100644 --- a/src/Mod/Spreadsheet/App/SheetPy.pyi +++ b/src/Mod/Spreadsheet/App/Sheet.pyi @@ -5,19 +5,16 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="SheetPy", - Twin="Sheet", - TwinPointer="Sheet", Include="Mod/Spreadsheet/App/Sheet.h", Namespace="Spreadsheet", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", Constructor=True, ) -class SheetPy(DocumentObject): +class Sheet(DocumentObject): """ With this object you can manipulate spreadsheets + + Author: Eivind Kvedalen (eivind@kvedalen.name) + License: LGPL-2.1-or-later """ def set(self) -> Any: diff --git a/src/Mod/Spreadsheet/App/SheetPy.xml b/src/Mod/Spreadsheet/App/SheetPy.xml deleted file mode 100644 index 6e31e8eec4..0000000000 --- a/src/Mod/Spreadsheet/App/SheetPy.xml +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - With this object you can manipulate spreadsheets - - - - Set data into a cell - - - - - Get evaluated cell contents - - - - - Get cell contents - - - - - Clear a cell - - - - - Clear all cells in the spreadsheet - - - - - Import file into spreadsheet - - - - - Export file from spreadsheet - - - - - Merge given cell area into one cell - - - - - Split a previously merged cell - - - - - Insert a given number of columns into the spreadsheet. - - - - - Remove a given number of columns from the spreadsheet. - - - - - Insert a given number of rows into the spreadsheet. - - - - - Remove a given number of rows from the spreadsheet. - - - - - Set alignment of the cell - - - - - Get alignment of the cell - - - - - Set style of the cell - - - - - Get style of the cell - - - - - Set display unit for cell - - - - - Set alias for cell address - - - - - Get alias for cell address - - - - - Get cell address given an alias - - - - - Get display unit for cell - - - - - Set foreground color of the cell - - - - - Get foreground color of the cell - - - - - Set background color of the cell - - - - - Get background color of the cell - - - - - Set given spreadsheet column to given width - - - - - Get given spreadsheet column width - - - - - Set given spreadsheet row to given height - - - - - Get given spreadsheet row height - - - - - touchCells(from, to=None): touch cells in the given range - - - - - -recomputeCells(from, to=None) - -Manually recompute cells in the given range with the given order without -following dependency order. - - - - - - - -getUsedCells() - -Get a list of the names of all cells that are marked as used. These cells may -or may not have a non-empty string content. - - - - - - - -getNonEmptyCells() - -Get a list of the names of all cells with data in them. - - - - - - - -getUsedRange() - -Get a the total range of the used cells in a sheet, as a pair of strings -representing the lowest row and column that are used, and the highest row and -column that are used (inclusive). Note that the actual first and last cell -of the block are not necessarily used. - - - - - - - -getNonEmptyRange() - -Get a the total range of the used cells in a sheet, as a pair of cell addresses -representing the lowest row and column that contain data, and the highest row and -column that contain data (inclusive). Note that the actual first and last cell -of the block do not necessarily contain anything. - - - - - - diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt index 961960eb90..781734d787 100644 --- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt +++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt @@ -3,12 +3,11 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) -generate_from_xml(ViewProviderSpreadsheetPy) -generate_from_py_(ViewProviderSpreadsheetPy) +generate_from_py(ViewProviderSpreadsheet) # The XML files set(SpreadsheetGui_XML_SRCS - ViewProviderSpreadsheetPy.xml + ViewProviderSpreadsheet.pyi ) set(SpreadsheetGui_LIBS diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPy.pyi b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.pyi similarity index 77% rename from src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPy.pyi rename to src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.pyi index 954a9174ea..5add098af1 100644 --- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPy.pyi +++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.pyi @@ -5,18 +5,17 @@ from Base.Metadata import export from Gui.ViewProviderDocumentObject import ViewProviderDocumentObject @export( - Father="ViewProviderDocumentObjectPy", - Name="ViewProviderSpreadsheetPy", Twin="ViewProviderSheet", TwinPointer="ViewProviderSheet", Include="Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h", Namespace="SpreadsheetGui", - FatherInclude="Gui/ViewProviderDocumentObjectPy.h", - FatherNamespace="Gui", ) -class ViewProviderSpreadsheetPy(ViewProviderDocumentObject): +class ViewProviderSpreadsheet(ViewProviderDocumentObject): """ ViewProviderSheet class + + Author: Jose Luis Cercos Pita (jlcercos@gmail.com) + License: LGPL-2.1-or-later """ def getView(self) -> Any: diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPy.xml b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPy.xml deleted file mode 100644 index 819672cf80..0000000000 --- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPy.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - ViewProviderSheet class - - - - Get access to the sheet view - - - - - -Create (if necessary) and switch to the Spreadsheet MDI. - -showSheetMdi() - -Returns: None - - - - - - -Export the sheet as a file. - -exportAsFile() - -Returns: None - - - - - diff --git a/src/Mod/Surface/App/Blending/BlendCurvePy.pyi b/src/Mod/Surface/App/Blending/BlendCurve.pyi similarity index 78% rename from src/Mod/Surface/App/Blending/BlendCurvePy.pyi rename to src/Mod/Surface/App/Blending/BlendCurve.pyi index 4aaa1f8ef5..f4fea1856a 100644 --- a/src/Mod/Surface/App/Blending/BlendCurvePy.pyi +++ b/src/Mod/Surface/App/Blending/BlendCurve.pyi @@ -4,21 +4,18 @@ from Base.BaseClass import PyObjectBase from Base.Metadata import export @export( - Father="PyObjectBase", - Name="BlendCurvePy", - Twin="BlendCurve", - TwinPointer="BlendCurve", Include="Mod/Surface/App/Blending/BlendCurve.h", Namespace="Surface", - FatherInclude="Base/BaseClassPy.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class BlendCurvePy(PyObjectBase): +class BlendCurve(PyObjectBase): """ Create a BlendCurve that interpolate 2 BlendPoints. curve = BlendCurve(BlendPoint1, BlendPoint2) + + Author: Mattéo Grellier (matteogrellier@gmail.com) + License: LGPL-2.1-or-later """ def compute(self) -> Any: diff --git a/src/Mod/Surface/App/Blending/BlendCurvePy.xml b/src/Mod/Surface/App/Blending/BlendCurvePy.xml deleted file mode 100644 index 825b2d05d8..0000000000 --- a/src/Mod/Surface/App/Blending/BlendCurvePy.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - -Create a BlendCurve that interpolate 2 BlendPoints. - curve = BlendCurve(BlendPoint1, BlendPoint2) - - - - - -Return the BezierCurve that interpolate the input BlendPoints. - - - - - - -Set the tangent size of the blendpoint at given index. -If relative is true, the size is considered relative to the distance between the two blendpoints. -myBlendCurve.setSize(idx, size, relative) - - - - - diff --git a/src/Mod/Surface/App/Blending/BlendPointPy.pyi b/src/Mod/Surface/App/Blending/BlendPoint.pyi similarity index 83% rename from src/Mod/Surface/App/Blending/BlendPointPy.pyi rename to src/Mod/Surface/App/Blending/BlendPoint.pyi index 7318b9f5ea..de10747f85 100644 --- a/src/Mod/Surface/App/Blending/BlendPointPy.pyi +++ b/src/Mod/Surface/App/Blending/BlendPoint.pyi @@ -4,23 +4,20 @@ from Base.BaseClass import PyObjectBase from Base.Metadata import constmethod, export @export( - Father="PyObjectBase", - Name="BlendPointPy", - Twin="BlendPoint", - TwinPointer="BlendPoint", Include="Mod/Surface/App/Blending/BlendPoint.h", Namespace="Surface", - FatherInclude="Base/BaseClassPy.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class BlendPointPy(PyObjectBase): +class BlendPoint(PyObjectBase): """ Create BlendPoint from a point and some derivatives. myBlendPoint = BlendPoint([Point, D1, D2, ..., DN]) BlendPoint can also be constructed from an edge myBlendPoint = BlendPoint(Edge, parameter = float, continuity = int) + + Author: Mattéo Grellier (matteogrellier@gmail.com) + License: LGPL-2.1-or-later """ @constmethod diff --git a/src/Mod/Surface/App/Blending/BlendPointPy.xml b/src/Mod/Surface/App/Blending/BlendPointPy.xml deleted file mode 100644 index 8644d455f7..0000000000 --- a/src/Mod/Surface/App/Blending/BlendPointPy.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - -Create BlendPoint from a point and some derivatives. -myBlendPoint = BlendPoint([Point, D1, D2, ..., DN]) -BlendPoint can also be constructed from an edge -myBlendPoint = BlendPoint(Edge, parameter = float, continuity = int) - - - - - The list of vectors of this BlendPoint. - - - - - - - Return BlendPoint first derivative length. - - - - - - -Resizes the BlendPoint vectors, -by setting the length of the first derivative. -theBlendPoint.setSize(new_size) - - - - - - -Set the vectors of BlendPoint. -BlendPoint.setvectors([Point, D1, D2, ..., DN]) - - - - - diff --git a/src/Mod/Surface/App/CMakeLists.txt b/src/Mod/Surface/App/CMakeLists.txt index b98fa10963..1d824a3116 100644 --- a/src/Mod/Surface/App/CMakeLists.txt +++ b/src/Mod/Surface/App/CMakeLists.txt @@ -13,11 +13,8 @@ include_directories( file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Blending) -generate_from_xml(Blending/BlendPointPy) -generate_from_xml(Blending/BlendCurvePy) - -generate_from_py_(Blending/BlendPointPy) -generate_from_py_(Blending/BlendCurvePy) +generate_from_py(Blending/BlendPoint) +generate_from_py(Blending/BlendCurve) set(Surface_LIBS FreeCADApp @@ -26,9 +23,9 @@ set(Surface_LIBS # BlendPoint Wrapper SET(BlendingPy_SRCS - Blending/BlendPointPy.xml + Blending/BlendPoint.pyi Blending/BlendPointPyImp.cpp - Blending/BlendCurvePy.xml + Blending/BlendCurve.pyi Blending/BlendCurvePyImp.cpp ) SOURCE_GROUP("Blending" FILES ${BlendingPy_SRCS}) diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt index 8546b1f6bc..20054a0cd3 100644 --- a/src/Mod/TechDraw/App/CMakeLists.txt +++ b/src/Mod/TechDraw/App/CMakeLists.txt @@ -32,62 +32,33 @@ list(APPEND TechDrawLIBS ${QtWidgets_LIBRARIES} ) -generate_from_xml(DrawPagePy) -generate_from_xml(DrawViewPy) -generate_from_xml(DrawViewPartPy) -generate_from_xml(DrawViewSymbolPy) -generate_from_xml(DrawTemplatePy) -generate_from_xml(DrawParametricTemplatePy) -generate_from_xml(DrawSVGTemplatePy) -generate_from_xml(DrawViewSymbolPy) -generate_from_xml(DrawViewClipPy) -generate_from_xml(DrawViewDimensionPy) -generate_from_xml(DrawViewDimExtentPy) -generate_from_xml(DrawHatchPy) -generate_from_xml(DrawGeomHatchPy) -generate_from_xml(DrawViewCollectionPy) -generate_from_xml(DrawProjGroupPy) -generate_from_xml(DrawProjGroupItemPy) -generate_from_xml(DrawViewAnnotationPy) -generate_from_xml(DrawLeaderLinePy) -generate_from_xml(DrawRichAnnoPy) -generate_from_xml(GeomFormatPy) -generate_from_xml(CenterLinePy) -generate_from_xml(CosmeticEdgePy) -generate_from_xml(CosmeticVertexPy) -generate_from_xml(DrawTilePy) -generate_from_xml(DrawTileWeldPy) -generate_from_xml(DrawWeldSymbolPy) -generate_from_xml(CosmeticExtensionPy) -generate_from_xml(DrawBrokenViewPy) - -generate_from_py_(DrawHatchPy) -generate_from_py_(DrawViewPy) -generate_from_py_(DrawPagePy) -generate_from_py_(DrawViewPartPy) -generate_from_py_(DrawViewSymbolPy) -generate_from_py_(DrawTemplatePy) -generate_from_py_(DrawParametricTemplatePy) -generate_from_py_(DrawSVGTemplatePy) -generate_from_py_(DrawViewClipPy) -generate_from_py_(DrawViewDimensionPy) -generate_from_py_(DrawViewDimExtentPy) -generate_from_py_(DrawGeomHatchPy) -generate_from_py_(DrawViewCollectionPy) -generate_from_py_(DrawProjGroupPy) -generate_from_py_(DrawProjGroupItemPy) -generate_from_py_(DrawViewAnnotationPy) -generate_from_py_(DrawLeaderLinePy) -generate_from_py_(DrawRichAnnoPy) -generate_from_py_(GeomFormatPy) -generate_from_py_(CenterLinePy) -generate_from_py_(CosmeticEdgePy) -generate_from_py_(CosmeticVertexPy) -generate_from_py_(DrawTilePy) -generate_from_py_(DrawTileWeldPy) -generate_from_py_(DrawWeldSymbolPy) -generate_from_py_(CosmeticExtensionPy) -generate_from_py_(DrawBrokenViewPy) +generate_from_py(DrawHatch) +generate_from_py(DrawView) +generate_from_py(DrawPage) +generate_from_py(DrawViewPart) +generate_from_py(DrawViewSymbol) +generate_from_py(DrawTemplate) +generate_from_py(DrawParametricTemplate) +generate_from_py(DrawSVGTemplate) +generate_from_py(DrawViewClip) +generate_from_py(DrawViewDimension) +generate_from_py(DrawViewDimExtent) +generate_from_py(DrawGeomHatch) +generate_from_py(DrawViewCollection) +generate_from_py(DrawProjGroup) +generate_from_py(DrawProjGroupItem) +generate_from_py(DrawViewAnnotation) +generate_from_py(DrawLeaderLine) +generate_from_py(DrawRichAnno) +generate_from_py(GeomFormat) +generate_from_py(CenterLine) +generate_from_py(CosmeticEdge) +generate_from_py(CosmeticVertex) +generate_from_py(DrawTile) +generate_from_py(DrawTileWeld) +generate_from_py(DrawWeldSymbol) +generate_from_py(CosmeticExtension) +generate_from_py(DrawBrokenView) SET(Draw_SRCS DrawPage.cpp @@ -237,59 +208,59 @@ SET(Geometry_SRCS ) SET(Python_SRCS - DrawPagePy.xml + DrawPage.pyi DrawPagePyImp.cpp - DrawViewPy.xml + DrawView.pyi DrawViewPyImp.cpp - DrawViewPartPy.xml + DrawViewPart.pyi DrawViewPartPyImp.cpp - DrawViewSymbolPy.xml + DrawViewSymbol.pyi DrawViewSymbolPyImp.cpp - DrawTemplatePy.xml + DrawTemplate.pyi DrawTemplatePyImp.cpp - DrawParametricTemplatePy.xml + DrawParametricTemplate.pyi DrawParametricTemplatePyImp.cpp - DrawSVGTemplatePy.xml + DrawSVGTemplate.pyi DrawSVGTemplatePyImp.cpp - DrawViewClipPy.xml + DrawViewClip.pyi DrawViewClipPyImp.cpp - DrawViewDimensionPy.xml + DrawViewDimension.pyi DrawViewDimensionPyImp.cpp - DrawViewDimExtentPy.xml + DrawViewDimExtent.pyi DrawViewDimExtentPyImp.cpp - DrawHatchPy.xml + DrawHatch.pyi DrawHatchPyImp.cpp - DrawGeomHatchPy.xml + DrawGeomHatch.pyi DrawGeomHatchPyImp.cpp - DrawViewCollectionPy.xml + DrawViewCollection.pyi DrawViewCollectionPyImp.cpp - DrawProjGroupPy.xml + DrawProjGroup.pyi DrawProjGroupPyImp.cpp - DrawProjGroupItemPy.xml + DrawProjGroupItem.pyi DrawProjGroupItemPyImp.cpp - DrawViewAnnotationPy.xml + DrawViewAnnotation.pyi DrawViewAnnotationPyImp.cpp - DrawLeaderLinePy.xml + DrawLeaderLine.pyi DrawLeaderLinePyImp.cpp - DrawRichAnnoPy.xml + DrawRichAnno.pyi DrawRichAnnoPyImp.cpp - GeomFormatPy.xml + GeomFormat.pyi GeomFormatPyImp.cpp - CenterLinePy.xml + CenterLine.pyi CenterLinePyImp.cpp - CosmeticEdgePy.xml + CosmeticEdge.pyi CosmeticEdgePyImp.cpp - CosmeticVertexPy.xml + CosmeticVertex.pyi CosmeticVertexPyImp.cpp - DrawTilePy.xml + DrawTile.pyi DrawTilePyImp.cpp - DrawTileWeldPy.xml + DrawTileWeld.pyi DrawTileWeldPyImp.cpp - DrawWeldSymbolPy.xml + DrawWeldSymbol.pyi DrawWeldSymbolPyImp.cpp - CosmeticExtensionPy.xml + CosmeticExtension.pyi CosmeticExtensionPyImp.cpp - DrawBrokenViewPy.xml + DrawBrokenView.pyi DrawBrokenViewPyImp.cpp ) diff --git a/src/Mod/TechDraw/App/CenterLinePy.pyi b/src/Mod/TechDraw/App/CenterLine.pyi similarity index 87% rename from src/Mod/TechDraw/App/CenterLinePy.pyi rename to src/Mod/TechDraw/App/CenterLine.pyi index 67cddea8a1..b652ef2b99 100644 --- a/src/Mod/TechDraw/App/CenterLinePy.pyi +++ b/src/Mod/TechDraw/App/CenterLine.pyi @@ -4,20 +4,17 @@ from Base.PyObjectBase import PyObjectBase from Base.Metadata import constmethod, export @export( - Father="PyObjectBase", - Name="CenterLinePy", - Twin="CenterLine", - TwinPointer="CenterLine", Include="Mod/TechDraw/App/CenterLine.h", Namespace="TechDraw", - FatherInclude="Base/PyObjectBase.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class CenterLinePy(PyObjectBase): +class CenterLine(PyObjectBase): """ CenterLine specifies additional mark up edges in a View + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ @constmethod diff --git a/src/Mod/TechDraw/App/CenterLinePy.xml b/src/Mod/TechDraw/App/CenterLinePy.xml deleted file mode 100644 index f3d90cf6ef..0000000000 --- a/src/Mod/TechDraw/App/CenterLinePy.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - CenterLine specifies additional mark up edges in a View - - - - Create a clone of this centerline - - - - - Create a copy of this centerline - - - - - Gives the tag of the CenterLine as string. - - - - - - 0 - face, 1 - 2 line, 2 - 2 point. - - - - - - 0 - vert/ 1 - horiz/ 2 - aligned. - - - - - - The appearance attributes (style, color, weight, visible) for this CenterLine. - - - - - - The left/right offset for this CenterLine. - - - - - - The up/down offset for this CenterLine. - - - - - - The rotation of the Centerline in degrees. - - - - - - The additional length to be added to this CenterLine. - - - - - - Reverse the order of points for 2 point CenterLine. - - - - - - The names of source edges for this CenterLine. - - - - - - The names of source Faces for this CenterLine. - - - - - - The names of source Points for this CenterLine. - - - - - diff --git a/src/Mod/TechDraw/App/CosmeticEdgePy.pyi b/src/Mod/TechDraw/App/CosmeticEdge.pyi similarity index 83% rename from src/Mod/TechDraw/App/CosmeticEdgePy.pyi rename to src/Mod/TechDraw/App/CosmeticEdge.pyi index 346d9f3fa0..1403bc370d 100644 --- a/src/Mod/TechDraw/App/CosmeticEdgePy.pyi +++ b/src/Mod/TechDraw/App/CosmeticEdge.pyi @@ -4,20 +4,18 @@ from Base.PyObjectBase import PyObjectBase from Base.Metadata import export @export( - Father="PyObjectBase", - Name="CosmeticEdgePy", - Twin="CosmeticEdge", - TwinPointer="CosmeticEdge", Include="Mod/TechDraw/App/Cosmetic.h", Namespace="TechDraw", FatherInclude="Base/GeometryPyCXX.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class CosmeticEdgePy(PyObjectBase): +class CosmeticEdge(PyObjectBase): """ CosmeticEdge specifies an extra (cosmetic) edge in Views + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ Tag: Final[str] diff --git a/src/Mod/TechDraw/App/CosmeticEdgePy.xml b/src/Mod/TechDraw/App/CosmeticEdgePy.xml deleted file mode 100644 index 502677ce1b..0000000000 --- a/src/Mod/TechDraw/App/CosmeticEdgePy.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - CosmeticEdge specifies an extra (cosmetic) edge in Views - - - - Gives the tag of the CosmeticEdge as string. - - - - - - - - - - - - Gives the position of one end of this CosmeticEdge as vector. - - - - - - Gives the position of one end of this CosmeticEdge as vector. - - - - - - Gives the position of center point of this CosmeticEdge as vector. - - - - - - Gives the radius of CosmeticEdge in mm. - - - - - - - - - - - - - - The appearance attributes (style, weight, color, visible) for this CosmeticEdge. - - - - - diff --git a/src/Mod/TechDraw/App/CosmeticExtension.pyi b/src/Mod/TechDraw/App/CosmeticExtension.pyi new file mode 100644 index 0000000000..07218eb29f --- /dev/null +++ b/src/Mod/TechDraw/App/CosmeticExtension.pyi @@ -0,0 +1,15 @@ +from Base.Metadata import export + +from App.DocumentObjectExtension import DocumentObjectExtension + +@export( + Include="Mod/TechDraw/App/CosmeticExtension.h", + Namespace="TechDraw", +) +class CosmeticExtension(DocumentObjectExtension): + """ + This object represents cosmetic features for a DrawViewPart. + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later + """ diff --git a/src/Mod/TechDraw/App/CosmeticExtensionPy.pyi b/src/Mod/TechDraw/App/CosmeticExtensionPy.pyi deleted file mode 100644 index 0756427c91..0000000000 --- a/src/Mod/TechDraw/App/CosmeticExtensionPy.pyi +++ /dev/null @@ -1,18 +0,0 @@ -from Base.Metadata import export - -from App.DocumentObjectExtension import DocumentObjectExtension - -@export( - Father="DocumentObjectExtensionPy", - Name="CosmeticExtensionPy", - Twin="CosmeticExtension", - TwinPointer="CosmeticExtension", - Include="Mod/TechDraw/App/CosmeticExtension.h", - Namespace="TechDraw", - FatherInclude="App/DocumentObjectExtensionPy.h", - FatherNamespace="App", -) -class CosmeticExtensionPy(DocumentObjectExtension): - """ - This object represents cosmetic features for a DrawViewPart. - """ diff --git a/src/Mod/TechDraw/App/CosmeticExtensionPy.xml b/src/Mod/TechDraw/App/CosmeticExtensionPy.xml deleted file mode 100644 index 1d18c28ca4..0000000000 --- a/src/Mod/TechDraw/App/CosmeticExtensionPy.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - This object represents cosmetic features for a DrawViewPart. - - - diff --git a/src/Mod/TechDraw/App/CosmeticVertexPy.pyi b/src/Mod/TechDraw/App/CosmeticVertex.pyi similarity index 81% rename from src/Mod/TechDraw/App/CosmeticVertexPy.pyi rename to src/Mod/TechDraw/App/CosmeticVertex.pyi index d0f508042c..ae3da97780 100644 --- a/src/Mod/TechDraw/App/CosmeticVertexPy.pyi +++ b/src/Mod/TechDraw/App/CosmeticVertex.pyi @@ -4,20 +4,17 @@ from Base.PyObjectBase import PyObjectBase from Base.Metadata import constmethod, export @export( - Father="PyObjectBase", - Name="CosmeticVertexPy", - Twin="CosmeticVertex", - TwinPointer="CosmeticVertex", Include="Mod/TechDraw/App/Cosmetic.h", Namespace="TechDraw", - FatherInclude="Base/PyObjectBase.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class CosmeticVertexPy(PyObjectBase): +class CosmeticVertex(PyObjectBase): """ CosmeticVertex specifies an extra (cosmetic) vertex in Views + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ @constmethod diff --git a/src/Mod/TechDraw/App/CosmeticVertexPy.xml b/src/Mod/TechDraw/App/CosmeticVertexPy.xml deleted file mode 100644 index 038ebbcd40..0000000000 --- a/src/Mod/TechDraw/App/CosmeticVertexPy.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - CosmeticVertex specifies an extra (cosmetic) vertex in Views - - - - Create a clone of this CosmeticVertex - - - - - Create a copy of this CosmeticVertex - - - - - Gives the tag of the CosmeticVertex as string. - - - - - - Gives the position of this CosmeticVertex as vector. - - - - - - Show/hide the vertex. - - - - - - set/return the vertex's colour using a tuple (rgba). - - - - - - set/return the vertex's radius in mm. - - - - - - set/return the vertex's style as integer. - - - - - diff --git a/src/Mod/TechDraw/App/DrawBrokenViewPy.pyi b/src/Mod/TechDraw/App/DrawBrokenView.pyi similarity index 82% rename from src/Mod/TechDraw/App/DrawBrokenViewPy.pyi rename to src/Mod/TechDraw/App/DrawBrokenView.pyi index bea3460a3b..73cec4d14d 100644 --- a/src/Mod/TechDraw/App/DrawBrokenViewPy.pyi +++ b/src/Mod/TechDraw/App/DrawBrokenView.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from TechDraw.DrawViewPart import DrawViewPart @export( - Father="DrawViewPartPy", - Name="DrawBrokenViewPy", - Twin="DrawBrokenView", - TwinPointer="DrawBrokenView", Include="Mod/TechDraw/App/DrawBrokenView.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewPartPy.h", - FatherNamespace="TechDraw", ) -class DrawBrokenViewPy(DrawViewPart): +class DrawBrokenView(DrawViewPart): """ Feature for creating and manipulating Technical Drawing broken views + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def mapPoint3dToView(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawBrokenViewPy.xml b/src/Mod/TechDraw/App/DrawBrokenViewPy.xml deleted file mode 100644 index 3bed6978b9..0000000000 --- a/src/Mod/TechDraw/App/DrawBrokenViewPy.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing broken views - - - - point2d = mapPoint3dToView(point3d) - returns the position of the 3d point within the broken view. - - - - - point2d = mapPoint2dFromView(point3d) - returns the position of the 2d point within an unbroken view. - - - - - point3d = getCompressedCenter() - returns the geometric center of the source shapes after break cuts and gap compression. - - - - - diff --git a/src/Mod/TechDraw/App/DrawGeomHatchPy.pyi b/src/Mod/TechDraw/App/DrawGeomHatch.pyi similarity index 69% rename from src/Mod/TechDraw/App/DrawGeomHatchPy.pyi rename to src/Mod/TechDraw/App/DrawGeomHatch.pyi index 33fa33eae9..de603f8670 100644 --- a/src/Mod/TechDraw/App/DrawGeomHatchPy.pyi +++ b/src/Mod/TechDraw/App/DrawGeomHatch.pyi @@ -4,18 +4,15 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="DrawGeomHatchPy", - Twin="DrawGeomHatch", - TwinPointer="DrawGeomHatch", Include="Mod/TechDraw/App/DrawGeomHatch.h", Namespace="TechDraw", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", ) -class DrawGeomHatchPy(DocumentObject): +class DrawGeomHatch(DocumentObject): """ Feature for creating and manipulating Technical Drawing GeomHatch areas + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def translateLabel(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawGeomHatchPy.xml b/src/Mod/TechDraw/App/DrawGeomHatchPy.xml deleted file mode 100644 index 5102c35aed..0000000000 --- a/src/Mod/TechDraw/App/DrawGeomHatchPy.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing GeomHatch areas - - - - translateLabel(translationContext, objectBaseName, objectUniqueName). -No return value. Replace the current label with a translated version where possible. - - - - - - diff --git a/src/Mod/TechDraw/App/DrawHatchPy.pyi b/src/Mod/TechDraw/App/DrawHatch.pyi similarity index 70% rename from src/Mod/TechDraw/App/DrawHatchPy.pyi rename to src/Mod/TechDraw/App/DrawHatch.pyi index b20e0e95cf..690f6c8f9f 100644 --- a/src/Mod/TechDraw/App/DrawHatchPy.pyi +++ b/src/Mod/TechDraw/App/DrawHatch.pyi @@ -3,18 +3,15 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="DrawHatchPy", - Twin="DrawHatch", - TwinPointer="DrawHatch", Include="Mod/TechDraw/App/DrawHatch.h", Namespace="TechDraw", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", ) -class DrawHatchPy(DocumentObject): +class DrawHatch(DocumentObject): """ Feature for creating and manipulating Technical Drawing Hatch areas + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def translateLabel(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawHatchPy.xml b/src/Mod/TechDraw/App/DrawHatchPy.xml deleted file mode 100644 index a88d174cc9..0000000000 --- a/src/Mod/TechDraw/App/DrawHatchPy.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing Hatch areas - - - - translateLabel(translationContext, objectBaseName, objectUniqueName). -No return value. Replace the current label with a translated version where possible. - - - - - - diff --git a/src/Mod/TechDraw/App/DrawLeaderLinePy.pyi b/src/Mod/TechDraw/App/DrawLeaderLine.pyi similarity index 59% rename from src/Mod/TechDraw/App/DrawLeaderLinePy.pyi rename to src/Mod/TechDraw/App/DrawLeaderLine.pyi index a25a5b0dfb..797e4a9438 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLinePy.pyi +++ b/src/Mod/TechDraw/App/DrawLeaderLine.pyi @@ -2,16 +2,14 @@ from Base.Metadata import export from DrawView import DrawView @export( - Father="DrawViewPy", - Name="DrawLeaderLinePy", - Twin="DrawLeaderLine", - TwinPointer="DrawLeaderLine", Include="Mod/TechDraw/App/DrawLeaderLine.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewPy.h", - FatherNamespace="TechDraw", ) -class DrawLeaderLinePy(DrawView): +class DrawLeaderLine(DrawView): """ Feature for adding leaders to Technical Drawings + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/TechDraw/App/DrawLeaderLinePy.xml b/src/Mod/TechDraw/App/DrawLeaderLinePy.xml deleted file mode 100644 index f439a241cd..0000000000 --- a/src/Mod/TechDraw/App/DrawLeaderLinePy.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Feature for adding leaders to Technical Drawings - - - - diff --git a/src/Mod/TechDraw/App/DrawPagePy.pyi b/src/Mod/TechDraw/App/DrawPage.pyi similarity index 86% rename from src/Mod/TechDraw/App/DrawPagePy.pyi rename to src/Mod/TechDraw/App/DrawPage.pyi index 33f33dd1f9..f76b42d7e8 100644 --- a/src/Mod/TechDraw/App/DrawPagePy.pyi +++ b/src/Mod/TechDraw/App/DrawPage.pyi @@ -4,18 +4,15 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="DrawPagePy", - Twin="DrawPage", - TwinPointer="DrawPage", Include="Mod/TechDraw/App/DrawPage.h", Namespace="TechDraw", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", ) -class DrawPagePy(DocumentObject): +class DrawPage(DocumentObject): """ Feature for creating and manipulating Technical Drawing Pages + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def addView(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawPagePy.xml b/src/Mod/TechDraw/App/DrawPagePy.xml deleted file mode 100644 index db6d79bd2d..0000000000 --- a/src/Mod/TechDraw/App/DrawPagePy.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing Pages - - - - addView(DrawView) - Add a View to this Page - - - - - removeView(DrawView) - Remove a View to this Page - - - - - getViews() - returns a list of all the views on page excluding Views inside Collections - - - - - getAllViews() - returns a list of all the views on page including Views inside Collections - - - - - translateLabel(translationContext, objectBaseName, objectUniqueName). -No return value. Replace the current label with a translated version where possible. - - - - - - Returns the width of this page - - - - - - Returns the height of this page - - - - - - Returns the orientation of this page - - - - - - Ask the Gui to redraw this page - - - - - diff --git a/src/Mod/TechDraw/App/DrawParametricTemplatePy.pyi b/src/Mod/TechDraw/App/DrawParametricTemplate.pyi similarity index 67% rename from src/Mod/TechDraw/App/DrawParametricTemplatePy.pyi rename to src/Mod/TechDraw/App/DrawParametricTemplate.pyi index fc105c115f..1bdc533308 100644 --- a/src/Mod/TechDraw/App/DrawParametricTemplatePy.pyi +++ b/src/Mod/TechDraw/App/DrawParametricTemplate.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from DrawTemplate import DrawTemplate @export( - Father="DrawTemplatePy", - Name="DrawParametricTemplatePy", - Twin="DrawParametricTemplate", - TwinPointer="DrawParametricTemplate", Include="Mod/TechDraw/App/DrawParametricTemplate.h", Namespace="TechDraw", FatherInclude="DrawTemplatePy.h", - FatherNamespace="TechDraw", ) -class DrawParametricTemplatePy(DrawTemplate): +class DrawParametricTemplate(DrawTemplate): """ Feature for creating and manipulating Technical Drawing Templates + + Author: Luke Parry (l.parry@warwick.ac.uk) + License: LGPL-2.1-or-later """ def drawLine(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawParametricTemplatePy.xml b/src/Mod/TechDraw/App/DrawParametricTemplatePy.xml deleted file mode 100644 index 2f8c7388b9..0000000000 --- a/src/Mod/TechDraw/App/DrawParametricTemplatePy.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing Templates - - - - Draw a line - - - - - Number of geometry in template - - - - - diff --git a/src/Mod/TechDraw/App/DrawProjGroupPy.pyi b/src/Mod/TechDraw/App/DrawProjGroup.pyi similarity index 85% rename from src/Mod/TechDraw/App/DrawProjGroupPy.pyi rename to src/Mod/TechDraw/App/DrawProjGroup.pyi index c5cb16d40f..489b009b0e 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupPy.pyi +++ b/src/Mod/TechDraw/App/DrawProjGroup.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from TechDraw.DrawViewCollection import DrawViewCollection @export( - Father="DrawViewCollectionPy", - Name="DrawProjGroupPy", - Twin="DrawProjGroup", - TwinPointer="DrawProjGroup", Include="Mod/TechDraw/App/DrawProjGroup.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewCollectionPy.h", - FatherNamespace="TechDraw", ) -class DrawProjGroupPy(DrawViewCollection): +class DrawProjGroup(DrawViewCollection): """ Feature for creating and manipulating Technical Drawing Projection Groups + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def addProjection(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawProjGroupItemPy.pyi b/src/Mod/TechDraw/App/DrawProjGroupItem.pyi similarity index 71% rename from src/Mod/TechDraw/App/DrawProjGroupItemPy.pyi rename to src/Mod/TechDraw/App/DrawProjGroupItem.pyi index 1639c1a507..e2848a4d63 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupItemPy.pyi +++ b/src/Mod/TechDraw/App/DrawProjGroupItem.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from TechDraw.DrawViewPart import DrawViewPart @export( - Father="DrawViewPartPy", - Name="DrawProjGroupItemPy", - Twin="DrawProjGroupItem", - TwinPointer="DrawProjGroupItem", Include="Mod/TechDraw/App/DrawProjGroupItem.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewPartPy.h", - FatherNamespace="TechDraw", ) -class DrawProjGroupItemPy(DrawViewPart): +class DrawProjGroupItem(DrawViewPart): """ Feature for creating and manipulating component Views Technical Drawing Projection Groups + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def autoPosition(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawProjGroupItemPy.xml b/src/Mod/TechDraw/App/DrawProjGroupItemPy.xml deleted file mode 100644 index bcb9e93f13..0000000000 --- a/src/Mod/TechDraw/App/DrawProjGroupItemPy.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Feature for creating and manipulating component Views Technical Drawing Projection Groups - - - - autoPosition() - Move to AutoDistribute/Unlocked position on Page. Returns none. - - - - - diff --git a/src/Mod/TechDraw/App/DrawProjGroupPy.xml b/src/Mod/TechDraw/App/DrawProjGroupPy.xml deleted file mode 100644 index 812029b7f5..0000000000 --- a/src/Mod/TechDraw/App/DrawProjGroupPy.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing Projection Groups - - - - addProjection(string projectionType) - Add a new Projection Item to this Group. Returns DocObj. - - - - - removeProjection(string projectionType) - Remove specified Projection Item from this Group. Returns int number of views in Group. - - - - - purgeProjections() - Remove all Projection Items from this Group. Returns int number of views in Group (0). - - - - - getItemByLabel(string projectionType) - return specified Projection Item - - - - - getXYPosition(string projectionType) - return the AutoDistribute position for specified Projection Item - - - - - diff --git a/src/Mod/TechDraw/App/DrawRichAnnoPy.pyi b/src/Mod/TechDraw/App/DrawRichAnno.pyi similarity index 62% rename from src/Mod/TechDraw/App/DrawRichAnnoPy.pyi rename to src/Mod/TechDraw/App/DrawRichAnno.pyi index f4f4fed40e..258184f688 100644 --- a/src/Mod/TechDraw/App/DrawRichAnnoPy.pyi +++ b/src/Mod/TechDraw/App/DrawRichAnno.pyi @@ -2,16 +2,14 @@ from Base.Metadata import export from TechDraw.DrawView import DrawView @export( - Father="DrawViewPy", - Name="DrawRichAnnoPy", - Twin="DrawRichAnno", - TwinPointer="DrawRichAnno", Include="Mod/TechDraw/App/DrawRichAnno.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewPy.h", - FatherNamespace="TechDraw", ) -class DrawRichAnnoPy(DrawView): +class DrawRichAnno(DrawView): """ Feature for adding rich annotation blocks to Technical Drawings + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/TechDraw/App/DrawRichAnnoPy.xml b/src/Mod/TechDraw/App/DrawRichAnnoPy.xml deleted file mode 100644 index 5b8111b6e8..0000000000 --- a/src/Mod/TechDraw/App/DrawRichAnnoPy.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Feature for adding rich annotation blocks to Technical Drawings - - - - diff --git a/src/Mod/TechDraw/App/DrawSVGTemplatePy.pyi b/src/Mod/TechDraw/App/DrawSVGTemplate.pyi similarity index 82% rename from src/Mod/TechDraw/App/DrawSVGTemplatePy.pyi rename to src/Mod/TechDraw/App/DrawSVGTemplate.pyi index 445ea12961..2cc9f29114 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplatePy.pyi +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from DrawTemplate import DrawTemplate @export( - Father="DrawTemplatePy", - Name="DrawSVGTemplatePy", - Twin="DrawSVGTemplate", - TwinPointer="DrawSVGTemplate", Include="Mod/TechDraw/App/DrawSVGTemplate.h", Namespace="TechDraw", FatherInclude="DrawTemplatePy.h", - FatherNamespace="TechDraw", ) -class DrawSVGTemplatePy(DrawTemplate): +class DrawSVGTemplate(DrawTemplate): """ Feature for creating and manipulating Technical Drawing SVG Templates + + Author: Luke Parry (l.parry@warwick.ac.uk) + License: LGPL-2.1-or-later """ def getEditFieldContent(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawSVGTemplatePy.xml b/src/Mod/TechDraw/App/DrawSVGTemplatePy.xml deleted file mode 100644 index 9ef9701824..0000000000 --- a/src/Mod/TechDraw/App/DrawSVGTemplatePy.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing SVG Templates - - - - getEditFieldContent(EditFieldName) - returns the content of a specific Editable Text Field - - - - - setEditFieldContent(EditFieldName, NewContent) - sets a specific Editable Text Field to a new value - - - - - translateLabel(translationContext, objectBaseName, objectUniqueName). -No return value. Replace the current label with a translated version where possible. - - - - - diff --git a/src/Mod/TechDraw/App/DrawTemplatePy.pyi b/src/Mod/TechDraw/App/DrawTemplate.pyi similarity index 52% rename from src/Mod/TechDraw/App/DrawTemplatePy.pyi rename to src/Mod/TechDraw/App/DrawTemplate.pyi index dfbf810397..26639c1638 100644 --- a/src/Mod/TechDraw/App/DrawTemplatePy.pyi +++ b/src/Mod/TechDraw/App/DrawTemplate.pyi @@ -3,16 +3,13 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="DrawTemplatePy", - Twin="DrawTemplate", - TwinPointer="DrawTemplate", Include="Mod/TechDraw/App/DrawTemplate.h", Namespace="TechDraw", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", ) -class DrawTemplatePy(DocumentObject): +class DrawTemplate(DocumentObject): """ Feature for creating and manipulating Technical Drawing Templates + + Author: Luke Parry (l.parry@warwick.ac.uk) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/TechDraw/App/DrawTemplatePy.xml b/src/Mod/TechDraw/App/DrawTemplatePy.xml deleted file mode 100644 index 16a9b300e1..0000000000 --- a/src/Mod/TechDraw/App/DrawTemplatePy.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing Templates - - - diff --git a/src/Mod/TechDraw/App/DrawTilePy.pyi b/src/Mod/TechDraw/App/DrawTile.pyi similarity index 51% rename from src/Mod/TechDraw/App/DrawTilePy.pyi rename to src/Mod/TechDraw/App/DrawTile.pyi index 6fd272c2b2..f6db6b7b25 100644 --- a/src/Mod/TechDraw/App/DrawTilePy.pyi +++ b/src/Mod/TechDraw/App/DrawTile.pyi @@ -3,16 +3,13 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="DrawTilePy", - Twin="DrawTile", - TwinPointer="DrawTile", Include="Mod/TechDraw/App/DrawTile.h", Namespace="TechDraw", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", ) -class DrawTilePy(DocumentObject): +class DrawTile(DocumentObject): """ Feature for adding tiles to leader lines + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/TechDraw/App/DrawTilePy.xml b/src/Mod/TechDraw/App/DrawTilePy.xml deleted file mode 100644 index c0a466bd90..0000000000 --- a/src/Mod/TechDraw/App/DrawTilePy.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Feature for adding tiles to leader lines - - - - diff --git a/src/Mod/TechDraw/App/DrawTileWeldPy.pyi b/src/Mod/TechDraw/App/DrawTileWeld.pyi similarity index 61% rename from src/Mod/TechDraw/App/DrawTileWeldPy.pyi rename to src/Mod/TechDraw/App/DrawTileWeld.pyi index 2a8bcf3c47..b90ddf5c31 100644 --- a/src/Mod/TechDraw/App/DrawTileWeldPy.pyi +++ b/src/Mod/TechDraw/App/DrawTileWeld.pyi @@ -2,16 +2,14 @@ from Base.Metadata import export from TechDraw.DrawTile import DrawTile @export( - Father="DrawTilePy", - Name="DrawTileWeldPy", - Twin="DrawTileWeld", - TwinPointer="DrawTileWeld", Include="Mod/TechDraw/App/DrawTileWeld.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawTilePy.h", - FatherNamespace="TechDraw", ) -class DrawTileWeldPy(DrawTile): +class DrawTileWeld(DrawTile): """ Feature for adding welding tiles to leader lines + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/TechDraw/App/DrawTileWeldPy.xml b/src/Mod/TechDraw/App/DrawTileWeldPy.xml deleted file mode 100644 index a93e13ef0a..0000000000 --- a/src/Mod/TechDraw/App/DrawTileWeldPy.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Feature for adding welding tiles to leader lines - - - - diff --git a/src/Mod/TechDraw/App/DrawViewPy.pyi b/src/Mod/TechDraw/App/DrawView.pyi similarity index 78% rename from src/Mod/TechDraw/App/DrawViewPy.pyi rename to src/Mod/TechDraw/App/DrawView.pyi index 1ce4ce3940..c86dcce3e5 100644 --- a/src/Mod/TechDraw/App/DrawViewPy.pyi +++ b/src/Mod/TechDraw/App/DrawView.pyi @@ -5,18 +5,15 @@ from Base.Metadata import export from App.DocumentObject import DocumentObject @export( - Father="DocumentObjectPy", - Name="DrawViewPy", - Twin="DrawView", - TwinPointer="DrawView", Include="Mod/TechDraw/App/DrawView.h", Namespace="TechDraw", - FatherInclude="App/DocumentObjectPy.h", - FatherNamespace="App", ) -class DrawViewPy(DocumentObject): +class DrawView(DocumentObject): """ Feature for creating and manipulating Technical Drawing Views + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def translateLabel(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawViewAnnotationPy.pyi b/src/Mod/TechDraw/App/DrawViewAnnotation.pyi similarity index 60% rename from src/Mod/TechDraw/App/DrawViewAnnotationPy.pyi rename to src/Mod/TechDraw/App/DrawViewAnnotation.pyi index adb71d3b33..504207e028 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotationPy.pyi +++ b/src/Mod/TechDraw/App/DrawViewAnnotation.pyi @@ -2,16 +2,14 @@ from Base.Metadata import export from TechDraw.Drawview import DrawView @export( - Father="DrawViewPy", - Name="DrawViewAnnotationPy", - Twin="DrawViewAnnotation", - TwinPointer="DrawViewAnnotation", Include="Mod/TechDraw/App/DrawViewAnnotation.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewPy.h", - FatherNamespace="TechDraw", ) -class DrawViewAnnotationPy(DrawView): +class DrawViewAnnotation(DrawView): """ Feature for creating and manipulating Technical Drawing Annotation Views + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/TechDraw/App/DrawViewAnnotationPy.xml b/src/Mod/TechDraw/App/DrawViewAnnotationPy.xml deleted file mode 100644 index 82a92ea422..0000000000 --- a/src/Mod/TechDraw/App/DrawViewAnnotationPy.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing Annotation Views - - - - diff --git a/src/Mod/TechDraw/App/DrawViewClipPy.pyi b/src/Mod/TechDraw/App/DrawViewClip.pyi similarity index 73% rename from src/Mod/TechDraw/App/DrawViewClipPy.pyi rename to src/Mod/TechDraw/App/DrawViewClip.pyi index 0245b557a1..0288c0fff0 100644 --- a/src/Mod/TechDraw/App/DrawViewClipPy.pyi +++ b/src/Mod/TechDraw/App/DrawViewClip.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from TechDraw.DrawView import DrawView @export( - Father="DrawViewPy", - Name="DrawViewClipPy", - Twin="DrawViewClip", - TwinPointer="DrawViewClip", Include="Mod/TechDraw/App/DrawViewClip.h", Namespace="TechDraw", - FatherInclude="Mod/TechDraw/App/DrawViewPy.h", - FatherNamespace="TechDraw", + FatherInclude="Mod/TechDraw/App/DrawViewPy.h", ) -class DrawViewClipPy(DrawView): +class DrawViewClip(DrawView): """ Feature for creating and manipulating Technical Drawing Clip Views + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def addView(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawViewClipPy.xml b/src/Mod/TechDraw/App/DrawViewClipPy.xml deleted file mode 100644 index 4345248785..0000000000 --- a/src/Mod/TechDraw/App/DrawViewClipPy.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing Clip Views - - - - addView(DrawView) - Add a View to this ClipView - - - - - removeView(DrawView) - Remove specified View to this ClipView - - - - - getChildViewNames() - get a list of the DrawViews in this ClipView - - - - - diff --git a/src/Mod/TechDraw/App/DrawViewCollectionPy.pyi b/src/Mod/TechDraw/App/DrawViewCollection.pyi similarity index 76% rename from src/Mod/TechDraw/App/DrawViewCollectionPy.pyi rename to src/Mod/TechDraw/App/DrawViewCollection.pyi index 6852681b7f..216c7cbfeb 100644 --- a/src/Mod/TechDraw/App/DrawViewCollectionPy.pyi +++ b/src/Mod/TechDraw/App/DrawViewCollection.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from TechDraw.DrawView import DrawView @export( - Father="DrawViewPy", - Name="DrawViewCollectionPy", - Twin="DrawViewCollection", - TwinPointer="DrawViewCollection", Include="Mod/TechDraw/App/DrawViewCollection.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewPy.h", - FatherNamespace="TechDraw", ) -class DrawViewCollectionPy(DrawView): +class DrawViewCollection(DrawView): """ Feature for creating and manipulating Technical Drawing View Collections + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def addView(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawViewCollectionPy.xml b/src/Mod/TechDraw/App/DrawViewCollectionPy.xml deleted file mode 100644 index ded644e4b3..0000000000 --- a/src/Mod/TechDraw/App/DrawViewCollectionPy.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing View Collections - - - - addView(DrawView object) - Add a new View to this Group. Returns count of views. - - - - - removeView(DrawView object) - Remove specified Viewfrom this Group. Returns count of views in Group. - - - - - diff --git a/src/Mod/TechDraw/App/DrawViewDimExtentPy.pyi b/src/Mod/TechDraw/App/DrawViewDimExtent.pyi similarity index 66% rename from src/Mod/TechDraw/App/DrawViewDimExtentPy.pyi rename to src/Mod/TechDraw/App/DrawViewDimExtent.pyi index a2149365e9..e9aeb5b3ba 100644 --- a/src/Mod/TechDraw/App/DrawViewDimExtentPy.pyi +++ b/src/Mod/TechDraw/App/DrawViewDimExtent.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from TechDraw.DrawViewDimension import DrawViewDimension @export( - Father="DrawViewDimensionPy", - Name="DrawViewDimExtentPy", - Twin="DrawViewDimExtent", - TwinPointer="DrawViewDimExtent", Include="Mod/TechDraw/App/DrawViewDimExtent.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewDimensionPy.h", - FatherNamespace="TechDraw", ) -class DrawViewDimExtentPy(DrawViewDimension): +class DrawViewDimExtent(DrawViewDimension): """ Feature for creating and manipulating Technical Drawing DimExtents + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def tbd(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawViewDimExtentPy.xml b/src/Mod/TechDraw/App/DrawViewDimExtentPy.xml deleted file mode 100644 index 804d2c75da..0000000000 --- a/src/Mod/TechDraw/App/DrawViewDimExtentPy.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing DimExtents - - - - tbd() - returns tbd. - - - - - diff --git a/src/Mod/TechDraw/App/DrawViewDimensionPy.pyi b/src/Mod/TechDraw/App/DrawViewDimension.pyi similarity index 86% rename from src/Mod/TechDraw/App/DrawViewDimensionPy.pyi rename to src/Mod/TechDraw/App/DrawViewDimension.pyi index 207e32ec1e..362f33dee1 100644 --- a/src/Mod/TechDraw/App/DrawViewDimensionPy.pyi +++ b/src/Mod/TechDraw/App/DrawViewDimension.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from TechDraw.DrawView import DrawView @export( - Father="DrawViewPy", - Name="DrawViewDimensionPy", - Twin="DrawViewDimension", - TwinPointer="DrawViewDimension", Include="Mod/TechDraw/App/DrawViewDimension.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewPy.h", - FatherNamespace="TechDraw", ) -class DrawViewDimensionPy(DrawView): +class DrawViewDimension(DrawView): """ Feature for creating and manipulating Technical Drawing Dimensions + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def getRawValue(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawViewDimensionPy.xml b/src/Mod/TechDraw/App/DrawViewDimensionPy.xml deleted file mode 100644 index 62ca01526e..0000000000 --- a/src/Mod/TechDraw/App/DrawViewDimensionPy.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing Dimensions - - - - getRawValue() - returns Dimension value in mm. - - - - - getText() - returns Dimension text. - - - - - getLinearPoints() - returns list of points for linear Dimension - - - - - getArcPoints() - returns list of points for circle/arc Dimension - - - - - getAnglePoints() - returns list of points for angle Dimension - - - - - getAreaPoints() - returns list of values (center, filled area, actual area) for area Dimension. - - - - - getArrowPositions() - returns list of locations or Dimension Arrowheads. Locations are in unscaled coordinates of parent View - - - - - diff --git a/src/Mod/TechDraw/App/DrawViewPartPy.pyi b/src/Mod/TechDraw/App/DrawViewPart.pyi similarity index 97% rename from src/Mod/TechDraw/App/DrawViewPartPy.pyi rename to src/Mod/TechDraw/App/DrawViewPart.pyi index f42b16f290..8cdd911e2c 100644 --- a/src/Mod/TechDraw/App/DrawViewPartPy.pyi +++ b/src/Mod/TechDraw/App/DrawViewPart.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from TechDraw.rawView import DrawView @export( - Father="DrawViewPy", - Name="DrawViewPartPy", - Twin="DrawViewPart", - TwinPointer="DrawViewPart", Include="Mod/TechDraw/App/DrawViewPart.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewPy.h", - FatherNamespace="TechDraw", ) -class DrawViewPartPy(DrawView): +class DrawViewPart(DrawView): """ Feature for creating and manipulating Technical Drawing Part Views + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def getVisibleEdges(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawViewPartPy.xml b/src/Mod/TechDraw/App/DrawViewPartPy.xml deleted file mode 100644 index 6ffc963e7f..0000000000 --- a/src/Mod/TechDraw/App/DrawViewPartPy.xml +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing Part Views - - - - getVisibleEdges([conventionalCoords]) - get the visible edges in the View as Part::TopoShapeEdges. Edges are returned -in conventional coordinates if conventionalCoords is True. The default is to return Qt inverted Y coordinates. - - - - - getVisibleVertexes() - get the visible vertexes as App.Vector in the View's coordinate system. App.Vectors are returned -in conventional coordinates if conventionalCoords is True. The default is to return Qt inverted Y coordinates. - - - - - getHiddenEdges([conventionalCoords]) - get the hidden edges in the View as Part::TopoShapeEdges. Edges are returned -in conventional coordinates if conventionalCoords is True. The default is to return Qt inverted Y coordinates. - - - - - getHiddenVertexes() - get the hidden vertexes as App.Vector in the View's coordinate system. App.Vectors are returned -in conventional coordinates if conventionalCoords is True. The default is to return Qt inverted Y coordinates. - - - - - id = makeCosmeticVertex(p1) - add a CosmeticVertex at p1 (View coordinates). Returns unique id vertex. - - - - - id = makeCosmeticVertex3d(p1) - add a CosmeticVertex at p1 (3d model coordinates). Returns unique id vertex. - - - - - cv = getCosmeticVertex(id) - returns CosmeticVertex with unique id. - - - - - cv = getCosmeticVertexBySelection(name) - returns CosmeticVertex with name (Vertex6). Used in selections. - - - - - removeCosmeticVertex(cv) - remove CosmeticVertex from View. Returns None. - - - - - clearCosmeticVertices() - remove all CosmeticVertices from the View. Returns None. - - - - - tag = makeCosmeticLine(p1, p2) - add a CosmeticEdge from p1 to p2(View coordinates). Returns tag of new CosmeticEdge. - - - - - tag = makeCosmeticLine3D(p1, p2) - add a CosmeticEdge from p1 to p2(3D coordinates). Returns tag of new CosmeticEdge. - - - - - tag = makeCosmeticCircle(center, radius) - add a CosmeticEdge at center with radius radius(View coordinates). Returns tag of new CosmeticEdge. - - - - - tag = makeCosmeticCircleArc(center, radius, start, end) - add a CosmeticEdge at center with radius radius(View coordinates) from start angle to end angle. Returns tag of new CosmeticEdge. - - - - - tag = makeCosmeticCircle3d(center, radius) - add a CosmeticEdge at center (3d point) with radius. Returns tag of new CosmeticEdge. - - - - - tag = makeCosmeticCircleArc3d(center, radius, start, end) - add a CosmeticEdge at center (3d point) with radius from start angle to end angle. Returns tag of new CosmeticEdge. - - - - - ce = getCosmeticEdge(id) - returns CosmeticEdge with unique id. - - - - - ce = getCosmeticEdgeBySelection(name) - returns CosmeticEdge by name (Edge25). Used in selections - - - - - removeCosmeticEdge(ce) - remove CosmeticEdge ce from View. Returns None. - - - - - makeCenterLine(subNames, mode) - draw a center line on this viewPart. SubNames is a list of n Faces, 2 Edges or 2 Vertices (ex [Face1,Face2,Face3]. Returns unique tag of added CenterLine. - - - - - cl = getCenterLine(id) - returns CenterLine with unique id. - - - - - cl = getCenterLineBySelection(name) - returns CenterLine by name (Edge25). Used in selections - - - - - removeCenterLine(cl) - remove CenterLine cl from View. Returns None. - - - - - clearCosmeticEdges() - remove all CosmeticLines from the View. Returns None. - - - - - clearCenterLines() - remove all CenterLines from the View. Returns None. - - - - - clearGeomFormats() - remove all GeomFormats from the View. Returns None. - - - - - formatGeometricEdge(index, style, weight, color, visible). Returns None. - - - - - getEdgeByIndex(edgeIndex). Returns Part.TopoShape. - - - - - getEdgeBySelection(edgeName). Returns Part.TopoShape. - - - - - getVertexByIndex(vertexIndex). Returns Part.TopoShape. - - - - - getVertexBySelection(vertexName). Returns Part.TopoShape. - - - - - projectPoint(vector3d point, [bool invert]). Returns the projection of point in the -projection coordinate system of this DrawViewPart. Optionally inverts the Y coordinate of the -result. - - - - - - point3d = getGeometricCenter() - returns the geometric center of the source shapes. - - - - - requestPaint(). Redraw the graphic for this View. - - - - - diff --git a/src/Mod/TechDraw/App/DrawViewPy.xml b/src/Mod/TechDraw/App/DrawViewPy.xml deleted file mode 100644 index 8b61459a55..0000000000 --- a/src/Mod/TechDraw/App/DrawViewPy.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Feature for creating and manipulating Technical Drawing Views - - - - translateLabel(translationContext, objectBaseName, objectUniqueName). -No return value. Replace the current label with a translated version where possible. - - - - - - float scale = getScale(). Returns the correct scale for this view. Handles whether to -use this view's scale property or a parent's view (as in a projection group). - - - - - - diff --git a/src/Mod/TechDraw/App/DrawViewSymbolPy.pyi b/src/Mod/TechDraw/App/DrawViewSymbol.pyi similarity index 70% rename from src/Mod/TechDraw/App/DrawViewSymbolPy.pyi rename to src/Mod/TechDraw/App/DrawViewSymbol.pyi index decbb8c772..b30eefac83 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbolPy.pyi +++ b/src/Mod/TechDraw/App/DrawViewSymbol.pyi @@ -4,18 +4,16 @@ from Base.Metadata import export from TechDraw.DrawView import DrawView @export( - Father="DrawViewPy", - Name="DrawViewSymbolPy", - Twin="DrawViewSymbol", - TwinPointer="DrawViewSymbol", Include="Mod/TechDraw/App/DrawViewSymbol.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewPy.h", - FatherNamespace="TechDraw", ) -class DrawViewSymbolPy(DrawView): +class DrawViewSymbol(DrawView): """ Feature for creating and manipulating Drawing SVG Symbol Views + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ def dumpSymbol(self) -> Any: diff --git a/src/Mod/TechDraw/App/DrawViewSymbolPy.xml b/src/Mod/TechDraw/App/DrawViewSymbolPy.xml deleted file mode 100644 index fac8392dd3..0000000000 --- a/src/Mod/TechDraw/App/DrawViewSymbolPy.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Feature for creating and manipulating Drawing SVG Symbol Views - - - - dumpSymbol(fileSpec) - dump the contents of Symbol to a file - - - - - diff --git a/src/Mod/TechDraw/App/DrawWeldSymbolPy.pyi b/src/Mod/TechDraw/App/DrawWeldSymbol.pyi similarity index 60% rename from src/Mod/TechDraw/App/DrawWeldSymbolPy.pyi rename to src/Mod/TechDraw/App/DrawWeldSymbol.pyi index 0069900aa8..589aa83a62 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbolPy.pyi +++ b/src/Mod/TechDraw/App/DrawWeldSymbol.pyi @@ -2,16 +2,14 @@ from Base.Metadata import export from TechDraw.DrawView import DrawView @export( - Father="DrawViewPy", - Name="DrawWeldSymbolPy", - Twin="DrawWeldSymbol", - TwinPointer="DrawWeldSymbol", Include="Mod/TechDraw/App/DrawWeldSymbol.h", Namespace="TechDraw", FatherInclude="Mod/TechDraw/App/DrawViewPy.h", - FatherNamespace="TechDraw", ) -class DrawWeldSymbolPy(DrawView): +class DrawWeldSymbol(DrawView): """ Feature for adding welding tiles to leader lines + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ diff --git a/src/Mod/TechDraw/App/DrawWeldSymbolPy.xml b/src/Mod/TechDraw/App/DrawWeldSymbolPy.xml deleted file mode 100644 index 165fac160c..0000000000 --- a/src/Mod/TechDraw/App/DrawWeldSymbolPy.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Feature for adding welding tiles to leader lines - - - - diff --git a/src/Mod/TechDraw/App/GeomFormatPy.pyi b/src/Mod/TechDraw/App/GeomFormat.pyi similarity index 74% rename from src/Mod/TechDraw/App/GeomFormatPy.pyi rename to src/Mod/TechDraw/App/GeomFormat.pyi index 4ed58a36c3..a69a9ee5e9 100644 --- a/src/Mod/TechDraw/App/GeomFormatPy.pyi +++ b/src/Mod/TechDraw/App/GeomFormat.pyi @@ -4,20 +4,17 @@ from Base.PyObjectBase import PyObjectBase from Base.Metadata import constmethod, export @export( - Father="PyObjectBase", - Name="GeomFormatPy", - Twin="GeomFormat", - TwinPointer="GeomFormat", Include="Mod/TechDraw/App/Cosmetic.h", Namespace="TechDraw", - FatherInclude="Base/PyObjectBase.h", - FatherNamespace="Base", Constructor=True, Delete=True, ) -class GeomFormatPy(PyObjectBase): +class GeomFormat(PyObjectBase): """ GeomFormat specifies appearance parameters for TechDraw Geometry objects + + Author: WandererFan (wandererfan@gmail.com) + License: LGPL-2.1-or-later """ @constmethod diff --git a/src/Mod/TechDraw/App/GeomFormatPy.xml b/src/Mod/TechDraw/App/GeomFormatPy.xml deleted file mode 100644 index 2f399d425e..0000000000 --- a/src/Mod/TechDraw/App/GeomFormatPy.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - GeomFormat specifies appearance parameters for TechDraw Geometry objects - - - - Create a clone of this geomformat - - - - - Create a copy of this geomformat - - - - - Gives the tag of the GeomFormat as string. - - - - - diff --git a/src/Tools/bindings/templates/templateClassPyExport.py b/src/Tools/bindings/templates/templateClassPyExport.py index 3f9bb112a9..b339a1aeea 100644 --- a/src/Tools/bindings/templates/templateClassPyExport.py +++ b/src/Tools/bindings/templates/templateClassPyExport.py @@ -35,20 +35,6 @@ def compareFiles(file1, file2): class TemplateClassPyExport(template.ModelTemplate): - # TODO: This is temporary, once all XML files are migrated, this can be removed. - def getPath(self, path): - if self.is_python and not self.export.ModuleName in [ - "Base", - "App", - "Gui", - "Part", - "PartDesign", - "Material", - "Sketcher", - ]: - root, ext = os.path.splitext(path) - return f"{root}_{ext}" - return path def Generate(self): # self.ParentNamespace = "Base" @@ -76,7 +62,7 @@ class TemplateClassPyExport(template.ModelTemplate): os.makedirs(subpath) # Imp.cpp must not exist, neither in outputDir nor in inputDir - outputImp = self.getPath(outputDir + exportName + "Imp.cpp") + outputImp = outputDir + exportName + "Imp.cpp" if not os.path.exists(outputImp): if not os.path.exists(inputDir + exportName + "Imp.cpp"): file = open(outputImp, "wb") @@ -84,12 +70,12 @@ class TemplateClassPyExport(template.ModelTemplate): model.generateTools.replace(self.TemplateImplement, locals(), file) file.close() - outputCpp = self.getPath(outputDir + exportName + ".cpp") + outputCpp = outputDir + exportName + ".cpp" with open(outputCpp, "wb") as file: print("TemplateClassPyExport", "TemplateModule", file.name) model.generateTools.replace(self.TemplateModule, locals(), file) - outputHeader = self.getPath(outputDir + exportName + ".h") + outputHeader = outputDir + exportName + ".h" with open(outputHeader, "wb") as file: print("TemplateClassPyExport", "TemplateHeader", file.name) model.generateTools.replace(self.TemplateHeader, locals(), file) @@ -106,15 +92,15 @@ class TemplateClassPyExport(template.ModelTemplate): if not os.path.exists(inputDir + exportName + "Imp.cpp"): outputImpXml = outputDir + exportName + "Imp.cpp" - outputImpPy = self.getPath(outputDir + exportName + "Imp.cpp") + outputImpPy = outputDir + exportName + "Imp.cpp" compareFiles(outputImpXml, outputImpPy) outputHeaderXml = outputDir + exportName + ".h" - outputHeaderPy = self.getPath(outputDir + exportName + ".h") + outputHeaderPy = outputDir + exportName + ".h" compareFiles(outputHeaderXml, outputHeaderPy) outputCppXml = outputDir + exportName + ".cpp" - outputCppPy = self.getPath(outputDir + exportName + ".cpp") + outputCppPy = outputDir + exportName + ".cpp" compareFiles(outputCppXml, outputCppPy) TemplateHeader = """