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.

Sign up for GitHub

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

Jump to bottom

Add track coordinates #2406

Merged
merged 2 commits into from
May 27, 2024
Merged

Add track coordinates #2406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1c9888
Add track coordinates
servantftechnicolor May 21, 2024
2416407
Upgrade nodes versions
servantftechnicolor May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 1 addition & 23 deletions meshroom/nodes/aliceVision/NodalSfM.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.0"
__version__ = "2.0"

from meshroom.core import desc
from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL
Expand All @@ -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",
Expand All @@ -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",
Expand Down
24 changes: 1 addition & 23 deletions meshroom/nodes/aliceVision/RelativePoseEstimating.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.0"
__version__ = "2.0"

from meshroom.core import desc
from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL
Expand All @@ -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",
Expand Down
24 changes: 1 addition & 23 deletions meshroom/nodes/aliceVision/SfmBootstraping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.0"
__version__ = "2.0"

from meshroom.core import desc
from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL
Expand All @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 2 additions & 4 deletions meshroom/pipelines/nodalCameraTracking.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
Expand Down Expand Up @@ -106,7 +106,6 @@
],
"inputs": {
"input": "{TracksBuilding_1.input}",
"featuresFolders": "{TracksBuilding_1.featuresFolders}",
"tracksFilename": "{TracksBuilding_1.output}",
"enforcePureRotation": true
},
Expand All @@ -122,7 +121,6 @@
],
"inputs": {
"input": "{RelativePoseEstimating_1.input}",
"featuresFolders": "{RelativePoseEstimating_1.featuresFolders}",
"tracksFilename": "{RelativePoseEstimating_1.tracksFilename}",
"pairs": "{RelativePoseEstimating_1.output}"
},
Expand Down
6 changes: 2 additions & 4 deletions meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
Expand Down Expand Up @@ -102,7 +102,6 @@
],
"inputs": {
"input": "{TracksBuilding_1.input}",
"featuresFolders": "{TracksBuilding_1.featuresFolders}",
"tracksFilename": "{TracksBuilding_1.output}",
"enforcePureRotation": true
},
Expand All @@ -118,7 +117,6 @@
],
"inputs": {
"input": "{RelativePoseEstimating_1.input}",
"featuresFolders": "{RelativePoseEstimating_1.featuresFolders}",
"tracksFilename": "{RelativePoseEstimating_1.tracksFilename}",
"pairs": "{RelativePoseEstimating_1.output}"
},
Expand Down