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.

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

Windows: Fixed path separators for usdview stylesheet #113

Merged
merged 2 commits into from
Jan 29, 2017

Conversation

krzykli
Copy link
Contributor

@krzykli krzykli commented Nov 30, 2016

Replaced Windows style slashes with forward slashes so that the path can be digested correctly in the Qt style sheet.

Also removed redundant slash at the end of resourceDir variable, since this separator is added in usdviewstyle.qss

…can be digested correctly in the stylesheet.

Also removed redundant slash at the end of resourceDir, since this separator is added in usdviewstyle.qss.
@sunyab
Copy link
Contributor

sunyab commented Dec 8, 2016

Hi @krzykli, we ask all potential contributors to sign a CLA before contributing any changes to the project. You can find more info here: http://openusd.org/docs/Contributing-to-USD.html

Once we receive a CLA from you, we can have a look at merging your changes in. Thanks!

@krzykli
Copy link
Contributor Author

krzykli commented Dec 8, 2016

Thanks @sunyab, this has been taken care of. Apologies for missing that!


# find the resource directory
resourceDir = os.path.dirname(os.path.realpath(__file__)) + "/"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @krzykli, sorry for the delay on this. I noticed that at line 162 we call os.path.join, which will reintroduce a '' character to the path given to open(...) on Windows. This seems to work but feels a little odd. I think it'd be better if we leave line 155 the way it was, move the resourceDir.replace call to line 163, and add a comment stating we need to replace the slashes because the Qt stylesheet needs all slashes to be '/'. How does that sound?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @sunyab, sounds good to me. I've addressed it on my branch.

@pixar-oss pixar-oss merged commit 8e19c38 into PixarAnimationStudios:dev Jan 29, 2017
pixar-oss added a commit that referenced this pull request Jan 29, 2017
Windows: Fixed path separators for usdview stylesheet
@krzykli krzykli deleted the stylesheetFix2 branch January 30, 2017 00:11
AdamFelt pushed a commit to autodesk-forks/USD that referenced this pull request Oct 11, 2022
…ios#113)

Add MarkDirty to SimpleTextAdapater so that if the points is dirty, we will regenerate the geometries.
Save the geometries in the SimpleTextAdapter rather than in the UsdPrim, so that we can modify the geometries in multiple thread.

(cherry picked from commit 77c367e455e24a1e452b058a72ff7c57ce6e237d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants