Skip to content

Commit b7ea22b

Browse files
committed
[nodes] Replace desc.Node.internalFolder with ${NODE_CACHE_FOLDER}
For all nodes, use the new syntax for relative paths.
1 parent 77beb0a commit b7ea22b

File tree

84 files changed

+148
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+148
-148
lines changed

meshroom/nodes/aliceVision/ApplyCalibration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ class ApplyCalibration(desc.AVCommandLineNode):
4444
name="output",
4545
label="SMData",
4646
description="Path to the output SfMData file.",
47-
value=desc.Node.internalFolder + "sfmData.sfm",
47+
value="${NODE_CACHE_FOLDER}" + "sfmData.sfm",
4848
),
4949
]

meshroom/nodes/aliceVision/CameraCalibration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,6 @@ class CameraCalibration(desc.AVCommandLineNode):
124124
name="output",
125125
label="Output",
126126
description="Output filename for intrinsic [and extrinsic] parameters.",
127-
value=desc.Node.internalFolder + "/cameraCalibration.cal",
127+
value="${NODE_CACHE_FOLDER}" + "cameraCalibration.cal",
128128
),
129129
]

meshroom/nodes/aliceVision/CameraInit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ class CameraInit(desc.AVCommandLineNode, desc.InitNode):
486486
name="output",
487487
label="SfMData",
488488
description="Output SfMData.",
489-
value=desc.Node.internalFolder + "cameraInit.sfm",
489+
value="${NODE_CACHE_FOLDER}" + "cameraInit.sfm",
490490
),
491491
]
492492

meshroom/nodes/aliceVision/CameraLocalization.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,12 @@ class CameraLocalization(desc.AVCommandLineNode):
191191
name="outputAlembic",
192192
label="Alembic",
193193
description="Filename for the SfMData export file (where camera poses will be stored).",
194-
value=desc.Node.internalFolder + "trackedCameras.abc",
194+
value="${NODE_CACHE_FOLDER}" + "trackedCameras.abc",
195195
),
196196
desc.File(
197197
name="outputJSON",
198198
label="JSON File",
199199
description="Filename for the localization results as .json.",
200-
value=desc.Node.internalFolder + "trackedCameras.json",
200+
value="${NODE_CACHE_FOLDER}" + "trackedCameras.json",
201201
),
202202
]

meshroom/nodes/aliceVision/CameraRigCalibration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,6 @@ class CameraRigCalibration(desc.AVCommandLineNode):
156156
name="outfile",
157157
label="Output File",
158158
description="The name of the file to store the calibration data in.",
159-
value=desc.Node.internalFolder + "cameraRigCalibration.rigCal",
159+
value="${NODE_CACHE_FOLDER}" + "cameraRigCalibration.rigCal",
160160
),
161161
]

meshroom/nodes/aliceVision/CameraRigLocalization.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,6 @@ class CameraRigLocalization(desc.AVCommandLineNode):
162162
name="outputAlembic",
163163
label="Alembic",
164164
description="Filename for the SfMData export file (where camera poses will be stored).",
165-
value=desc.Node.internalFolder + "trackedcameras.abc",
165+
value="${NODE_CACHE_FOLDER}" + "trackedcameras.abc",
166166
),
167167
]

meshroom/nodes/aliceVision/CheckerboardCalibration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ class CheckerboardCalibration(desc.AVCommandLineNode):
4747
name="output",
4848
label="SfMData File",
4949
description="Path to the output SfMData file.",
50-
value=desc.Node.internalFolder + "sfmData.sfm",
50+
value="${NODE_CACHE_FOLDER}" + "sfmData.sfm",
5151
)
5252
]

meshroom/nodes/aliceVision/CheckerboardDetection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ class CheckerboardDetection(desc.AVCommandLineNode):
6161
name="output",
6262
label="Folder",
6363
description="Output folder.",
64-
value=desc.Node.internalFolder,
64+
value="${NODE_CACHE_FOLDER}",
6565
),
6666
desc.File(
6767
name="checkerLines",
6868
enabled=lambda node: node.exportDebugImages.value,
6969
label="Checker Lines",
7070
description="Debug images.",
7171
semantic="image",
72-
value=desc.Node.internalFolder + "<VIEW_ID>.png",
72+
value="${NODE_CACHE_FOLDER}" + "<VIEW_ID>.png",
7373
group="", # do not export on the command line
7474
),
7575
]

meshroom/nodes/aliceVision/ColorCheckerCorrection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ class ColorCheckerCorrection(desc.AVCommandLineNode):
6969
name="outSfMData",
7070
label="SfMData",
7171
description="Output SfMData.",
72-
value=lambda attr: (desc.Node.internalFolder + os.path.basename(attr.node.input.value)) if (os.path.splitext(attr.node.input.value)[1] in [".abc", ".sfm"]) else "",
72+
value=lambda attr: ("${NODE_CACHE_FOLDER}" + os.path.basename(attr.node.input.value)) if (os.path.splitext(attr.node.input.value)[1] in [".abc", ".sfm"]) else "",
7373
group="", # do not export on the command line
7474
),
7575
desc.File(
7676
name="output",
7777
label="Folder",
7878
description="Output images folder.",
79-
value=desc.Node.internalFolder,
79+
value="${NODE_CACHE_FOLDER}",
8080
),
8181
]

meshroom/nodes/aliceVision/ColorCheckerDetection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ class ColorCheckerDetection(desc.AVCommandLineNode):
6262
name="outputData",
6363
label="Color Checker Data",
6464
description="Output position and colorimetric data extracted from detected color checkers in the images.",
65-
value=desc.Node.internalFolder + "/ccheckers.json",
65+
value="${NODE_CACHE_FOLDER}" + "ccheckers.json",
6666
),
6767
]

0 commit comments

Comments
 (0)