MAYA-105977: Update restriction error reports based on latest design. #687
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HamedSabri-adsk
added
ufe-usd
ppt-adsk
approved these changes
Jul 28, 2020
HamedSabri-adsk
commented
Jul 28, 2020
| @@ -53,6 +53,10 @@ namespace MayaUsdUtils { | |||
| MAYA_USD_UTILS_PUBLIC | |||
| bool hasSpecs(const UsdPrim&); | |||
|
|
|||
| //! Returns the layer in composition arc where HasSpecs is set to true | |||
| MAYA_USD_UTILS_PUBLIC | |||
| std::vector<SdfLayerHandle> layerInCompositionArcsWithSpec(const UsdPrim& prim); | |||
There was a problem hiding this comment.
@ppt-adsk added this new utility function since the new design for the first restriction rule requires the layer's name to be displayed in the message.
Please see the new string for first rule:
Error Message: Cannot [reparent/rename] [prim_name]. It does not make any contributions in the current layer because its specs are in an external composition arc. Please open [filename.usd] to make direct edits.
HamedSabri-adsk
commented
Jul 28, 2020
| UFE_LOG(err.c_str()); | ||
| throw; | ||
| } | ||
| } |
There was a problem hiding this comment.
Please ignore the tab conversion to dot changes by enabling "Hide whitespace changes" on github.
HamedSabri-adsk
commented
Jul 28, 2020
| @@ -158,8 +166,7 @@ void applyCommandRestriction(const UsdPrim& prim, const std::string& commandName | |||
| layerDisplayNames.append("[" + layer->GetDisplayName() + "]" + ","); | |||
| } | |||
| layerDisplayNames.pop_back(); | |||
| std::string err = TfStringPrintf("Cannot %s [%s] with definitions or opinions on other layers. " | |||
| "Opinions exist in %s", | |||
| std::string err = TfStringPrintf("Cannot %s [%s]. It has definitions or opinions on other layers. Opinions exist in %s", | |||
| commandName.c_str(), | |||
| prim.GetName().GetString().c_str(), | |||
| layerDisplayNames.c_str()); | |||
There was a problem hiding this comment.
@ppt-adsk Updating all the strings inside applyCommandRestriction routine.
HamedSabri-adsk
added
the
ready-for-merge
kxl-adsk
deleted the
sabrih/MAYA-105977/update_strings_restriction_errors
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updated the strings for re-parent/rename restriction rules. There are currently 3 rules in place:
1. Check if a particular node has any specs to contribute to the final composed prim.
Error Message: Cannot [reparent/rename] [prim_name]. It does not make any contributions in the current layer because its specs are in an external composition arc. Please open [filename.usd] to make direct edits.2. Check if we are in the correct edit target to make an edit.
Error Message: Cannot [reparent/rename] [prim_name]. It is defined on another layer. Please set [layername] as the target layer to proceed.3. Check if we have more than 2 layers that contribute to the final composed prim.
Error Message: Cannot [reparent/rename] [prim_name]. It has definitions or opinions on other layers. Opinions exist in [layer name 1], [layer name 2], [layer name 3], [layer name 4].