Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAYA-111346 : AE: Array attribute does not support Nice/Long name. #1380

Merged
merged 2 commits into from
May 3, 2021
Merged

MAYA-111346 : AE: Array attribute does not support Nice/Long name. #1380

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b86c9a
MAYA-111346 : AE: Array attribute does not support Nice/Long name.
spinell-adsk Apr 30, 2021
c694412
Merge branch 'dev_public' into spinell/MAYA-111346/ae_array_nice_long…
spinell-adsk Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions lib/mayaUsd/resources/ae/usdschemabase/ae_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,15 @@ def onReplace(self, *args):

class MetaDataCustomControl(object):
# Custom control for all prim metadata we want to display.
def __init__(self, prim):
def __init__(self, prim, useNiceName):
self.prim = prim
self.useNiceName = useNiceName

# There are four metadata that we always show: primPath, kind, active, instanceable
# We use a dictionary to store the various other metadata that this prim contains.
self.extraMetadata = dict()

def onCreate(self, *args):
# Should we display nice names in AE?
useNiceName = True
if cmds.optionVar(exists='attrEditorIsLongName'):
useNiceName = (cmds.optionVar(q='attrEditorIsLongName') ==1)

# Metadata: PrimPath
# The prim path is for display purposes only - it is not editable, but we
# allow keyboard focus so you copy the value.
Expand Down Expand Up @@ -141,7 +137,7 @@ def onCreate(self, *args):
for k in allMetadata:
# All extra metadata is for display purposes only - it is not editable, but we
# allow keyboard focus so you copy the value.
mdLabel = getPrettyName(k) if useNiceName else k
mdLabel = getPrettyName(k) if self.useNiceName else k
self.extraMetadata[k] = cmds.textFieldGrp(label=mdLabel, editable=False, enableKeyboardFocus=True)

# Update all metadata values.
Expand Down Expand Up @@ -193,9 +189,10 @@ def _onInstanceableChanged(self, value):
# Custom control for all array attribute.
class ArrayCustomControl(object):

def __init__(self, prim, attrName):
def __init__(self, prim, attrName, useNiceName):
self.prim = prim
self.attrName = attrName
self.useNiceName = useNiceName
super(ArrayCustomControl, self).__init__()

def onCreate(self, *args):
Expand All @@ -210,7 +207,8 @@ def onCreate(self, *args):
typeNameStr = str(typeName.scalarType)
typeNameStr += ("[" + str(len(values)) + "]") if hasValue else "[]"

cmds.textFieldGrp(editable=False, label=getPrettyName(self.attrName), text=typeNameStr, annotation=attr.GetDocumentation())
mdLabel = getPrettyName(self.attrName) if self.useNiceName else self.attrName
cmds.textFieldGrp(editable=False, label=mdLabel, text=typeNameStr, annotation=attr.GetDocumentation())

if hasValue:
cmds.popupMenu()
Expand Down Expand Up @@ -275,6 +273,11 @@ def __init__(self, ufeSceneItem):
if cmds.optionVar(exists="mayaUSD_AEShowArrayAttributes"):
self.showArrayAttributes = cmds.optionVar(query="mayaUSD_AEShowArrayAttributes")

# Should we display nice names in AE?
self.useNiceName = True
if cmds.optionVar(exists='attrEditorIsLongName'):
self.useNiceName = (cmds.optionVar(q='attrEditorIsLongName') ==1)

cmds.editorTemplate(beginScrollLayout=True)
self.buildUI()
self.createAppliedSchemasSection()
Expand All @@ -297,7 +300,7 @@ def addControls(self, controls):
for c in controls:
if c not in self.suppressedAttrs:
if self.isArrayAttribute(c):
arrayCustomControl = ArrayCustomControl(self.prim, c)
arrayCustomControl = ArrayCustomControl(self.prim, c, self.useNiceName)
self.defineCustom(arrayCustomControl, c)
else:
cmds.editorTemplate(addControl=[c])
Expand Down Expand Up @@ -390,7 +393,7 @@ def createTransformAttributesSection(self, sectionName, attrsToAdd):
def createMetadataSection(self):
# We don't use createSection() because these are metadata (not attributes).
with ufeAeTemplate.Layout(self, 'Metadata', collapse=True):
metaDataControl = MetaDataCustomControl(self.prim)
metaDataControl = MetaDataCustomControl(self.prim, self.useNiceName)
usdNoticeControl = NoticeListener(self.prim, [metaDataControl])
self.defineCustom(metaDataControl)
self.defineCustom(usdNoticeControl)
Expand Down