Merge pull request #9165 from morganrallen/path_prop_enum_init_reorder
Path: set enumeration default properties after `.initOperation`
This commit is contained in:
@@ -332,12 +332,6 @@ class ObjectOp(object):
|
||||
),
|
||||
)
|
||||
|
||||
for n in self.opPropertyEnumerations():
|
||||
Path.Log.debug("n: {}".format(n))
|
||||
Path.Log.debug("n[0]: {} n[1]: {}".format(n[0], n[1]))
|
||||
if hasattr(obj, n[0]):
|
||||
setattr(obj, n[0], n[1])
|
||||
|
||||
# members being set later
|
||||
self.commandlist = None
|
||||
self.horizFeed = None
|
||||
@@ -353,6 +347,12 @@ class ObjectOp(object):
|
||||
|
||||
self.initOperation(obj)
|
||||
|
||||
for n in self.opPropertyEnumerations():
|
||||
Path.Log.debug("n: {}".format(n))
|
||||
Path.Log.debug("n[0]: {} n[1]: {}".format(n[0], n[1]))
|
||||
if hasattr(obj, n[0]):
|
||||
setattr(obj, n[0], n[1])
|
||||
|
||||
if not hasattr(obj, "DoNotSetDefaultValues") or not obj.DoNotSetDefaultValues:
|
||||
if parentJob:
|
||||
self.job = PathUtils.addToJob(obj, jobname=parentJob.Name)
|
||||
|
||||
Reference in New Issue
Block a user