bos #19182: Remove redundant 'father' attribute

This commit is contained in:
vsr 2020-05-28 15:24:23 +03:00
parent 8647067a5b
commit 01ead53342

View File

@ -732,8 +732,6 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
GEOM._objref_GEOM_Gen.__init__(self, *args) GEOM._objref_GEOM_Gen.__init__(self, *args)
self.myMaxNbSubShapesAllowed = 0 # auto-publishing is disabled by default self.myMaxNbSubShapesAllowed = 0 # auto-publishing is disabled by default
self.myBuilder = None self.myBuilder = None
self.father = None
self.BasicOp = None self.BasicOp = None
self.CurvesOp = None self.CurvesOp = None
self.PrimOp = None self.PrimOp = None
@ -835,11 +833,11 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
def init_geom(self): def init_geom(self):
self.myStudy = salome.myStudy self.myStudy = salome.myStudy
self.myBuilder = self.myStudy.NewBuilder() self.myBuilder = self.myStudy.NewBuilder()
self.father = self.myStudy.FindComponent("GEOM")
# load data from the study file, if necessary # load data from the study file, if necessary
if self.father: component = self.myStudy.FindComponent("GEOM")
self.myBuilder.LoadWith(self.father, self) if component:
self.myBuilder.LoadWith(component, self)
self.BasicOp = self.GetIBasicOperations () self.BasicOp = self.GetIBasicOperations ()
self.CurvesOp = self.GetICurvesOperations () self.CurvesOp = self.GetICurvesOperations ()
@ -855,11 +853,6 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
self.GroupOp = self.GetIGroupOperations () self.GroupOp = self.GetIGroupOperations ()
self.FieldOp = self.GetIFieldOperations () self.FieldOp = self.GetIFieldOperations ()
# set GEOM as root in the use case tree
self.myUseCaseBuilder = self.myStudy.GetUseCaseBuilder()
self.myUseCaseBuilder.SetRootCurrent()
self.myUseCaseBuilder.Append(self.father)
notebook.myStudy = salome.myStudy notebook.myStudy = salome.myStudy
pass pass
@ -13795,7 +13788,6 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
Returns: Returns:
a new created folder a new created folder
""" """
if not Father: Father = self.father
return self.CreateFolder(Name, Father) return self.CreateFolder(Name, Father)
## Move object to the specified folder ## Move object to the specified folder