Cleaning up xml file generation, and erroneous export annotations from interface bindings.
This commit is contained in:
@@ -6,7 +6,6 @@ from Base.Metadata import export
|
||||
@export(
|
||||
Include="Mod/CAM/App/Area.h",
|
||||
Namespace="Path",
|
||||
ReadOnly=["Sections", "Shapes"],
|
||||
Constructor=True,
|
||||
Delete=True,
|
||||
)
|
||||
|
||||
@@ -8,7 +8,6 @@ from Base.Persistence import Persistence
|
||||
Twin="Toolpath",
|
||||
TwinPointer="Toolpath",
|
||||
Namespace="Path",
|
||||
ReadOnly=["Length", "Size", "BoundBox"],
|
||||
Delete=True,
|
||||
Constructor=True,
|
||||
)
|
||||
|
||||
@@ -7,7 +7,6 @@ from Base.Metadata import export
|
||||
FatherInclude="Base/BaseClassPy.h",
|
||||
Include="Mod/CAM/PathSimulator/App/PathSim.h",
|
||||
Namespace="PathSimulator",
|
||||
ReadOnly=["Tool"],
|
||||
Constructor=True,
|
||||
Delete=True,
|
||||
)
|
||||
|
||||
@@ -35,31 +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",
|
||||
"Assembly",
|
||||
"CAM",
|
||||
"Fem",
|
||||
"Gui",
|
||||
"Import",
|
||||
"Material",
|
||||
"Measure",
|
||||
"Mesh",
|
||||
"Part",
|
||||
"PartDesign",
|
||||
"Points",
|
||||
"Robot",
|
||||
"Sketcher",
|
||||
"Spreadsheet",
|
||||
"Surface",
|
||||
"TechDraw",
|
||||
]:
|
||||
root, ext = os.path.splitext(path)
|
||||
return f"{root}_{ext}"
|
||||
return path
|
||||
|
||||
def Generate(self):
|
||||
# self.ParentNamespace = "Base"
|
||||
@@ -87,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")
|
||||
@@ -95,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)
|
||||
@@ -117,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 = """
|
||||
|
||||
Reference in New Issue
Block a user