suzanne.soy/FreeCAD_assembly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify object name log output

Browse Source
This commit is contained in:
Zheng, Lei 2019-01-01 08:57:01 +08:00
parent b72cc2c86d
commit b1ff90e093
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assembly.py
View File

@ -358,7 +358,7 @@ class AsmElement(AsmBase):
if not isinstance(link,tuple): if not isinstance(link,tuple):
return return
if isTypeOf(link[0],AsmPartGroup): if isTypeOf(link[0],AsmPartGroup):
logger.debug('migrate {}'.format(objName(obj))) logger.debug('migrate {}',objName(obj))
sub = link[1] sub = link[1]
dot = sub.find('.') dot = sub.find('.')
sobj = link[0].getSubObject(sub[:dot+1],1) sobj = link[0].getSubObject(sub[:dot+1],1)

3
constraint.py
View File

@ -636,7 +636,8 @@ _makeProp('AtEnd','App::PropertyBool',
_ordinal = ('1st', '2nd', '3rd', '4th', '5th', '6th', '7th') _ordinal = ('1st', '2nd', '3rd', '4th', '5th', '6th', '7th')
def cstrName(obj): def cstrName(obj):
return '{}<{}>'.format(objName(obj),Constraint.getTypeName(obj)) # return '{}<{}>'.format(objName(obj),Constraint.getTypeName(obj))
return objName(obj)
class Base(with_metaclass(Constraint, object)): class Base(with_metaclass(Constraint, object)):

4
utils.py
View File

@ -53,9 +53,7 @@ def addIconToFCAD(iconFile,path=None):
def objName(obj): def objName(obj):
try: try:
if obj.Label == obj.Name: return getattr(obj,'FullName',obj.Name)
return '"{}#{}"'.format(obj.Document.Name,obj.Name)
return '"{}#{}({})"'.format(obj.Document.Name,obj.Name,obj.Label)
except Exception: except Exception:
return '?' return '?'