-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Add relative paths to nodes as variables #2629
base: develop
Are you sure you want to change the base?
Conversation
53206f9
to
34e1495
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #2629 +/- ##
===========================================
+ Coverage 69.93% 70.47% +0.53%
===========================================
Files 121 123 +2
Lines 7088 7231 +143
===========================================
+ Hits 4957 5096 +139
- Misses 2131 2135 +4 ☔ View full report in Codecov by Sentry. |
8c37fd0
to
3042f94
Compare
3042f94
to
11d9b40
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I should have seen that in the first review...
This property stores the location of the source code for a given node and is not exposed to the QML side.
11d9b40
to
c332237
Compare
Add 2 default entries to the command line variables: - `nodeCacheFolder`, which contains the location of the cache folder - `nodeSourceCodeFolder`, which contains the location of the file describing the node
This is fully replaced with `{nodeCacheFolder}`.
By doing so, invalidation values will evaluate to the same UID independently from whether the attribute's value has been written with an extra "/" or not.
Otherwise, input attributes with variables (either environment ones or local ones) cannot be opened through "Open File", even though "Open Containing Folder" works fine.
e21fc38
to
0dd5c10
Compare
Description
This PR will invalidate all pre-existing graphs.
Failures of the CI will be solved when the following PR will be merged: alicevision/meshroomNodes#12.
This PR adds new variables that can be used in the description of nodes to write relative paths. For each
Node
object, there are currently two variables that are available by default:{nodeCacheFolder}
, which points towards the cache folder for this node (and is effectively the same asdesc.Node.internalFolder
);{nodeSourceCodeFolder}
, which points towards the folder containing the node's description.These variables are resolved with the
cmdVars
dictionary, which contains essentially the {"key": "value"} mapping for all the attributes in a node's command line.desc.Node.internalFolder
is removed as its purpose is fully replaced by{nodeCacheFolder}
, and{nodeSourceCodeFolder}
replaces the absolute path for the Blender script in theScenePreview
node.Features
{nodeCacheFolder}
and{nodeSourceCodeFolder}
to the list of command-line variablesImplementation remarks
For output attributes, we implement a change that will invalidate almost all pre-existing graphs: when computing an output attribute, we want "/path/to/something" to evaluate to the same thing as "/path/to/something/". right-handed "/" are thus stripped from invalidation values when evaluating the UID for an output attribute. This causes all the nodes which had outputs finishing with a "/" to evaluate to a new UID.