diff --git a/src/Mod/CAM/App/AreaPy.pyi b/src/Mod/CAM/App/Area.pyi similarity index 94% rename from src/Mod/CAM/App/AreaPy.pyi rename to src/Mod/CAM/App/Area.pyi index 6c2a62ca2d..28048bbe7f 100644 --- a/src/Mod/CAM/App/AreaPy.pyi +++ b/src/Mod/CAM/App/Area.pyi @@ -4,19 +4,13 @@ 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 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..aa335f268a 100644 --- a/src/Mod/CAM/App/FeatureAreaPy.pyi +++ b/src/Mod/CAM/App/FeatureArea.pyi @@ -5,16 +5,10 @@ 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 """ 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..46b3f57256 100644 --- a/src/Mod/CAM/App/FeaturePathCompoundPy.pyi +++ b/src/Mod/CAM/App/FeaturePathCompound.pyi @@ -5,16 +5,11 @@ 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 """ 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 92% rename from src/Mod/CAM/App/PathPy.pyi rename to src/Mod/CAM/App/Path.pyi index e5d9f405e4..9e4c222114 100644 --- a/src/Mod/CAM/App/PathPy.pyi +++ b/src/Mod/CAM/App/Path.pyi @@ -4,19 +4,15 @@ 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 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..8273feddd4 100644 --- a/src/Mod/CAM/App/VoronoiPy.pyi +++ b/src/Mod/CAM/App/Voronoi.pyi @@ -4,19 +4,12 @@ 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 """ 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..91e4ff5f40 100644 --- a/src/Mod/CAM/App/VoronoiCellPy.pyi +++ b/src/Mod/CAM/App/VoronoiCell.pyi @@ -4,20 +4,13 @@ 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 """ 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..828747880e 100644 --- a/src/Mod/CAM/App/VoronoiEdgePy.pyi +++ b/src/Mod/CAM/App/VoronoiEdge.pyi @@ -4,20 +4,13 @@ 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 """ 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..71339eade5 100644 --- a/src/Mod/CAM/App/VoronoiVertexPy.pyi +++ b/src/Mod/CAM/App/VoronoiVertex.pyi @@ -4,20 +4,13 @@ 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 """ 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 88% rename from src/Mod/CAM/PathSimulator/App/PathSimPy.pyi rename to src/Mod/CAM/PathSimulator/App/PathSim.pyi index b85b022a89..0acd15b51d 100644 --- a/src/Mod/CAM/PathSimulator/App/PathSimPy.pyi +++ b/src/Mod/CAM/PathSimulator/App/PathSim.pyi @@ -4,19 +4,14 @@ 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 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..ee479a4f82 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/CAMSimPy.pyi +++ b/src/Mod/CAM/PathSimulator/AppGL/CAMSim.pyi @@ -5,18 +5,13 @@ 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 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/Tools/bindings/templates/templateClassPyExport.py b/src/Tools/bindings/templates/templateClassPyExport.py index ffaac1c5a7..8fb6948400 100644 --- a/src/Tools/bindings/templates/templateClassPyExport.py +++ b/src/Tools/bindings/templates/templateClassPyExport.py @@ -41,6 +41,7 @@ class TemplateClassPyExport(template.ModelTemplate): "Base", "App", "Assembly", + "CAM", "Gui", "Part", "PartDesign",