Merge pull request #2440 from alicevision/dev/sortToSave

File export ordering
This commit is contained in:
Candice Bentéjac 2024-06-17 11:35:55 +02:00 committed by GitHub
commit 154babbf5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 1478 additions and 1471 deletions

View file

@ -1291,7 +1291,9 @@ class Graph(BaseObject):
node._applyExpr()
def toDict(self):
return {k: node.toDict() for k, node in self._nodes.objects.items()}
nodes = {k: node.toDict() for k, node in self._nodes.objects.items()}
nodes = dict(sorted(nodes.items()))
return nodes
@Slot(result=str)
def asString(self):
@ -1305,14 +1307,18 @@ class Graph(BaseObject):
self.header[Graph.IO.Keys.ReleaseVersion] = meshroom.__version__
self.header[Graph.IO.Keys.FileVersion] = Graph.IO.__version__
# store versions of node types present in the graph (excluding CompatibilityNode instances)
# Store versions of node types present in the graph (excluding CompatibilityNode instances)
# and remove duplicates
usedNodeTypes = set([n.nodeDesc.__class__ for n in self._nodes if isinstance(n, Node)])
self.header[Graph.IO.Keys.NodesVersions] = {
# Convert to node types to "name: version"
nodesVersions = {
"{}".format(p.__name__): meshroom.core.nodeVersion(p, "0.0")
for p in usedNodeTypes
}
# Sort them by name (to avoid random order changing from one save to another)
nodesVersions = dict(sorted(nodesVersions.items()))
# Add it the header
self.header[Graph.IO.Keys.NodesVersions] = nodesVersions
self.header["template"] = template
data = {}

View file

@ -5,34 +5,48 @@
"fileVersion": "1.1",
"template": true,
"nodesVersions": {
"ExportAnimatedCamera": "2.0",
"Texturing": "6.0",
"ImageMatching": "2.0",
"Publish": "1.3",
"MeshFiltering": "3.0",
"MeshDecimate": "1.0",
"DepthMapFilter": "4.0",
"ExportDistortion": "1.0",
"PrepareDenseScene": "3.1",
"ImageMatchingMultiSfM": "1.0",
"Meshing": "7.0",
"KeyframeSelection": "5.0",
"CheckerboardDetection": "1.0",
"ApplyCalibration": "1.0",
"CameraInit": "10.0",
"CheckerboardDetection": "1.0",
"ConvertSfMFormat": "2.0",
"DepthMap": "5.0",
"SfMTransfer": "2.1",
"StructureFromMotion": "3.3",
"DepthMapFilter": "4.0",
"DistortionCalibration": "4.0",
"SfMTriangulation": "1.0",
"FeatureMatching": "2.0",
"ScenePreview": "2.0",
"ImageSegmentation": "1.2",
"ExportAnimatedCamera": "2.0",
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"CameraInit": "10.0"
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0",
"ImageSegmentation": "1.2",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
"MeshFiltering": "3.0",
"Meshing": "7.0",
"PrepareDenseScene": "3.1",
"Publish": "1.3",
"ScenePreview": "2.0",
"SfMTransfer": "2.1",
"SfMTriangulation": "1.0",
"StructureFromMotion": "3.3",
"Texturing": "6.0"
}
},
"graph": {
"ApplyCalibration_1": {
"nodeType": "ApplyCalibration",
"position": [
0,
0
],
"inputs": {
"input": "{CameraInit_1.output}",
"calibration": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
@ -44,6 +58,50 @@
"color": "#575963"
}
},
"CameraInit_2": {
"nodeType": "CameraInit",
"position": [
-600,
-160
],
"inputs": {},
"internalInputs": {
"label": "CameraInitLensGrid",
"color": "#302e2e"
}
},
"CheckerboardDetection_1": {
"nodeType": "CheckerboardDetection",
"position": [
-400,
-160
],
"inputs": {
"input": "{CameraInit_2.output}",
"useNestedGrids": true,
"exportDebugImages": true
},
"internalInputs": {
"color": "#302e2e"
}
},
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
3000,
200
],
"inputs": {
"input": "{ExportAnimatedCamera_1.input}",
"fileExt": "json",
"describerTypes": "{StructureFromMotion_1.describerTypes}",
"structure": false,
"observations": false
},
"internalInputs": {
"color": "#4c594c"
}
},
"DepthMapFilter_1": {
"nodeType": "DepthMapFilter",
"position": [
@ -73,6 +131,47 @@
"color": "#3f3138"
}
},
"DistortionCalibration_1": {
"nodeType": "DistortionCalibration",
"position": [
-200,
-160
],
"inputs": {
"input": "{CheckerboardDetection_1.input}",
"checkerboards": "{CheckerboardDetection_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"position": [
1600,
200
],
"inputs": {
"input": "{StructureFromMotion_1.output}",
"exportUndistortedImages": true
},
"internalInputs": {
"color": "#80766f"
}
},
"ExportDistortion_1": {
"nodeType": "ExportDistortion",
"position": [
0,
-160
],
"inputs": {
"input": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
@ -105,6 +204,39 @@
"color": "#575963"
}
},
"FeatureMatching_2": {
"nodeType": "FeatureMatching",
"position": [
1200,
360
],
"inputs": {
"input": "{ImageMatching_2.input}",
"featuresFolders": "{ImageMatching_2.featuresFolders}",
"imagePairsList": "{ImageMatching_2.output}"
},
"internalInputs": {
"label": "FeatureMatchingAllFrames",
"color": "#80766f"
}
},
"FeatureMatching_3": {
"nodeType": "FeatureMatching",
"position": [
1200,
200
],
"inputs": {
"input": "{ImageMatchingMultiSfM_1.outputCombinedSfM}",
"featuresFolders": "{ImageMatchingMultiSfM_1.featuresFolders}",
"imagePairsList": "{ImageMatchingMultiSfM_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
},
"internalInputs": {
"label": "FeatureMatchingFramesToKeyframes",
"color": "#80766f"
}
},
"ImageMatchingMultiSfM_1": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
@ -143,6 +275,39 @@
"color": "#575963"
}
},
"ImageMatching_2": {
"nodeType": "ImageMatching",
"position": [
1000,
360
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "Sequential",
"nbNeighbors": 20
},
"internalInputs": {
"color": "#80766f"
}
},
"ImageSegmentation_1": {
"nodeType": "ImageSegmentation",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
},
"internalInputs": {
"color": "#575963"
}
},
"KeyframeSelection_1": {
"nodeType": "KeyframeSelection",
"position": [
@ -189,6 +354,24 @@
"color": "#3f3138"
}
},
"Meshing_1": {
"nodeType": "Meshing",
"position": [
2600,
0
],
"inputs": {
"input": "{DepthMapFilter_1.input}",
"depthMapsFolder": "{DepthMapFilter_1.output}",
"estimateSpaceFromSfM": false,
"minStep": 1,
"fullWeight": 10.0,
"saveRawDensePointCloud": true
},
"internalInputs": {
"color": "#3f3138"
}
},
"PrepareDenseScene_1": {
"nodeType": "PrepareDenseScene",
"position": [
@ -206,6 +389,37 @@
"color": "#3f3138"
}
},
"Publish_1": {
"nodeType": "Publish",
"position": [
3574,
166
],
"inputs": {
"inputFiles": [
"{ExportAnimatedCamera_1.output}",
"{Texturing_1.output}",
"{ScenePreview_1.output}",
"{ExportDistortion_1.output}"
]
}
},
"ScenePreview_1": {
"nodeType": "ScenePreview",
"position": [
3200,
200
],
"inputs": {
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentation_1.output}"
},
"internalInputs": {
"color": "#4c594c"
}
},
"SfMTransfer_1": {
"nodeType": "SfMTransfer",
"position": [
@ -239,157 +453,6 @@
"color": "#3f3138"
}
},
"Texturing_1": {
"nodeType": "Texturing",
"position": [
3200,
0
],
"inputs": {
"input": "{Meshing_1.output}",
"imagesFolder": "{PrepareDenseScene_1.output}",
"inputMesh": "{MeshDecimate_1.output}"
},
"internalInputs": {
"color": "#3f3138"
}
},
"Publish_1": {
"nodeType": "Publish",
"position": [
3574,
166
],
"inputs": {
"inputFiles": [
"{ExportAnimatedCamera_1.output}",
"{Texturing_1.output}",
"{ScenePreview_1.output}",
"{ExportDistortion_1.output}"
]
}
},
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"position": [
1600,
200
],
"inputs": {
"input": "{StructureFromMotion_1.output}",
"exportUndistortedImages": true
},
"internalInputs": {
"color": "#80766f"
}
},
"Meshing_1": {
"nodeType": "Meshing",
"position": [
2600,
0
],
"inputs": {
"input": "{DepthMapFilter_1.input}",
"depthMapsFolder": "{DepthMapFilter_1.output}",
"estimateSpaceFromSfM": false,
"minStep": 1,
"fullWeight": 10.0,
"saveRawDensePointCloud": true
},
"internalInputs": {
"color": "#3f3138"
}
},
"CheckerboardDetection_1": {
"nodeType": "CheckerboardDetection",
"position": [
-400,
-160
],
"inputs": {
"input": "{CameraInit_2.output}",
"useNestedGrids": true,
"exportDebugImages": true
},
"internalInputs": {
"color": "#302e2e"
}
},
"DistortionCalibration_1": {
"nodeType": "DistortionCalibration",
"position": [
-200,
-160
],
"inputs": {
"input": "{CheckerboardDetection_1.input}",
"checkerboards": "{CheckerboardDetection_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"ExportDistortion_1": {
"nodeType": "ExportDistortion",
"position": [
0,
-160
],
"inputs": {
"input": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"ApplyCalibration_1": {
"nodeType": "ApplyCalibration",
"position": [
0,
0
],
"inputs": {
"input": "{CameraInit_1.output}",
"calibration": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"ScenePreview_1": {
"nodeType": "ScenePreview",
"position": [
3200,
200
],
"inputs": {
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentation_1.output}"
},
"internalInputs": {
"color": "#4c594c"
}
},
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
3000,
200
],
"inputs": {
"input": "{ExportAnimatedCamera_1.input}",
"fileExt": "json",
"describerTypes": "{StructureFromMotion_1.describerTypes}",
"structure": false,
"observations": false
},
"internalInputs": {
"color": "#4c594c"
}
},
"StructureFromMotion_1": {
"nodeType": "StructureFromMotion",
"position": [
@ -418,21 +481,6 @@
"color": "#80766f"
}
},
"ImageSegmentation_1": {
"nodeType": "ImageSegmentation",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
},
"internalInputs": {
"color": "#575963"
}
},
"StructureFromMotion_2": {
"nodeType": "StructureFromMotion",
"position": [
@ -456,67 +504,19 @@
"color": "#575963"
}
},
"FeatureMatching_2": {
"nodeType": "FeatureMatching",
"Texturing_1": {
"nodeType": "Texturing",
"position": [
1200,
360
3200,
0
],
"inputs": {
"input": "{ImageMatching_2.input}",
"featuresFolders": "{ImageMatching_2.featuresFolders}",
"imagePairsList": "{ImageMatching_2.output}"
"input": "{Meshing_1.output}",
"imagesFolder": "{PrepareDenseScene_1.output}",
"inputMesh": "{MeshDecimate_1.output}"
},
"internalInputs": {
"label": "FeatureMatchingAllFrames",
"color": "#80766f"
}
},
"ImageMatching_2": {
"nodeType": "ImageMatching",
"position": [
1000,
360
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "Sequential",
"nbNeighbors": 20
},
"internalInputs": {
"color": "#80766f"
}
},
"CameraInit_2": {
"nodeType": "CameraInit",
"position": [
-600,
-160
],
"inputs": {},
"internalInputs": {
"label": "CameraInitLensGrid",
"color": "#302e2e"
}
},
"FeatureMatching_3": {
"nodeType": "FeatureMatching",
"position": [
1200,
200
],
"inputs": {
"input": "{ImageMatchingMultiSfM_1.outputCombinedSfM}",
"featuresFolders": "{ImageMatchingMultiSfM_1.featuresFolders}",
"imagePairsList": "{ImageMatchingMultiSfM_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
},
"internalInputs": {
"label": "FeatureMatchingFramesToKeyframes",
"color": "#80766f"
"color": "#3f3138"
}
}
}

View file

@ -5,31 +5,44 @@
"fileVersion": "1.1",
"template": true,
"nodesVersions": {
"ExportAnimatedCamera": "2.0",
"Texturing": "6.0",
"ImageMatching": "2.0",
"Publish": "1.3",
"MeshFiltering": "3.0",
"MeshDecimate": "1.0",
"DepthMapFilter": "4.0",
"PrepareDenseScene": "3.1",
"ImageMatchingMultiSfM": "1.0",
"Meshing": "7.0",
"KeyframeSelection": "5.0",
"ApplyCalibration": "1.0",
"CameraInit": "10.0",
"ConvertSfMFormat": "2.0",
"DepthMap": "5.0",
"SfMTransfer": "2.1",
"StructureFromMotion": "3.3",
"SfMTriangulation": "1.0",
"FeatureMatching": "2.0",
"ScenePreview": "2.0",
"ImageSegmentation": "1.2",
"DepthMapFilter": "4.0",
"ExportAnimatedCamera": "2.0",
"FeatureExtraction": "1.3",
"CameraInit": "10.0"
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0",
"ImageSegmentation": "1.2",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
"MeshFiltering": "3.0",
"Meshing": "7.0",
"PrepareDenseScene": "3.1",
"Publish": "1.3",
"ScenePreview": "2.0",
"SfMTransfer": "2.1",
"SfMTriangulation": "1.0",
"StructureFromMotion": "3.3",
"Texturing": "6.0"
}
},
"graph": {
"ApplyCalibration_1": {
"nodeType": "ApplyCalibration",
"position": [
0,
0
],
"inputs": {
"input": "{CameraInit_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
@ -41,6 +54,23 @@
"color": "#575963"
}
},
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
3000,
200
],
"inputs": {
"input": "{ExportAnimatedCamera_1.input}",
"fileExt": "json",
"describerTypes": "{StructureFromMotion_1.describerTypes}",
"structure": false,
"observations": false
},
"internalInputs": {
"color": "#4c594c"
}
},
"DepthMapFilter_1": {
"nodeType": "DepthMapFilter",
"position": [
@ -70,6 +100,20 @@
"color": "#3f3138"
}
},
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"position": [
1600,
200
],
"inputs": {
"input": "{StructureFromMotion_1.output}",
"exportUndistortedImages": true
},
"internalInputs": {
"color": "#80766f"
}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
@ -102,6 +146,39 @@
"color": "#575963"
}
},
"FeatureMatching_2": {
"nodeType": "FeatureMatching",
"position": [
1200,
360
],
"inputs": {
"input": "{ImageMatching_2.input}",
"featuresFolders": "{ImageMatching_2.featuresFolders}",
"imagePairsList": "{ImageMatching_2.output}"
},
"internalInputs": {
"label": "FeatureMatchingAllFrames",
"color": "#80766f"
}
},
"FeatureMatching_3": {
"nodeType": "FeatureMatching",
"position": [
1200,
200
],
"inputs": {
"input": "{ImageMatchingMultiSfM_1.outputCombinedSfM}",
"featuresFolders": "{ImageMatchingMultiSfM_1.featuresFolders}",
"imagePairsList": "{ImageMatchingMultiSfM_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
},
"internalInputs": {
"label": "FeatureMatchingFramesToKeyframes",
"color": "#80766f"
}
},
"ImageMatchingMultiSfM_1": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
@ -140,6 +217,39 @@
"color": "#575963"
}
},
"ImageMatching_2": {
"nodeType": "ImageMatching",
"position": [
1000,
360
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "Sequential",
"nbNeighbors": 20
},
"internalInputs": {
"color": "#80766f"
}
},
"ImageSegmentation_1": {
"nodeType": "ImageSegmentation",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
},
"internalInputs": {
"color": "#575963"
}
},
"KeyframeSelection_1": {
"nodeType": "KeyframeSelection",
"position": [
@ -186,6 +296,24 @@
"color": "#3f3138"
}
},
"Meshing_1": {
"nodeType": "Meshing",
"position": [
2600,
0
],
"inputs": {
"input": "{DepthMapFilter_1.input}",
"depthMapsFolder": "{DepthMapFilter_1.output}",
"estimateSpaceFromSfM": false,
"minStep": 1,
"fullWeight": 10.0,
"saveRawDensePointCloud": true
},
"internalInputs": {
"color": "#3f3138"
}
},
"PrepareDenseScene_1": {
"nodeType": "PrepareDenseScene",
"position": [
@ -203,6 +331,37 @@
"color": "#3f3138"
}
},
"Publish_1": {
"nodeType": "Publish",
"position": [
3574,
166
],
"inputs": {
"inputFiles": [
"{ExportAnimatedCamera_1.output}",
"{Texturing_1.output}",
"{ScenePreview_1.output}",
""
]
}
},
"ScenePreview_1": {
"nodeType": "ScenePreview",
"position": [
3200,
200
],
"inputs": {
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentation_1.output}"
},
"internalInputs": {
"color": "#4c594c"
}
},
"SfMTransfer_1": {
"nodeType": "SfMTransfer",
"position": [
@ -236,114 +395,6 @@
"color": "#3f3138"
}
},
"Texturing_1": {
"nodeType": "Texturing",
"position": [
3200,
0
],
"inputs": {
"input": "{Meshing_1.output}",
"imagesFolder": "{PrepareDenseScene_1.output}",
"inputMesh": "{MeshDecimate_1.output}"
},
"internalInputs": {
"color": "#3f3138"
}
},
"Publish_1": {
"nodeType": "Publish",
"position": [
3574,
166
],
"inputs": {
"inputFiles": [
"{ExportAnimatedCamera_1.output}",
"{Texturing_1.output}",
"{ScenePreview_1.output}",
""
]
}
},
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"position": [
1600,
200
],
"inputs": {
"input": "{StructureFromMotion_1.output}",
"exportUndistortedImages": true
},
"internalInputs": {
"color": "#80766f"
}
},
"Meshing_1": {
"nodeType": "Meshing",
"position": [
2600,
0
],
"inputs": {
"input": "{DepthMapFilter_1.input}",
"depthMapsFolder": "{DepthMapFilter_1.output}",
"estimateSpaceFromSfM": false,
"minStep": 1,
"fullWeight": 10.0,
"saveRawDensePointCloud": true
},
"internalInputs": {
"color": "#3f3138"
}
},
"ApplyCalibration_1": {
"nodeType": "ApplyCalibration",
"position": [
0,
0
],
"inputs": {
"input": "{CameraInit_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"ScenePreview_1": {
"nodeType": "ScenePreview",
"position": [
3200,
200
],
"inputs": {
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentation_1.output}"
},
"internalInputs": {
"color": "#4c594c"
}
},
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
3000,
200
],
"inputs": {
"input": "{ExportAnimatedCamera_1.input}",
"fileExt": "json",
"describerTypes": "{StructureFromMotion_1.describerTypes}",
"structure": false,
"observations": false
},
"internalInputs": {
"color": "#4c594c"
}
},
"StructureFromMotion_1": {
"nodeType": "StructureFromMotion",
"position": [
@ -372,21 +423,6 @@
"color": "#80766f"
}
},
"ImageSegmentation_1": {
"nodeType": "ImageSegmentation",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
},
"internalInputs": {
"color": "#575963"
}
},
"StructureFromMotion_2": {
"nodeType": "StructureFromMotion",
"position": [
@ -410,55 +446,19 @@
"color": "#575963"
}
},
"FeatureMatching_2": {
"nodeType": "FeatureMatching",
"Texturing_1": {
"nodeType": "Texturing",
"position": [
1200,
360
3200,
0
],
"inputs": {
"input": "{ImageMatching_2.input}",
"featuresFolders": "{ImageMatching_2.featuresFolders}",
"imagePairsList": "{ImageMatching_2.output}"
"input": "{Meshing_1.output}",
"imagesFolder": "{PrepareDenseScene_1.output}",
"inputMesh": "{MeshDecimate_1.output}"
},
"internalInputs": {
"label": "FeatureMatchingAllFrames",
"color": "#80766f"
}
},
"ImageMatching_2": {
"nodeType": "ImageMatching",
"position": [
1000,
360
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "Sequential",
"nbNeighbors": 20
},
"internalInputs": {
"color": "#80766f"
}
},
"FeatureMatching_3": {
"nodeType": "FeatureMatching",
"position": [
1200,
200
],
"inputs": {
"input": "{ImageMatchingMultiSfM_1.outputCombinedSfM}",
"featuresFolders": "{ImageMatchingMultiSfM_1.featuresFolders}",
"imagePairsList": "{ImageMatchingMultiSfM_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
},
"internalInputs": {
"label": "FeatureMatchingFramesToKeyframes",
"color": "#80766f"
"color": "#3f3138"
}
}
}

View file

@ -1,18 +1,26 @@
{
"header": {
"pipelineVersion": "2.2",
"releaseVersion": "2023.3.0",
"releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1",
"template": true,
"nodesVersions": {
"ExportDistortion": "1.0",
"CameraInit": "10.0",
"CheckerboardDetection": "1.0",
"DistortionCalibration": "4.0",
"ExportDistortion": "1.0",
"Publish": "1.3"
}
},
"graph": {
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
0,
0
],
"inputs": {}
},
"CheckerboardDetection_1": {
"nodeType": "CheckerboardDetection",
"position": [
@ -56,14 +64,6 @@
"{ExportDistortion_1.output}"
]
}
},
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
0,
0
],
"inputs": {}
}
}
}

View file

@ -1,31 +1,24 @@
{
"header": {
"nodesVersions": {
"CameraInit": "10.0",
"LdrToHdrCalibration": "3.1",
"LdrToHdrSampling": "4.0",
"LdrToHdrMerge": "4.1",
"Publish": "1.3",
"CameraInit": "10.0"
"LdrToHdrSampling": "4.0",
"Publish": "1.3"
},
"releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1",
"template": true
},
"graph": {
"LdrToHdrMerge_1": {
"nodeType": "LdrToHdrMerge",
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
600,
0,
0
],
"inputs": {
"input": "{LdrToHdrCalibration_1.input}",
"response": "{LdrToHdrCalibration_1.response}",
"userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}",
"byPass": "{LdrToHdrCalibration_1.byPass}",
"channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}",
"workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}"
}
"inputs": {}
},
"LdrToHdrCalibration_1": {
"nodeType": "LdrToHdrCalibration",
@ -43,6 +36,21 @@
"workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}"
}
},
"LdrToHdrMerge_1": {
"nodeType": "LdrToHdrMerge",
"position": [
600,
0
],
"inputs": {
"input": "{LdrToHdrCalibration_1.input}",
"response": "{LdrToHdrCalibration_1.response}",
"userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}",
"byPass": "{LdrToHdrCalibration_1.byPass}",
"channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}",
"workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}"
}
},
"LdrToHdrSampling_1": {
"nodeType": "LdrToHdrSampling",
"position": [
@ -53,14 +61,6 @@
"input": "{CameraInit_1.output}"
}
},
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
0,
0
],
"inputs": {}
},
"Publish_1": {
"nodeType": "Publish",
"position": [

View file

@ -5,50 +5,34 @@
"fileVersion": "1.1",
"template": true,
"nodesVersions": {
"FeatureMatching": "2.0",
"ExportDistortion": "1.0",
"ExportAnimatedCamera": "2.0",
"ScenePreview": "2.0",
"ConvertSfMFormat": "2.0",
"CheckerboardDetection": "1.0",
"ApplyCalibration": "1.0",
"ImageMatching": "2.0",
"CameraInit": "10.0",
"Publish": "1.3",
"CheckerboardDetection": "1.0",
"ConvertSfMFormat": "2.0",
"DistortionCalibration": "4.0",
"ImageSegmentation": "1.2",
"RelativePoseEstimating": "2.0",
"ExportAnimatedCamera": "2.0",
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageSegmentation": "1.2",
"NodalSfM": "2.0",
"Publish": "1.3",
"RelativePoseEstimating": "2.0",
"ScenePreview": "2.0",
"TracksBuilding": "1.0"
}
},
"graph": {
"ImageMatching_1": {
"nodeType": "ImageMatching",
"ApplyCalibration_1": {
"nodeType": "ApplyCalibration",
"position": [
400,
0,
0
],
"inputs": {
"input": "{FeatureExtraction_1.input}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
]
},
"internalInputs": {
"color": "#80766f"
}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
0
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentation_1.output}"
"input": "{CameraInit_1.output}",
"calibration": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#80766f"
@ -65,6 +49,104 @@
"color": "#80766f"
}
},
"CameraInit_2": {
"nodeType": "CameraInit",
"position": [
-600,
-160
],
"inputs": {},
"internalInputs": {
"label": "CameraInitLensGrid",
"color": "#302e2e"
}
},
"CheckerboardDetection_1": {
"nodeType": "CheckerboardDetection",
"position": [
-400,
-160
],
"inputs": {
"input": "{CameraInit_2.output}",
"useNestedGrids": true,
"exportDebugImages": true
},
"internalInputs": {
"color": "#302e2e"
}
},
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
1400,
200
],
"inputs": {
"input": "{NodalSfM_1.output}",
"fileExt": "sfm",
"structure": false,
"observations": false
},
"internalInputs": {
"color": "#4c594c"
}
},
"DistortionCalibration_1": {
"nodeType": "DistortionCalibration",
"position": [
-200,
-160
],
"inputs": {
"input": "{CheckerboardDetection_1.input}",
"checkerboards": "{CheckerboardDetection_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"position": [
1400,
0
],
"inputs": {
"input": "{NodalSfM_1.output}",
"exportUndistortedImages": true
},
"internalInputs": {
"color": "#80766f"
}
},
"ExportDistortion_1": {
"nodeType": "ExportDistortion",
"position": [
0,
-160
],
"inputs": {
"input": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
0
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentation_1.output}"
},
"internalInputs": {
"color": "#80766f"
}
},
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
@ -81,33 +163,32 @@
"color": "#80766f"
}
},
"TracksBuilding_1": {
"nodeType": "TracksBuilding",
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
800,
400,
0
],
"inputs": {
"input": "{FeatureMatching_1.input}",
"featuresFolders": "{FeatureMatching_1.featuresFolders}",
"matchesFolders": [
"{FeatureMatching_1.output}"
"input": "{FeatureExtraction_1.input}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
]
},
"internalInputs": {
"color": "#80766f"
}
},
"RelativePoseEstimating_1": {
"nodeType": "RelativePoseEstimating",
"ImageSegmentation_1": {
"nodeType": "ImageSegmentation",
"position": [
1000,
0
0,
200
],
"inputs": {
"input": "{TracksBuilding_1.input}",
"tracksFilename": "{TracksBuilding_1.output}",
"enforcePureRotation": true
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
},
"internalInputs": {
"color": "#80766f"
@ -128,36 +209,35 @@
"color": "#80766f"
}
},
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"Publish_1": {
"nodeType": "Publish",
"position": [
1400,
1800,
0
],
"inputs": {
"input": "{NodalSfM_1.output}",
"exportUndistortedImages": true
"inputFiles": [
"{ExportAnimatedCamera_1.output}",
"{ScenePreview_1.output}",
"{ExportDistortion_1.output}"
]
}
},
"RelativePoseEstimating_1": {
"nodeType": "RelativePoseEstimating",
"position": [
1000,
0
],
"inputs": {
"input": "{TracksBuilding_1.input}",
"tracksFilename": "{TracksBuilding_1.output}",
"enforcePureRotation": true
},
"internalInputs": {
"color": "#80766f"
}
},
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
1400,
200
],
"inputs": {
"input": "{NodalSfM_1.output}",
"fileExt": "sfm",
"structure": false,
"observations": false
},
"internalInputs": {
"color": "#4c594c"
}
},
"ScenePreview_1": {
"nodeType": "ScenePreview",
"position": [
@ -178,102 +258,22 @@
"color": "#4c594c"
}
},
"Publish_1": {
"nodeType": "Publish",
"TracksBuilding_1": {
"nodeType": "TracksBuilding",
"position": [
1800,
800,
0
],
"inputs": {
"inputFiles": [
"{ExportAnimatedCamera_1.output}",
"{ScenePreview_1.output}",
"{ExportDistortion_1.output}"
"input": "{FeatureMatching_1.input}",
"featuresFolders": "{FeatureMatching_1.featuresFolders}",
"matchesFolders": [
"{FeatureMatching_1.output}"
]
}
},
"ImageSegmentation_1": {
"nodeType": "ImageSegmentation",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
},
"internalInputs": {
"color": "#80766f"
}
},
"CheckerboardDetection_1": {
"nodeType": "CheckerboardDetection",
"position": [
-400,
-160
],
"inputs": {
"input": "{CameraInit_2.output}",
"useNestedGrids": true,
"exportDebugImages": true
},
"internalInputs": {
"color": "#302e2e"
}
},
"DistortionCalibration_1": {
"nodeType": "DistortionCalibration",
"position": [
-200,
-160
],
"inputs": {
"input": "{CheckerboardDetection_1.input}",
"checkerboards": "{CheckerboardDetection_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"ExportDistortion_1": {
"nodeType": "ExportDistortion",
"position": [
0,
-160
],
"inputs": {
"input": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"ApplyCalibration_1": {
"nodeType": "ApplyCalibration",
"position": [
0,
0
],
"inputs": {
"input": "{CameraInit_1.output}",
"calibration": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#80766f"
}
},
"CameraInit_2": {
"nodeType": "CameraInit",
"position": [
-600,
-160
],
"inputs": {},
"internalInputs": {
"label": "CameraInitLensGrid",
"color": "#302e2e"
}
}
}
}

View file

@ -5,32 +5,57 @@
"fileVersion": "1.1",
"template": true,
"nodesVersions": {
"FeatureMatching": "2.0",
"ExportAnimatedCamera": "2.0",
"ScenePreview": "2.0",
"ConvertSfMFormat": "2.0",
"ImageMatching": "2.0",
"CameraInit": "10.0",
"Publish": "1.3",
"ImageSegmentation": "1.2",
"RelativePoseEstimating": "2.0",
"ConvertSfMFormat": "2.0",
"ExportAnimatedCamera": "2.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageSegmentation": "1.2",
"NodalSfM": "2.0",
"Publish": "1.3",
"RelativePoseEstimating": "2.0",
"ScenePreview": "2.0",
"TracksBuilding": "1.0"
}
},
"graph": {
"ImageMatching_1": {
"nodeType": "ImageMatching",
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
400,
-200,
0
],
"inputs": {},
"internalInputs": {
"color": "#80766f"
}
},
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
1400,
200
],
"inputs": {
"input": "{NodalSfM_1.output}",
"fileExt": "sfm",
"structure": false,
"observations": false
},
"internalInputs": {
"color": "#4c594c"
}
},
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"position": [
1400,
0
],
"inputs": {
"input": "{FeatureExtraction_1.input}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
]
"input": "{NodalSfM_1.output}",
"exportUndistortedImages": true
},
"internalInputs": {
"color": "#80766f"
@ -50,17 +75,6 @@
"color": "#80766f"
}
},
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
-200,
0
],
"inputs": {},
"internalInputs": {
"color": "#80766f"
}
},
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
@ -77,33 +91,32 @@
"color": "#80766f"
}
},
"TracksBuilding_1": {
"nodeType": "TracksBuilding",
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
800,
400,
0
],
"inputs": {
"input": "{FeatureMatching_1.input}",
"featuresFolders": "{FeatureMatching_1.featuresFolders}",
"matchesFolders": [
"{FeatureMatching_1.output}"
"input": "{FeatureExtraction_1.input}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
]
},
"internalInputs": {
"color": "#80766f"
}
},
"RelativePoseEstimating_1": {
"nodeType": "RelativePoseEstimating",
"ImageSegmentation_1": {
"nodeType": "ImageSegmentation",
"position": [
1000,
0,
0
],
"inputs": {
"input": "{TracksBuilding_1.input}",
"tracksFilename": "{TracksBuilding_1.output}",
"enforcePureRotation": true
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
},
"internalInputs": {
"color": "#80766f"
@ -124,36 +137,34 @@
"color": "#80766f"
}
},
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"Publish_1": {
"nodeType": "Publish",
"position": [
1400,
1800,
0
],
"inputs": {
"input": "{NodalSfM_1.output}",
"exportUndistortedImages": true
"inputFiles": [
"{ExportAnimatedCamera_1.output}",
"{ScenePreview_1.output}"
]
}
},
"RelativePoseEstimating_1": {
"nodeType": "RelativePoseEstimating",
"position": [
1000,
0
],
"inputs": {
"input": "{TracksBuilding_1.input}",
"tracksFilename": "{TracksBuilding_1.output}",
"enforcePureRotation": true
},
"internalInputs": {
"color": "#80766f"
}
},
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
1400,
200
],
"inputs": {
"input": "{NodalSfM_1.output}",
"fileExt": "sfm",
"structure": false,
"observations": false
},
"internalInputs": {
"color": "#4c594c"
}
},
"ScenePreview_1": {
"nodeType": "ScenePreview",
"position": [
@ -174,29 +185,18 @@
"color": "#4c594c"
}
},
"Publish_1": {
"nodeType": "Publish",
"TracksBuilding_1": {
"nodeType": "TracksBuilding",
"position": [
1800,
800,
0
],
"inputs": {
"inputFiles": [
"{ExportAnimatedCamera_1.output}",
"{ScenePreview_1.output}"
"input": "{FeatureMatching_1.input}",
"featuresFolders": "{FeatureMatching_1.featuresFolders}",
"matchesFolders": [
"{FeatureMatching_1.output}"
]
}
},
"ImageSegmentation_1": {
"nodeType": "ImageSegmentation",
"position": [
0,
0
],
"inputs": {
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
},
"internalInputs": {
"color": "#80766f"

View file

@ -1,52 +1,78 @@
{
"header": {
"nodesVersions": {
"CameraInit": "10.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"LdrToHdrCalibration": "3.1",
"LdrToHdrMerge": "4.1",
"LdrToHdrSampling": "4.0",
"PanoramaCompositing": "2.0",
"PanoramaEstimation": "1.0",
"PanoramaInit": "2.0",
"PanoramaMerging": "1.0",
"PanoramaPostProcessing": "2.0",
"PanoramaPrepareImages": "1.1",
"PanoramaSeams": "2.0",
"PanoramaWarping": "1.1",
"PanoramaPostProcessing": "2.0",
"ImageMatching": "2.0",
"PanoramaPrepareImages": "1.1",
"PanoramaCompositing": "2.0",
"SfMTransform": "3.1",
"PanoramaInit": "2.0",
"PanoramaEstimation": "1.0",
"FeatureExtraction": "1.3",
"PanoramaMerging": "1.0",
"LdrToHdrMerge": "4.1",
"Publish": "1.3",
"CameraInit": "10.0",
"FeatureMatching": "2.0"
"SfMTransform": "3.1"
},
"releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1",
"template": true
},
"graph": {
"LdrToHdrMerge_1": {
"nodeType": "LdrToHdrMerge",
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
800,
0,
0
],
"inputs": {}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
1200,
0
],
"inputs": {
"input": "{LdrToHdrCalibration_1.input}",
"response": "{LdrToHdrCalibration_1.response}",
"userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}",
"byPass": "{LdrToHdrCalibration_1.byPass}",
"channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}",
"workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}"
"input": "{PanoramaInit_1.outSfMData}",
"describerTypes": [
"sift"
],
"describerPreset": "high",
"describerQuality": "high"
}
},
"PanoramaWarping_1": {
"nodeType": "PanoramaWarping",
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
2200,
1600,
0
],
"inputs": {
"input": "{SfMTransform_1.output}"
"input": "{ImageMatching_1.input}",
"featuresFolders": "{ImageMatching_1.featuresFolders}",
"imagePairsList": "{ImageMatching_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}",
"minRequired2DMotion": 5.0
}
},
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
1400,
0
],
"inputs": {
"input": "{FeatureExtraction_1.input}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "FrustumOrVocabularyTree"
}
},
"LdrToHdrCalibration_1": {
@ -65,6 +91,21 @@
"workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}"
}
},
"LdrToHdrMerge_1": {
"nodeType": "LdrToHdrMerge",
"position": [
800,
0
],
"inputs": {
"input": "{LdrToHdrCalibration_1.input}",
"response": "{LdrToHdrCalibration_1.response}",
"userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}",
"byPass": "{LdrToHdrCalibration_1.byPass}",
"channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}",
"workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}"
}
},
"LdrToHdrSampling_1": {
"nodeType": "LdrToHdrSampling",
"position": [
@ -75,47 +116,6 @@
"input": "{PanoramaPrepareImages_1.output}"
}
},
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
1400,
0
],
"inputs": {
"input": "{FeatureExtraction_1.input}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "FrustumOrVocabularyTree"
}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
1200,
0
],
"inputs": {
"input": "{PanoramaInit_1.outSfMData}",
"describerTypes": [
"sift"
],
"describerPreset": "high",
"describerQuality": "high"
}
},
"PanoramaMerging_1": {
"nodeType": "PanoramaMerging",
"position": [
2800,
0
],
"inputs": {
"input": "{PanoramaCompositing_1.input}",
"compositingFolder": "{PanoramaCompositing_1.output}",
"useTiling": "{PanoramaCompositing_1.useTiling}"
}
},
"PanoramaCompositing_1": {
"nodeType": "PanoramaCompositing",
"position": [
@ -129,57 +129,6 @@
"useTiling": false
}
},
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
0,
0
],
"inputs": {}
},
"PanoramaPostProcessing_1": {
"nodeType": "PanoramaPostProcessing",
"position": [
3000,
0
],
"inputs": {
"inputPanorama": "{PanoramaMerging_1.outputPanorama}",
"fillHoles": true
}
},
"PanoramaPrepareImages_1": {
"nodeType": "PanoramaPrepareImages",
"position": [
200,
0
],
"inputs": {
"input": "{CameraInit_1.output}"
}
},
"SfMTransform_1": {
"nodeType": "SfMTransform",
"position": [
2000,
0
],
"inputs": {
"input": "{PanoramaEstimation_1.output}",
"method": "manual"
}
},
"PanoramaSeams_1": {
"nodeType": "PanoramaSeams",
"position": [
2400,
0
],
"inputs": {
"input": "{PanoramaWarping_1.input}",
"warpingFolder": "{PanoramaWarping_1.output}"
}
},
"PanoramaEstimation_1": {
"nodeType": "PanoramaEstimation",
"position": [
@ -206,18 +155,58 @@
"useFisheye": true
}
},
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"PanoramaMerging_1": {
"nodeType": "PanoramaMerging",
"position": [
1600,
2800,
0
],
"inputs": {
"input": "{ImageMatching_1.input}",
"featuresFolders": "{ImageMatching_1.featuresFolders}",
"imagePairsList": "{ImageMatching_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}",
"minRequired2DMotion": 5.0
"input": "{PanoramaCompositing_1.input}",
"compositingFolder": "{PanoramaCompositing_1.output}",
"useTiling": "{PanoramaCompositing_1.useTiling}"
}
},
"PanoramaPostProcessing_1": {
"nodeType": "PanoramaPostProcessing",
"position": [
3000,
0
],
"inputs": {
"inputPanorama": "{PanoramaMerging_1.outputPanorama}",
"fillHoles": true
}
},
"PanoramaPrepareImages_1": {
"nodeType": "PanoramaPrepareImages",
"position": [
200,
0
],
"inputs": {
"input": "{CameraInit_1.output}"
}
},
"PanoramaSeams_1": {
"nodeType": "PanoramaSeams",
"position": [
2400,
0
],
"inputs": {
"input": "{PanoramaWarping_1.input}",
"warpingFolder": "{PanoramaWarping_1.output}"
}
},
"PanoramaWarping_1": {
"nodeType": "PanoramaWarping",
"position": [
2200,
0
],
"inputs": {
"input": "{SfMTransform_1.output}"
}
},
"Publish_1": {
@ -233,6 +222,17 @@
"{PanoramaPostProcessing_1.downscaledPanoramaLevels}"
]
}
},
"SfMTransform_1": {
"nodeType": "SfMTransform",
"position": [
2000,
0
],
"inputs": {
"input": "{PanoramaEstimation_1.output}",
"method": "manual"
}
}
}
}

View file

@ -1,52 +1,74 @@
{
"header": {
"nodesVersions": {
"CameraInit": "10.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"LdrToHdrCalibration": "3.1",
"LdrToHdrMerge": "4.1",
"LdrToHdrSampling": "4.0",
"PanoramaCompositing": "2.0",
"PanoramaEstimation": "1.0",
"PanoramaInit": "2.0",
"PanoramaMerging": "1.0",
"PanoramaPostProcessing": "2.0",
"PanoramaPrepareImages": "1.1",
"PanoramaSeams": "2.0",
"PanoramaWarping": "1.1",
"PanoramaPostProcessing": "2.0",
"ImageMatching": "2.0",
"PanoramaPrepareImages": "1.1",
"PanoramaCompositing": "2.0",
"SfMTransform": "3.1",
"PanoramaInit": "2.0",
"PanoramaEstimation": "1.0",
"FeatureExtraction": "1.3",
"PanoramaMerging": "1.0",
"LdrToHdrMerge": "4.1",
"Publish": "1.3",
"CameraInit": "10.0",
"FeatureMatching": "2.0"
"SfMTransform": "3.1"
},
"releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1",
"template": true
},
"graph": {
"LdrToHdrMerge_1": {
"nodeType": "LdrToHdrMerge",
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
800,
0,
0
],
"inputs": {}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
1000,
70
],
"inputs": {
"input": "{LdrToHdrCalibration_1.input}",
"response": "{LdrToHdrCalibration_1.response}",
"userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}",
"byPass": "{LdrToHdrCalibration_1.byPass}",
"channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}",
"workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}"
"input": "{LdrToHdrMerge_1.outSfMData}",
"describerQuality": "high"
}
},
"PanoramaWarping_1": {
"nodeType": "PanoramaWarping",
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
2000,
1400,
0
],
"inputs": {
"input": "{SfMTransform_1.output}"
"input": "{ImageMatching_1.input}",
"featuresFolders": "{ImageMatching_1.featuresFolders}",
"imagePairsList": "{ImageMatching_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}",
"minRequired2DMotion": 5.0
}
},
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
1200,
0
],
"inputs": {
"input": "{PanoramaInit_1.outSfMData}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "FrustumOrVocabularyTree"
}
},
"LdrToHdrCalibration_1": {
@ -65,6 +87,21 @@
"workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}"
}
},
"LdrToHdrMerge_1": {
"nodeType": "LdrToHdrMerge",
"position": [
800,
0
],
"inputs": {
"input": "{LdrToHdrCalibration_1.input}",
"response": "{LdrToHdrCalibration_1.response}",
"userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}",
"byPass": "{LdrToHdrCalibration_1.byPass}",
"channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}",
"workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}"
}
},
"LdrToHdrSampling_1": {
"nodeType": "LdrToHdrSampling",
"position": [
@ -75,43 +112,6 @@
"input": "{PanoramaPrepareImages_1.output}"
}
},
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
1200,
0
],
"inputs": {
"input": "{PanoramaInit_1.outSfMData}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "FrustumOrVocabularyTree"
}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
1000,
70
],
"inputs": {
"input": "{LdrToHdrMerge_1.outSfMData}",
"describerQuality": "high"
}
},
"PanoramaMerging_1": {
"nodeType": "PanoramaMerging",
"position": [
2600,
0
],
"inputs": {
"input": "{PanoramaCompositing_1.input}",
"compositingFolder": "{PanoramaCompositing_1.output}",
"useTiling": "{PanoramaCompositing_1.useTiling}"
}
},
"PanoramaCompositing_1": {
"nodeType": "PanoramaCompositing",
"position": [
@ -124,58 +124,6 @@
"labels": "{PanoramaSeams_1.output}"
}
},
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
0,
0
],
"inputs": {}
},
"PanoramaPostProcessing_1": {
"nodeType": "PanoramaPostProcessing",
"position": [
2800,
0
],
"inputs": {
"inputPanorama": "{PanoramaMerging_1.outputPanorama}",
"fillHoles": true,
"exportLevels": true
}
},
"PanoramaPrepareImages_1": {
"nodeType": "PanoramaPrepareImages",
"position": [
200,
0
],
"inputs": {
"input": "{CameraInit_1.output}"
}
},
"SfMTransform_1": {
"nodeType": "SfMTransform",
"position": [
1800,
0
],
"inputs": {
"input": "{PanoramaEstimation_1.output}",
"method": "manual"
}
},
"PanoramaSeams_1": {
"nodeType": "PanoramaSeams",
"position": [
2200,
0
],
"inputs": {
"input": "{PanoramaWarping_1.input}",
"warpingFolder": "{PanoramaWarping_1.output}"
}
},
"PanoramaEstimation_1": {
"nodeType": "PanoramaEstimation",
"position": [
@ -201,18 +149,59 @@
"input": "{LdrToHdrMerge_1.outSfMData}"
}
},
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"PanoramaMerging_1": {
"nodeType": "PanoramaMerging",
"position": [
1400,
2600,
0
],
"inputs": {
"input": "{ImageMatching_1.input}",
"featuresFolders": "{ImageMatching_1.featuresFolders}",
"imagePairsList": "{ImageMatching_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}",
"minRequired2DMotion": 5.0
"input": "{PanoramaCompositing_1.input}",
"compositingFolder": "{PanoramaCompositing_1.output}",
"useTiling": "{PanoramaCompositing_1.useTiling}"
}
},
"PanoramaPostProcessing_1": {
"nodeType": "PanoramaPostProcessing",
"position": [
2800,
0
],
"inputs": {
"inputPanorama": "{PanoramaMerging_1.outputPanorama}",
"fillHoles": true,
"exportLevels": true
}
},
"PanoramaPrepareImages_1": {
"nodeType": "PanoramaPrepareImages",
"position": [
200,
0
],
"inputs": {
"input": "{CameraInit_1.output}"
}
},
"PanoramaSeams_1": {
"nodeType": "PanoramaSeams",
"position": [
2200,
0
],
"inputs": {
"input": "{PanoramaWarping_1.input}",
"warpingFolder": "{PanoramaWarping_1.output}"
}
},
"PanoramaWarping_1": {
"nodeType": "PanoramaWarping",
"position": [
2000,
0
],
"inputs": {
"input": "{SfMTransform_1.output}"
}
},
"Publish_1": {
@ -228,6 +217,17 @@
"{PanoramaPostProcessing_1.downscaledPanoramaLevels}"
]
}
},
"SfMTransform_1": {
"nodeType": "SfMTransform",
"position": [
1800,
0
],
"inputs": {
"input": "{PanoramaEstimation_1.output}",
"method": "manual"
}
}
}
}

View file

@ -1,61 +1,32 @@
{
"header": {
"pipelineVersion": "2.2",
"releaseVersion": "2023.3.0",
"releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1",
"template": true,
"nodesVersions": {
"StructureFromMotion": "3.3",
"DepthMap": "5.0",
"Meshing": "7.0",
"FeatureMatching": "2.0",
"CameraInit": "10.0",
"Texturing": "6.0",
"DepthMap": "5.0",
"DepthMapFilter": "4.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"MeshFiltering": "3.0",
"Meshing": "7.0",
"PrepareDenseScene": "3.1",
"Publish": "1.3",
"MeshFiltering": "3.0",
"FeatureExtraction": "1.3",
"DepthMapFilter": "4.0",
"ImageMatching": "2.0"
"StructureFromMotion": "3.3",
"Texturing": "6.0"
}
},
"graph": {
"Publish_1": {
"nodeType": "Publish",
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
2200,
0,
0
],
"inputs": {
"inputFiles": [
"{Texturing_1.outputMesh}",
"{Texturing_1.outputMaterial}",
"{Texturing_1.outputTextures}"
]
}
},
"Texturing_1": {
"nodeType": "Texturing",
"position": [
2000,
0
],
"inputs": {
"input": "{Meshing_1.output}",
"imagesFolder": "{DepthMap_1.imagesFolder}",
"inputMesh": "{MeshFiltering_1.outputMesh}"
}
},
"Meshing_1": {
"nodeType": "Meshing",
"position": [
1600,
0
],
"inputs": {
"input": "{DepthMapFilter_1.input}",
"depthMapsFolder": "{DepthMapFilter_1.output}"
}
"inputs": {}
},
"DepthMapFilter_1": {
"nodeType": "DepthMapFilter",
@ -68,6 +39,40 @@
"depthMapsFolder": "{DepthMap_1.output}"
}
},
"DepthMap_1": {
"nodeType": "DepthMap",
"position": [
1200,
0
],
"inputs": {
"input": "{PrepareDenseScene_1.input}",
"imagesFolder": "{PrepareDenseScene_1.output}"
}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
0
],
"inputs": {
"input": "{CameraInit_1.output}"
}
},
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
600,
0
],
"inputs": {
"input": "{ImageMatching_1.input}",
"featuresFolders": "{ImageMatching_1.featuresFolders}",
"imagePairsList": "{ImageMatching_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
}
},
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
@ -81,14 +86,49 @@
]
}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"MeshFiltering_1": {
"nodeType": "MeshFiltering",
"position": [
200,
1800,
0
],
"inputs": {
"input": "{CameraInit_1.output}"
"inputMesh": "{Meshing_1.outputMesh}"
}
},
"Meshing_1": {
"nodeType": "Meshing",
"position": [
1600,
0
],
"inputs": {
"input": "{DepthMapFilter_1.input}",
"depthMapsFolder": "{DepthMapFilter_1.output}"
}
},
"PrepareDenseScene_1": {
"nodeType": "PrepareDenseScene",
"position": [
1000,
0
],
"inputs": {
"input": "{StructureFromMotion_1.output}"
}
},
"Publish_1": {
"nodeType": "Publish",
"position": [
2200,
0
],
"inputs": {
"inputFiles": [
"{Texturing_1.outputMesh}",
"{Texturing_1.outputMaterial}",
"{Texturing_1.outputTextures}"
]
}
},
"StructureFromMotion_1": {
@ -106,56 +146,16 @@
"describerTypes": "{FeatureMatching_1.describerTypes}"
}
},
"PrepareDenseScene_1": {
"nodeType": "PrepareDenseScene",
"Texturing_1": {
"nodeType": "Texturing",
"position": [
1000,
2000,
0
],
"inputs": {
"input": "{StructureFromMotion_1.output}"
}
},
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
0,
0
],
"inputs": {}
},
"DepthMap_1": {
"nodeType": "DepthMap",
"position": [
1200,
0
],
"inputs": {
"input": "{PrepareDenseScene_1.input}",
"imagesFolder": "{PrepareDenseScene_1.output}"
}
},
"MeshFiltering_1": {
"nodeType": "MeshFiltering",
"position": [
1800,
0
],
"inputs": {
"inputMesh": "{Meshing_1.outputMesh}"
}
},
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
600,
0
],
"inputs": {
"input": "{ImageMatching_1.input}",
"featuresFolders": "{ImageMatching_1.featuresFolders}",
"imagePairsList": "{ImageMatching_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
"input": "{Meshing_1.output}",
"imagesFolder": "{DepthMap_1.imagesFolder}",
"inputMesh": "{MeshFiltering_1.outputMesh}"
}
}
}

View file

@ -5,32 +5,46 @@
"fileVersion": "1.1",
"template": true,
"nodesVersions": {
"ExportAnimatedCamera": "2.0",
"Texturing": "6.0",
"ImageMatching": "2.0",
"Publish": "1.3",
"MeshFiltering": "3.0",
"MeshDecimate": "1.0",
"DepthMapFilter": "4.0",
"ExportDistortion": "1.0",
"PrepareDenseScene": "3.1",
"ImageMatchingMultiSfM": "1.0",
"Meshing": "7.0",
"KeyframeSelection": "5.0",
"CheckerboardDetection": "1.0",
"ApplyCalibration": "1.0",
"CameraInit": "10.0",
"CheckerboardDetection": "1.0",
"ConvertSfMFormat": "2.0",
"DepthMap": "5.0",
"StructureFromMotion": "3.3",
"DepthMapFilter": "4.0",
"DistortionCalibration": "4.0",
"FeatureMatching": "2.0",
"ScenePreview": "2.0",
"ImageSegmentation": "1.2",
"ExportAnimatedCamera": "2.0",
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"CameraInit": "10.0"
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0",
"ImageSegmentation": "1.2",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
"MeshFiltering": "3.0",
"Meshing": "7.0",
"PrepareDenseScene": "3.1",
"Publish": "1.3",
"ScenePreview": "2.0",
"StructureFromMotion": "3.3",
"Texturing": "6.0"
}
},
"graph": {
"ApplyCalibration_1": {
"nodeType": "ApplyCalibration",
"position": [
0,
0
],
"inputs": {
"input": "{CameraInit_1.output}",
"calibration": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
@ -43,6 +57,132 @@
"color": "#575963"
}
},
"CameraInit_2": {
"nodeType": "CameraInit",
"position": [
-600,
-160
],
"inputs": {},
"internalInputs": {
"label": "InitLensGrid",
"color": "#302e2e"
}
},
"CameraInit_3": {
"nodeType": "CameraInit",
"position": [
-594,
-584
],
"inputs": {},
"internalInputs": {
"label": "InitPhotogrammetry",
"color": "#384a55"
}
},
"CheckerboardDetection_1": {
"nodeType": "CheckerboardDetection",
"position": [
-400,
-160
],
"inputs": {
"input": "{CameraInit_2.output}",
"useNestedGrids": true,
"exportDebugImages": true
},
"internalInputs": {
"color": "#302e2e"
}
},
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
1948,
211
],
"inputs": {
"input": "{ExportAnimatedCamera_1.input}",
"fileExt": "sfm",
"describerTypes": "{StructureFromMotion_1.describerTypes}",
"structure": false,
"observations": false
},
"internalInputs": {
"color": "#4c594c"
}
},
"DepthMapFilter_2": {
"nodeType": "DepthMapFilter",
"position": [
806,
-584
],
"inputs": {
"input": "{DepthMap_2.input}",
"depthMapsFolder": "{DepthMap_2.output}"
},
"internalInputs": {
"color": "#384a55"
}
},
"DepthMap_2": {
"nodeType": "DepthMap",
"position": [
606,
-584
],
"inputs": {
"input": "{PrepareDenseScene_2.input}",
"imagesFolder": "{PrepareDenseScene_2.output}"
},
"internalInputs": {
"color": "#384a55"
}
},
"DistortionCalibration_1": {
"nodeType": "DistortionCalibration",
"position": [
-200,
-160
],
"inputs": {
"input": "{CheckerboardDetection_1.input}",
"checkerboards": "{CheckerboardDetection_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"position": [
1600,
200
],
"inputs": {
"input": "{StructureFromMotion_1.output}",
"sfmDataFilter": "{ImageMatchingMultiSfM_2.inputB}",
"exportUndistortedImages": true
},
"internalInputs": {
"color": "#80766f"
}
},
"ExportDistortion_1": {
"nodeType": "ExportDistortion",
"position": [
0,
-160
],
"inputs": {
"input": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
@ -58,6 +198,19 @@
"color": "#575963"
}
},
"FeatureExtraction_2": {
"nodeType": "FeatureExtraction",
"position": [
-394,
-584
],
"inputs": {
"input": "{CameraInit_3.output}"
},
"internalInputs": {
"color": "#384a55"
}
},
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
@ -75,6 +228,71 @@
"color": "#575963"
}
},
"FeatureMatching_2": {
"nodeType": "FeatureMatching",
"position": [
1200,
360
],
"inputs": {
"input": "{ImageMatching_2.input}",
"featuresFolders": "{ImageMatching_2.featuresFolders}",
"imagePairsList": "{ImageMatching_2.output}"
},
"internalInputs": {
"label": "FeatureMatchingAllFrames",
"color": "#80766f"
}
},
"FeatureMatching_3": {
"nodeType": "FeatureMatching",
"position": [
1200,
200
],
"inputs": {
"input": "{ImageMatchingMultiSfM_1.outputCombinedSfM}",
"featuresFolders": "{ImageMatchingMultiSfM_1.featuresFolders}",
"imagePairsList": "{ImageMatchingMultiSfM_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
},
"internalInputs": {
"label": "FeatureMatchingFramesToKeyframes",
"color": "#80766f"
}
},
"FeatureMatching_4": {
"nodeType": "FeatureMatching",
"position": [
6,
-584
],
"inputs": {
"input": "{ImageMatching_3.input}",
"featuresFolders": "{ImageMatching_3.featuresFolders}",
"imagePairsList": "{ImageMatching_3.output}",
"describerTypes": "{FeatureExtraction_2.describerTypes}"
},
"internalInputs": {
"color": "#384a55"
}
},
"FeatureMatching_5": {
"nodeType": "FeatureMatching",
"position": [
607,
-300
],
"inputs": {
"input": "{ImageMatchingMultiSfM_2.outputCombinedSfM}",
"featuresFolders": "{ImageMatchingMultiSfM_2.featuresFolders}",
"imagePairsList": "{ImageMatchingMultiSfM_2.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
},
"internalInputs": {
"color": "#575963"
}
},
"ImageMatchingMultiSfM_1": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
@ -95,6 +313,25 @@
"color": "#80766f"
}
},
"ImageMatchingMultiSfM_2": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
401,
-299
],
"inputs": {
"input": "{KeyframeSelection_1.outputSfMDataKeyframes}",
"inputB": "{StructureFromMotion_3.output}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "Exhaustive",
"matchingMode": "a/b"
},
"internalInputs": {
"color": "#575963"
}
},
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
@ -113,6 +350,55 @@
"color": "#575963"
}
},
"ImageMatching_2": {
"nodeType": "ImageMatching",
"position": [
1000,
360
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "Sequential",
"nbNeighbors": 20
},
"internalInputs": {
"color": "#80766f"
}
},
"ImageMatching_3": {
"nodeType": "ImageMatching",
"position": [
-194,
-584
],
"inputs": {
"input": "{FeatureExtraction_2.input}",
"featuresFolders": [
"{FeatureExtraction_2.output}"
]
},
"internalInputs": {
"color": "#384a55"
}
},
"ImageSegmentation_1": {
"nodeType": "ImageSegmentation",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
},
"internalInputs": {
"color": "#575963"
}
},
"KeyframeSelection_1": {
"nodeType": "KeyframeSelection",
"position": [
@ -145,6 +431,46 @@
"color": "#4c594c"
}
},
"MeshFiltering_2": {
"nodeType": "MeshFiltering",
"position": [
1206,
-584
],
"inputs": {
"inputMesh": "{Meshing_2.outputMesh}"
},
"internalInputs": {
"color": "#384a55"
}
},
"Meshing_2": {
"nodeType": "Meshing",
"position": [
1006,
-584
],
"inputs": {
"input": "{DepthMapFilter_2.input}",
"depthMapsFolder": "{DepthMapFilter_2.output}"
},
"internalInputs": {
"color": "#384a55"
}
},
"PrepareDenseScene_2": {
"nodeType": "PrepareDenseScene",
"position": [
406,
-584
],
"inputs": {
"input": "{StructureFromMotion_3.output}"
},
"internalInputs": {
"color": "#384a55"
}
},
"Publish_1": {
"nodeType": "Publish",
"position": [
@ -160,77 +486,6 @@
]
}
},
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"position": [
1600,
200
],
"inputs": {
"input": "{StructureFromMotion_1.output}",
"sfmDataFilter": "{ImageMatchingMultiSfM_2.inputB}",
"exportUndistortedImages": true
},
"internalInputs": {
"color": "#80766f"
}
},
"CheckerboardDetection_1": {
"nodeType": "CheckerboardDetection",
"position": [
-400,
-160
],
"inputs": {
"input": "{CameraInit_2.output}",
"useNestedGrids": true,
"exportDebugImages": true
},
"internalInputs": {
"color": "#302e2e"
}
},
"DistortionCalibration_1": {
"nodeType": "DistortionCalibration",
"position": [
-200,
-160
],
"inputs": {
"input": "{CheckerboardDetection_1.input}",
"checkerboards": "{CheckerboardDetection_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"ExportDistortion_1": {
"nodeType": "ExportDistortion",
"position": [
0,
-160
],
"inputs": {
"input": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#302e2e"
}
},
"ApplyCalibration_1": {
"nodeType": "ApplyCalibration",
"position": [
0,
0
],
"inputs": {
"input": "{CameraInit_1.output}",
"calibration": "{DistortionCalibration_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"ScenePreview_1": {
"nodeType": "ScenePreview",
"position": [
@ -247,23 +502,6 @@
"color": "#4c594c"
}
},
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
1948,
211
],
"inputs": {
"input": "{ExportAnimatedCamera_1.input}",
"fileExt": "sfm",
"describerTypes": "{StructureFromMotion_1.describerTypes}",
"structure": false,
"observations": false
},
"internalInputs": {
"color": "#4c594c"
}
},
"StructureFromMotion_1": {
"nodeType": "StructureFromMotion",
"position": [
@ -293,21 +531,6 @@
"color": "#80766f"
}
},
"ImageSegmentation_1": {
"nodeType": "ImageSegmentation",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
},
"internalInputs": {
"color": "#575963"
}
},
"StructureFromMotion_2": {
"nodeType": "StructureFromMotion",
"position": [
@ -334,200 +557,6 @@
"color": "#575963"
}
},
"FeatureMatching_2": {
"nodeType": "FeatureMatching",
"position": [
1200,
360
],
"inputs": {
"input": "{ImageMatching_2.input}",
"featuresFolders": "{ImageMatching_2.featuresFolders}",
"imagePairsList": "{ImageMatching_2.output}"
},
"internalInputs": {
"label": "FeatureMatchingAllFrames",
"color": "#80766f"
}
},
"ImageMatching_2": {
"nodeType": "ImageMatching",
"position": [
1000,
360
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "Sequential",
"nbNeighbors": 20
},
"internalInputs": {
"color": "#80766f"
}
},
"CameraInit_2": {
"nodeType": "CameraInit",
"position": [
-600,
-160
],
"inputs": {},
"internalInputs": {
"label": "InitLensGrid",
"color": "#302e2e"
}
},
"Texturing_2": {
"nodeType": "Texturing",
"position": [
1406,
-584
],
"inputs": {
"input": "{Meshing_2.output}",
"imagesFolder": "{DepthMap_2.imagesFolder}",
"inputMesh": "{MeshFiltering_2.outputMesh}"
},
"internalInputs": {
"color": "#384a55"
}
},
"Meshing_2": {
"nodeType": "Meshing",
"position": [
1006,
-584
],
"inputs": {
"input": "{DepthMapFilter_2.input}",
"depthMapsFolder": "{DepthMapFilter_2.output}"
},
"internalInputs": {
"color": "#384a55"
}
},
"DepthMapFilter_2": {
"nodeType": "DepthMapFilter",
"position": [
806,
-584
],
"inputs": {
"input": "{DepthMap_2.input}",
"depthMapsFolder": "{DepthMap_2.output}"
},
"internalInputs": {
"color": "#384a55"
}
},
"FeatureExtraction_2": {
"nodeType": "FeatureExtraction",
"position": [
-394,
-584
],
"inputs": {
"input": "{CameraInit_3.output}"
},
"internalInputs": {
"color": "#384a55"
}
},
"PrepareDenseScene_2": {
"nodeType": "PrepareDenseScene",
"position": [
406,
-584
],
"inputs": {
"input": "{StructureFromMotion_3.output}"
},
"internalInputs": {
"color": "#384a55"
}
},
"DepthMap_2": {
"nodeType": "DepthMap",
"position": [
606,
-584
],
"inputs": {
"input": "{PrepareDenseScene_2.input}",
"imagesFolder": "{PrepareDenseScene_2.output}"
},
"internalInputs": {
"color": "#384a55"
}
},
"MeshFiltering_2": {
"nodeType": "MeshFiltering",
"position": [
1206,
-584
],
"inputs": {
"inputMesh": "{Meshing_2.outputMesh}"
},
"internalInputs": {
"color": "#384a55"
}
},
"ImageMatchingMultiSfM_2": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
401,
-299
],
"inputs": {
"input": "{KeyframeSelection_1.outputSfMDataKeyframes}",
"inputB": "{StructureFromMotion_3.output}",
"featuresFolders": [
"{FeatureExtraction_1.output}"
],
"method": "Exhaustive",
"matchingMode": "a/b"
},
"internalInputs": {
"color": "#575963"
}
},
"FeatureMatching_3": {
"nodeType": "FeatureMatching",
"position": [
1200,
200
],
"inputs": {
"input": "{ImageMatchingMultiSfM_1.outputCombinedSfM}",
"featuresFolders": "{ImageMatchingMultiSfM_1.featuresFolders}",
"imagePairsList": "{ImageMatchingMultiSfM_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
},
"internalInputs": {
"label": "FeatureMatchingFramesToKeyframes",
"color": "#80766f"
}
},
"ImageMatching_3": {
"nodeType": "ImageMatching",
"position": [
-194,
-584
],
"inputs": {
"input": "{FeatureExtraction_2.input}",
"featuresFolders": [
"{FeatureExtraction_2.output}"
]
},
"internalInputs": {
"color": "#384a55"
}
},
"StructureFromMotion_3": {
"nodeType": "StructureFromMotion",
"position": [
@ -546,49 +575,20 @@
"color": "#384a55"
}
},
"CameraInit_3": {
"nodeType": "CameraInit",
"Texturing_2": {
"nodeType": "Texturing",
"position": [
-594,
-584
],
"inputs": {},
"internalInputs": {
"label": "InitPhotogrammetry",
"color": "#384a55"
}
},
"FeatureMatching_4": {
"nodeType": "FeatureMatching",
"position": [
6,
1406,
-584
],
"inputs": {
"input": "{ImageMatching_3.input}",
"featuresFolders": "{ImageMatching_3.featuresFolders}",
"imagePairsList": "{ImageMatching_3.output}",
"describerTypes": "{FeatureExtraction_2.describerTypes}"
"input": "{Meshing_2.output}",
"imagesFolder": "{DepthMap_2.imagesFolder}",
"inputMesh": "{MeshFiltering_2.outputMesh}"
},
"internalInputs": {
"color": "#384a55"
}
},
"FeatureMatching_5": {
"nodeType": "FeatureMatching",
"position": [
607,
-300
],
"inputs": {
"input": "{ImageMatchingMultiSfM_2.outputCombinedSfM}",
"featuresFolders": "{ImageMatchingMultiSfM_2.featuresFolders}",
"imagePairsList": "{ImageMatchingMultiSfM_2.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
},
"internalInputs": {
"color": "#575963"
}
}
}
}

View file

@ -1,42 +1,51 @@
{
"header": {
"nodesVersions": {
"StructureFromMotion": "3.3",
"FeatureMatching": "2.0",
"Meshing": "7.0",
"CameraInit": "10.0",
"Texturing": "6.0",
"Publish": "1.3",
"MeshFiltering": "3.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
"MeshFiltering": "3.0",
"Meshing": "7.0",
"PrepareDenseScene": "3.1",
"ImageMatching": "2.0"
"Publish": "1.3",
"StructureFromMotion": "3.3",
"Texturing": "6.0"
},
"releaseVersion": "2023.3.0",
"releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1",
"template": true
},
"graph": {
"Texturing_1": {
"nodeType": "Texturing",
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
1600,
0,
0
],
"inputs": {}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
0
],
"inputs": {
"input": "{Meshing_1.output}",
"imagesFolder": "{PrepareDenseScene_1.output}",
"inputMesh": "{MeshFiltering_1.outputMesh}"
"input": "{CameraInit_1.output}"
}
},
"Meshing_1": {
"nodeType": "Meshing",
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
1200,
600,
0
],
"inputs": {
"input": "{PrepareDenseScene_1.input}"
"input": "{ImageMatching_1.input}",
"featuresFolders": "{ImageMatching_1.featuresFolders}",
"imagePairsList": "{ImageMatching_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
}
},
"ImageMatching_1": {
@ -52,14 +61,48 @@
]
}
},
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"MeshFiltering_1": {
"nodeType": "MeshFiltering",
"position": [
200,
1400,
0
],
"inputs": {
"input": "{CameraInit_1.output}"
"inputMesh": "{Meshing_1.outputMesh}"
}
},
"Meshing_1": {
"nodeType": "Meshing",
"position": [
1200,
0
],
"inputs": {
"input": "{PrepareDenseScene_1.input}"
}
},
"PrepareDenseScene_1": {
"nodeType": "PrepareDenseScene",
"position": [
1000,
0
],
"inputs": {
"input": "{StructureFromMotion_1.output}"
}
},
"Publish_1": {
"nodeType": "Publish",
"position": [
1800,
0
],
"inputs": {
"inputFiles": [
"{Texturing_1.outputMesh}",
"{Texturing_1.outputMaterial}",
"{Texturing_1.outputTextures}"
]
}
},
"StructureFromMotion_1": {
@ -77,59 +120,16 @@
"describerTypes": "{FeatureMatching_1.describerTypes}"
}
},
"CameraInit_1": {
"nodeType": "CameraInit",
"Texturing_1": {
"nodeType": "Texturing",
"position": [
0,
0
],
"inputs": {}
},
"MeshFiltering_1": {
"nodeType": "MeshFiltering",
"position": [
1400,
1600,
0
],
"inputs": {
"inputMesh": "{Meshing_1.outputMesh}"
}
},
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
600,
0
],
"inputs": {
"input": "{ImageMatching_1.input}",
"featuresFolders": "{ImageMatching_1.featuresFolders}",
"imagePairsList": "{ImageMatching_1.output}",
"describerTypes": "{FeatureExtraction_1.describerTypes}"
}
},
"Publish_1": {
"nodeType": "Publish",
"position": [
1800,
0
],
"inputs": {
"inputFiles": [
"{Texturing_1.outputMesh}",
"{Texturing_1.outputMaterial}",
"{Texturing_1.outputTextures}"
]
}
},
"PrepareDenseScene_1": {
"nodeType": "PrepareDenseScene",
"position": [
1000,
0
],
"inputs": {
"input": "{StructureFromMotion_1.output}"
"input": "{Meshing_1.output}",
"imagesFolder": "{PrepareDenseScene_1.output}",
"inputMesh": "{MeshFiltering_1.outputMesh}"
}
}
}

View file

@ -1,15 +1,15 @@
{
"header": {
"pipelineVersion": "2.2",
"releaseVersion": "2023.3.0",
"releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1",
"template": true,
"nodesVersions": {
"PhotometricStereo": "1.0",
"CameraInit": "10.0",
"SphereDetection": "1.0",
"LightingCalibration": "1.0",
"Publish": "1.3"
"PhotometricStereo": "1.0",
"Publish": "1.3",
"SphereDetection": "1.0"
}
},
"graph": {
@ -21,17 +21,6 @@
],
"inputs": {}
},
"SphereDetection_1": {
"nodeType": "SphereDetection",
"position": [
200,
0
],
"inputs": {
"input": "{CameraInit_1.output}",
"autoDetect": true
}
},
"LightingCalibration_1": {
"nodeType": "LightingCalibration",
"position": [
@ -70,6 +59,17 @@
"{PhotometricStereo_1.outputSfmDataAlbedo}"
]
}
},
"SphereDetection_1": {
"nodeType": "SphereDetection",
"position": [
200,
0
],
"inputs": {
"input": "{CameraInit_1.output}",
"autoDetect": true
}
}
}
}

View file

@ -520,6 +520,7 @@ class Reconstruction(UIGraph):
@Slot(str, result=bool)
def load(self, filepath, setupProjectFile=True, publishOutputs=False):
logging.info(f"Load project file: '{filepath}'")
try:
status = super(Reconstruction, self).loadGraph(filepath, setupProjectFile, publishOutputs)
# warn about pre-release projects being automatically upgraded