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..f764c6036f 100644
--- a/src/Mod/Robot/App/Robot6AxisPy.pyi
+++ b/src/Mod/Robot/App/Robot6Axis.pyi
@@ -4,18 +4,12 @@ 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
"""
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..ec30f9106d 100644
--- a/src/Mod/Robot/App/RobotObjectPy.pyi
+++ b/src/Mod/Robot/App/RobotObject.pyi
@@ -5,16 +5,10 @@ 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
"""
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..34729f9663 100644
--- a/src/Mod/Robot/App/TrajectoryPy.pyi
+++ b/src/Mod/Robot/App/Trajectory.pyi
@@ -4,18 +4,12 @@ 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
"""
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..e01c993a4e 100644
--- a/src/Mod/Robot/App/WaypointPy.pyi
+++ b/src/Mod/Robot/App/Waypoint.pyi
@@ -4,18 +4,12 @@ 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
"""
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..c222bb0bf2
--- /dev/null
+++ b/src/Mod/Spreadsheet/App/PropertyColumnWidths.pyi
@@ -0,0 +1,12 @@
+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
+ """
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..29a40ecf57 100644
--- a/src/Mod/Spreadsheet/App/PropertyRowHeightsPy.pyi
+++ b/src/Mod/Spreadsheet/App/PropertyRowHeights.pyi
@@ -2,17 +2,11 @@ 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
"""
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..d9a7e71260 100644
--- a/src/Mod/Spreadsheet/App/PropertySheetPy.pyi
+++ b/src/Mod/Spreadsheet/App/PropertySheet.pyi
@@ -2,20 +2,14 @@ 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
"""
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..08d4ca43a8 100644
--- a/src/Mod/Spreadsheet/App/SheetPy.pyi
+++ b/src/Mod/Spreadsheet/App/Sheet.pyi
@@ -5,17 +5,11 @@ 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
"""
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..641eb78672 100644
--- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPy.pyi
+++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.pyi
@@ -5,16 +5,12 @@ 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
"""
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..bc996f65a2 100644
--- a/src/Mod/Surface/App/Blending/BlendCurvePy.pyi
+++ b/src/Mod/Surface/App/Blending/BlendCurve.pyi
@@ -4,18 +4,12 @@ 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)
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..6c3cc229e5 100644
--- a/src/Mod/Surface/App/Blending/BlendPointPy.pyi
+++ b/src/Mod/Surface/App/Blending/BlendPoint.pyi
@@ -4,18 +4,12 @@ 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])
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/Tools/bindings/templates/templateClassPyExport.py b/src/Tools/bindings/templates/templateClassPyExport.py
index 19b6ceb422..54d2fb56fe 100644
--- a/src/Tools/bindings/templates/templateClassPyExport.py
+++ b/src/Tools/bindings/templates/templateClassPyExport.py
@@ -45,13 +45,16 @@ class TemplateClassPyExport(template.ModelTemplate):
"Fem",
"Gui",
"Import",
+ "Material",
"Measure",
"Mesh",
"Part",
"PartDesign",
"Points",
- "Material",
+ "Robot",
"Sketcher",
+ "Spreadsheet",
+ "Surface",
]:
root, ext = os.path.splitext(path)
return f"{root}_{ext}"