Skip to content

Commit

Permalink
Fix Proxy Obj Type
Browse files Browse the repository at this point in the history
  • Loading branch information
KeithSloan committed Jun 12, 2024
1 parent 500e97d commit c58ed74
Showing 1 changed file with 40 additions and 0 deletions.
40 changes: 40 additions & 0 deletions freecad/gdml/GDMLObjects.py
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,7 @@ def __init__(
# this makes Placement via Phyvol easier and allows copies etc
obj.Proxy = self
self.Type = "GDMLArb8"
obj.Proxy.Type = "GDMLArb8"
self.colour = colour

def onChanged(self, fp, prop):
Expand Down Expand Up @@ -712,6 +713,7 @@ def __init__(self, obj, x, y, z, lunit, material, colour=None):
self.Type = "GDMLBox"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLBox"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -820,6 +822,7 @@ def __init__(
self.Type = "GDMLCone"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLCone"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -941,6 +944,7 @@ def __init__(self, obj, dx, dy, zmax, zcut, lunit, material, colour=None):
self.Type = "GDMLElCone"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLElCone"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -1052,6 +1056,7 @@ def __init__(
self.Type = "GDMLEllipsoid"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLEllipsoid"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -1156,6 +1161,7 @@ def __init__(self, obj, dx, dy, dz, lunit, material, colour=None):
self.Type = "GDMLElTube"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLElTube"

def onChanged(self, fp, prop):
# print(fp.Label+" State : "+str(fp.State)+" prop : "+prop)
Expand Down Expand Up @@ -1220,6 +1226,7 @@ def __init__(self, obj, r, lunit, material, colour=None):
self.Object = obj
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLOrb"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -1313,6 +1320,7 @@ def __init__(
self.colour = colour
self.Object = obj
obj.Proxy = self
obj.Proxy.Type = "GDMLPara"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -1459,6 +1467,7 @@ def __init__(
self.colour = colour
self.Object = obj
obj.Proxy = self
obj.Proxy.Type = "GDMLHype"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -1588,6 +1597,7 @@ def __init__(self, obj, rlo, rhi, dz, lunit, material, colour=None):
self.colour = colour
self.Object = obj
obj.Proxy = self
obj.Proxy.Type = "GDMLParaboloid"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -1697,6 +1707,7 @@ def __init__(
self.colour = colour
self.Object = obj
obj.Proxy = self
obj.Proxy.Type = "GDMLPolyhedra"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -1897,6 +1908,7 @@ def __init__(
self.colour = colour
self.Object = obj
obj.Proxy = self
obj.Proxy.Type = "GDMLGenericPolyhedra"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -2047,6 +2059,7 @@ def __init__(
self.Type = "GDMLTorus"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLTorus"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -2170,6 +2183,7 @@ def __init__(
self.Type = "GDMLTwistedbox"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLTwistedbox"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -2332,6 +2346,7 @@ def __init__(
# this makes Placement via Phyvol easier and allows copies etc
obj.Proxy = self
self.Type = "GDMLTwistedtrap"
obj.Proxy.Type = "GDMLTwistedtrap"
self.colour = colour

def onChanged(self, fp, prop):
Expand Down Expand Up @@ -2511,6 +2526,7 @@ def __init__(
self.Type = "GDMLTwistedtrd"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLTwistedtrd"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -2657,6 +2673,7 @@ def __init__(
self.Type = "GDMLTwistedtubs"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLTwistedtubs"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -2774,6 +2791,7 @@ def __init__(self, obj, lunit, material, colour=None):
self.Type = "GDMLXtru"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLXtru"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -2892,6 +2910,7 @@ def __init__(self, obj, x, y):
self.Type = "Vertex"
self.Object = obj
obj.Proxy = self
obj.Proxy.Type = "Vertex"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -2931,6 +2950,7 @@ def __init__(
obj.setEditorMode("Type", 1)
self.Type = "section"
obj.Proxy = self
obj.Proxy.Type = "section"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand All @@ -2956,6 +2976,7 @@ def __init__(self, obj, rmin, rmax, z):
obj.addProperty("App::PropertyFloat", "z", "zplane", "z").z = z
self.Type = "zplane"
obj.Proxy = self
obj.Proxy.Type = "zplane"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand All @@ -2981,6 +3002,7 @@ def __init__(self, obj, r, z):
).z = z
self.Type = "zplane"
obj.Proxy = self
obj.Proxy.Type = "zplane"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -3030,6 +3052,7 @@ def __init__(
self.Type = "GDMLPolycone"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLPolycone"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -3154,6 +3177,7 @@ def __init__(
self.Type = "GDMLGenericPolycone"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLGenericPolycone"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -3263,6 +3287,7 @@ def __init__(
# this makes Placement via Phyvol easier and allows copies etc
obj.Proxy = self
self.Type = "GDMLSphere"
obj.Proxy.Type = "GDMLSphere"
self.colour = colour

def onChanged(self, fp, prop):
Expand Down Expand Up @@ -3481,6 +3506,7 @@ def __init__(
# this makes Placement via Phyvol easier and allows copies etc
obj.Proxy = self
self.Type = "GDMLTrap"
obj.Proxy.Type = "GDMLTrap"
self.colour = colour

def onChanged(self, fp, prop):
Expand Down Expand Up @@ -3624,6 +3650,7 @@ def __init__(self, obj, z, x1, x2, y1, y2, lunit, material, colour=None):
# this makes Placement via Phyvol easier and allows copies etc
obj.Proxy = self
self.Type = "GDMLTrd"
obj.Proxy.Type = "GDMLTrd"
self.colour = colour

def onChanged(self, fp, prop):
Expand Down Expand Up @@ -3735,6 +3762,7 @@ def __init__(
# this makes Placement via Phyvol easier and allows copies etc
obj.Proxy = self
self.Type = "GDMLTube"
obj.Proxy.Type = "GDMLTube"
self.colour = colour

def onChanged(self, fp, prop):
Expand Down Expand Up @@ -3873,6 +3901,7 @@ def __init__(
# this makes Placement via Phyvol easier and allows copies etc
obj.Proxy = self
self.Type = "GDMLcutTube"
obj.Proxy.Type = "GDMLcutTube"
self.colour = colour

def onChanged(self, fp, prop):
Expand Down Expand Up @@ -4034,6 +4063,7 @@ def __init__(self, obj, x, y, z, lunit):
self.Type = "GDMLVertex"
self.Object = obj
obj.Proxy = self
obj.Proxy.Type = "GDMLVertex"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -4067,6 +4097,7 @@ def __init__(self, obj, v1, v2, v3, vtype):
obj.vtype = ["ABSOLUTE", "RELATIVE"].index(vtype)
self.Type = "GDMLTriangular"
obj.Proxy = self
obj.Proxy.Type = "GDMLTriangular"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand All @@ -4090,6 +4121,7 @@ def __init__(self, obj, v1, v2, v3, v4, vtype):
obj.vtype = 0
self.Type = "GDMLQuadrangular"
obj.Proxy = self
obj.Proxy.Type = "GDMLQuadrangular"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -4162,6 +4194,7 @@ def __init__(
self.Object = obj
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLGmshTessellated"

def updateParams(self, vertex, facets, flag):
self.Vertex = vertex
Expand Down Expand Up @@ -4319,6 +4352,7 @@ def __init__(
self.Type = "GDMLTessellated"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLTessellated"

def updateParams(self, vertex, facets, flag):
# print('Update Params & Shape')
Expand Down Expand Up @@ -4882,6 +4916,7 @@ def __init__(self, obj, v1, v2, v3, v4, lunit, material, colour=None):
self.Type = "GDMLTetra"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLTetra"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -4956,6 +4991,7 @@ def __init__(self, obj, tetra, lunit, material, colour=None):
self.Type = "GDMLTetrahedron"
self.colour = colour
obj.Proxy = self
obj.Proxy.Type = "GDMLTetrahedron"

def onChanged(self, fp, prop):
"""Do something when a property has changed"""
Expand Down Expand Up @@ -5034,6 +5070,7 @@ def __init__(self, obj, FilesEntity, sectionDict):
).structure = sectionDict.get("structure", "")
self.Type = "GDMLFiles"
obj.Proxy = self
obj.Proxy.Type = "GDMLFiles"

def execute(self, fp):
"""Do something when doing a recomputation, this method is mandatory"""
Expand Down Expand Up @@ -5401,6 +5438,7 @@ def __init__(self, obj, path):
obj.Proxy = self
self.Object = obj
self.Type = "GDMLPartStep"
obj.Proxy.Type = "GDMLPartStep"
loadShape = Part.Shape()
loadShape.read(path)
self.Object.Shape = loadShape
Expand Down Expand Up @@ -5431,6 +5469,7 @@ def __init__(self, obj, path):
).path = path
obj.Proxy = self
self.Type = "GDMLPartBrep"
obj.Proxy.Type = "GDMLPartBrep"
self.Object = obj
loadShape = Part.Shape()
loadShape.read(path)
Expand Down Expand Up @@ -5463,6 +5502,7 @@ def __init__(self, obj, path):
).path = path
obj.Proxy = self
self.Type = "GDMLPartShell"
obj.Proxy.Type = "GDMLPartShell"
self.Object = obj
loadShape = Part.Shape()
loadShape.read(path)
Expand Down

0 comments on commit c58ed74

Please sign in to comment.