Merge pull request #2406 from alicevision/dev/updateTracks

Add track coordinates
alicevision · May 27, 2024 · bc139d1 · bc139d1
2 parents f7e612c + 2416407
commit bc139d1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 77 deletions.
diff --git a/meshroom/nodes/aliceVision/NodalSfM.py b/meshroom/nodes/aliceVision/NodalSfM.py
@@ -1,4 +1,4 @@
-__version__ = "1.0"
+__version__ = "2.0"
 
 from meshroom.core import desc
 from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL
@@ -21,18 +21,6 @@ class NodalSfM(desc.AVCommandLineNode):
             value="",
             uid=[0],
         ),
-        desc.ListAttribute(
-            elementDesc=desc.File(
-                name="featuresFolder",
-                label="Features Folder",
-                description="",
-                value="",
-                uid=[0],
-            ),
-            name="featuresFolders",
-            label="Features Folders",
-            description="Folder(s) containing the extracted features and descriptors.",
-        ),
         desc.File(
             name="tracksFilename",
             label="Tracks File",
@@ -47,16 +35,6 @@ class NodalSfM(desc.AVCommandLineNode):
             value="",
             uid=[0],
         ),
-        desc.ChoiceParam(
-            name="describerTypes",
-            label="Describer Types",
-            description="Describer types used to describe an image.",
-            value=["dspsift"],
-            values=DESCRIBER_TYPES,
-            exclusive=False,
-            uid=[0],
-            joinChar=",",
-        ),
         desc.ChoiceParam(
             name="verboseLevel",
             label="Verbose Level",

diff --git a/meshroom/nodes/aliceVision/RelativePoseEstimating.py b/meshroom/nodes/aliceVision/RelativePoseEstimating.py
@@ -1,4 +1,4 @@
-__version__ = "1.0"
+__version__ = "2.0"
 
 from meshroom.core import desc
 from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL
@@ -23,35 +23,13 @@ class RelativePoseEstimating(desc.AVCommandLineNode):
             value="",
             uid=[0],
         ),
-        desc.ListAttribute(
-            elementDesc=desc.File(
-                name="featuresFolder",
-                label="Features Folder",
-                description="",
-                value="",
-                uid=[0],
-            ),
-            name="featuresFolders",
-            label="Features Folders",
-            description="Folder(s) containing the extracted features and descriptors.",
-        ),
         desc.File(
             name="tracksFilename",
             label="Tracks File",
             description="Tracks file.",
             value="",
             uid=[0],
         ),
-        desc.ChoiceParam(
-            name="describerTypes",
-            label="Describer Types",
-            description="Describer types used to describe an image.",
-            values=DESCRIBER_TYPES,
-            value=["dspsift"],
-            exclusive=False,
-            uid=[0],
-            joinChar=",",
-        ),
         desc.BoolParam(
             name="enforcePureRotation",
             label="Enforce pure rotation",

diff --git a/meshroom/nodes/aliceVision/SfmBootstraping.py b/meshroom/nodes/aliceVision/SfmBootstraping.py
@@ -1,4 +1,4 @@
-__version__ = "1.0"
+__version__ = "2.0"
 
 from meshroom.core import desc
 from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL
@@ -20,18 +20,6 @@ class SfMBootStraping(desc.AVCommandLineNode):
             value="",
             uid=[0],
         ),
-        desc.ListAttribute(
-            elementDesc=desc.File(
-                name="featuresFolder",
-                label="Features Folder",
-                description="",
-                value="",
-                uid=[0],
-            ),
-            name="featuresFolders",
-            label="Features Folders",
-            description="Folder(s) containing the extracted features and descriptors.",
-        ),
         desc.File(
             name="tracksFilename",
             label="Tracks File",
@@ -46,16 +34,6 @@ class SfMBootStraping(desc.AVCommandLineNode):
             value="",
             uid=[0],
         ),
-        desc.ChoiceParam(
-            name="describerTypes",
-            label="Describer Types",
-            description="Describer types used to describe an image.",
-            values=DESCRIBER_TYPES,
-            value=["dspsift"],
-            exclusive=False,
-            uid=[0],
-            joinChar=",",
-        ),
         desc.ChoiceParam(
             name="verboseLevel",
             label="Verbose Level",

diff --git a/meshroom/pipelines/nodalCameraTracking.mg b/meshroom/pipelines/nodalCameraTracking.mg
@@ -17,9 +17,9 @@
             "Publish": "1.3",
             "DistortionCalibration": "4.0",
             "ImageSegmentation": "1.2",
-            "RelativePoseEstimating": "1.0",
+            "RelativePoseEstimating": "2.0",
             "FeatureExtraction": "1.3",
-            "NodalSfM": "1.0",
+            "NodalSfM": "2.0",
             "TracksBuilding": "1.0"
         }
     },
@@ -106,7 +106,6 @@
             ],
             "inputs": {
                 "input": "{TracksBuilding_1.input}",
-                "featuresFolders": "{TracksBuilding_1.featuresFolders}",
                 "tracksFilename": "{TracksBuilding_1.output}",
                 "enforcePureRotation": true
             },
@@ -122,7 +121,6 @@
             ],
             "inputs": {
                 "input": "{RelativePoseEstimating_1.input}",
-                "featuresFolders": "{RelativePoseEstimating_1.featuresFolders}",
                 "tracksFilename": "{RelativePoseEstimating_1.tracksFilename}",
                 "pairs": "{RelativePoseEstimating_1.output}"
             },

diff --git a/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg b/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg
@@ -13,9 +13,9 @@
             "CameraInit": "10.0",
             "Publish": "1.3",
             "ImageSegmentation": "1.2",
-            "RelativePoseEstimating": "1.0",
+            "RelativePoseEstimating": "2.0",
             "FeatureExtraction": "1.3",
-            "NodalSfM": "1.0",
+            "NodalSfM": "2.0",
             "TracksBuilding": "1.0"
         }
     },
@@ -102,7 +102,6 @@
             ],
             "inputs": {
                 "input": "{TracksBuilding_1.input}",
-                "featuresFolders": "{TracksBuilding_1.featuresFolders}",
                 "tracksFilename": "{TracksBuilding_1.output}",
                 "enforcePureRotation": true
             },
@@ -118,7 +117,6 @@
             ],
             "inputs": {
                 "input": "{RelativePoseEstimating_1.input}",
-                "featuresFolders": "{RelativePoseEstimating_1.featuresFolders}",
                 "tracksFilename": "{RelativePoseEstimating_1.tracksFilename}",
                 "pairs": "{RelativePoseEstimating_1.output}"
             },