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.

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

New node menu categories #1278

Merged
merged 2 commits into from
Feb 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions meshroom/core/desc.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ class Node(object):
size = StaticNodeSize(1)
parallelization = None
documentation = ''
category = 'Other'

def __init__(self):
pass
Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/CameraCalibration.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
class CameraCalibration(desc.CommandLineNode):
commandLine = 'aliceVision_cameraCalibration {allParams}'

category = 'Utils'

inputs = [
desc.File(
name='input',
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/CameraInit.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ class CameraInit(desc.CommandLineNode):

size = desc.DynamicNodeSize('viewpoints')

category = 'Sparse Reconstruction'
documentation = '''
This node describes your dataset. It lists the Viewpoints candidates, the guess about the type of optic, the initial focal length
and which images are sharing the same internal camera parameters, as well as potential cameras rigs.
Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/CameraLocalization.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
class CameraLocalization(desc.CommandLineNode):
commandLine = 'aliceVision_cameraLocalization {allParams}'

category = 'Utils'

inputs = [
desc.File(
name='sfmdata',
Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/CameraRigCalibration.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
class CameraRigCalibration(desc.CommandLineNode):
commandLine = 'aliceVision_rigCalibration {allParams}'

category = 'Utils'

inputs = [
desc.File(
name='sfmdata',
Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/CameraRigLocalization.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
class CameraRigLocalization(desc.CommandLineNode):
commandLine = 'aliceVision_rigLocalization {allParams}'

category = 'Utils'

inputs = [
desc.File(
name='sfmdata',
Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/ConvertMesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

class ConvertMesh(desc.CommandLineNode):
commandLine = 'aliceVision_convertMesh {allParams}'

category = 'Utils'
documentation = '''This node allows to convert a mesh to another format.'''

inputs = [
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/ConvertSfMFormat.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ class ConvertSfMFormat(desc.CommandLineNode):
commandLine = 'aliceVision_convertSfMFormat {allParams}'
size = desc.DynamicNodeSize('input')

category = 'Utils'
documentation = '''
Convert an SfM scene from one file format to another.
It can also be used to remove specific parts of from an SfM scene (like filter all 3D landmarks or filter 2D observations).
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/DepthMap.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class DepthMap(desc.CommandLineNode):
parallelization = desc.Parallelization(blockSize=3)
commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'

category = 'Dense Reconstruction'
documentation = '''
For each camera that have been estimated by the Structure-From-Motion, it estimates the depth value per pixel.

Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/DepthMapFilter.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class DepthMapFilter(desc.CommandLineNode):
parallelization = desc.Parallelization(blockSize=10)
commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'

category = 'Dense Reconstruction'
documentation = '''
Filter depth map values that are not coherent in multiple depth maps.
This allows to filter unstable points before starting the fusion of all depth maps in the Meshing node.
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/ExportAnimatedCamera.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
class ExportAnimatedCamera(desc.CommandLineNode):
commandLine = 'aliceVision_exportAnimatedCamera {allParams}'

category = 'Export'
documentation = '''
Convert cameras from an SfM scene into an animated cameras in Alembic file format.
Based on the input image filenames, it will recognize the input video sequence to create an animated camera.
Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/ExportColoredPointCloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
class ExportColoredPointCloud(desc.CommandLineNode):
commandLine = 'aliceVision_exportColoredPointCloud {allParams}'

category = 'Export'

inputs = [
desc.File(
name='input',
Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/ExportMatches.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ class ExportMatches(desc.CommandLineNode):
commandLine = 'aliceVision_exportMatches {allParams}'
size = desc.DynamicNodeSize('input')

category = 'Export'

inputs = [
desc.File(
name='input',
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/ExportMaya.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
class ExportMaya(desc.CommandLineNode):
commandLine = 'aliceVision_exportMeshroomMaya {allParams}'

category = 'Export'
documentation = '''
Export a scene for Autodesk Maya, with an Alembic file describing the SfM: cameras and 3D points.
It will export half-size undistorted images to use as image planes for cameras and also export thumbnails.
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/FeatureExtraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class FeatureExtraction(desc.CommandLineNode):
parallelization = desc.Parallelization(blockSize=40)
commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'

category = 'Sparse Reconstruction'
documentation = '''
This node extracts distinctive groups of pixels that are, to some extent, invariant to changing camera viewpoints during image acquisition.
Hence, a feature in the scene should have similar feature descriptions in all images.
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/FeatureMatching.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class FeatureMatching(desc.CommandLineNode):
parallelization = desc.Parallelization(blockSize=20)
commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'

category = 'Sparse Reconstruction'
documentation = '''
This node performs the matching of all features between the candidate image pairs.

Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/FeatureRepeatability.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ class FeatureRepeatability(desc.CommandLineNode):
# parallelization = desc.Parallelization(blockSize=40)
# commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'

category = 'Utils'
documentation = '''
Compare feature/descriptor matching repeatability on some dataset with known homography motions.
'''

inputs = [
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/GlobalSfM.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class GlobalSfM(desc.CommandLineNode):
commandLine = 'aliceVision_globalSfM {allParams}'
size = desc.DynamicNodeSize('input')

category = 'Sparse Reconstruction'
documentation = '''
Performs the Structure-From-Motion with a global approach.
It is known to be faster but less robust to challenging datasets than the Incremental approach.
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/ImageMatching.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class ImageMatching(desc.CommandLineNode):
commandLine = 'aliceVision_imageMatching {allParams}'
size = desc.DynamicNodeSize('input')

category = 'Sparse Reconstruction'
documentation = '''
The goal of this node is to select the image pairs to match. The ambition is to find the images that are looking to the same areas of the scene.
Thanks to this node, the FeatureMatching node will only compute the matches between the selected image pairs.
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class ImageMatchingMultiSfM(desc.CommandLineNode):
# use both SfM inputs to define Node's size
size = desc.MultiDynamicNodeSize(['input', 'inputB'])

category = 'Sparse Reconstruction'
documentation = '''
The goal of this node is to select the image pairs to match in the context of an SfM augmentation.
The ambition is to find the images that are looking to the same areas of the scene.
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/ImageProcessing.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class ImageProcessing(desc.CommandLineNode):
# parallelization = desc.Parallelization(blockSize=40)
# commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'

category = 'Utils'
documentation = '''
Convert or apply filtering to the input images.
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/KeyframeSelection.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
class KeyframeSelection(desc.CommandLineNode):
commandLine = 'aliceVision_utils_keyframeSelection {allParams}'

category = 'Utils'
documentation = '''
Allows to extract keyframes from a video and insert metadata.
It can extract frames from a synchronized multi-cameras rig.
Expand Down
2 changes: 1 addition & 1 deletion meshroom/nodes/aliceVision/LdrToHdrCalibration.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ def findMetadata(d, keys, defaultValue):
class LdrToHdrCalibration(desc.CommandLineNode):
commandLine = 'aliceVision_LdrToHdrCalibration {allParams}'
size = desc.DynamicNodeSize('input')

cpu = desc.Level.INTENSIVE
ram = desc.Level.NORMAL

category = 'Panorama HDR'
documentation = '''
Calibrate LDR to HDR response curve from samples
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/LdrToHdrMerge.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class LdrToHdrMerge(desc.CommandLineNode):
parallelization = desc.Parallelization(blockSize=2)
commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'

category = 'Panorama HDR'
documentation = '''
Calibrate LDR to HDR response curve from samples
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/LdrToHdrSampling.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class LdrToHdrSampling(desc.CommandLineNode):
parallelization = desc.Parallelization(blockSize=2)
commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'

category = 'Panorama HDR'
documentation = '''
Sample pixels from Low range images for HDR creation
'''
Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/LightingEstimation.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
class LightingEstimation(desc.CommandLineNode):
commandLine = 'aliceVision_utils_lightingEstimation {allParams}'

category = 'Utils'

inputs = [
desc.File(
name='input',
Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/MergeMeshes.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

class MergeMeshes(desc.CommandLineNode):
commandLine = 'aliceVision_utils_mergeMeshes {allParams}'

category = 'Utils'
documentation = '''
This node allows to merge two meshes in one.

Expand Down
2 changes: 1 addition & 1 deletion meshroom/nodes/aliceVision/MeshDecimate.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

class MeshDecimate(desc.CommandLineNode):
commandLine = 'aliceVision_meshDecimate {allParams}'

cpu = desc.Level.NORMAL
ram = desc.Level.NORMAL

category = 'Mesh Post-Processing'
documentation = '''
This node allows to reduce the density of the Mesh.
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/MeshDenoising.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
class MeshDenoising(desc.CommandLineNode):
commandLine = 'aliceVision_meshDenoising {allParams}'

category = 'Mesh Post-Processing'
documentation = '''
This experimental node allows to reduce noise from a Mesh.
for now, the parameters are difficult to control and vary a lot from one dataset to another.
Expand Down
2 changes: 2 additions & 0 deletions meshroom/nodes/aliceVision/MeshFiltering.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

class MeshFiltering(desc.CommandLineNode):
commandLine = 'aliceVision_meshFiltering {allParams}'

category = 'Dense Reconstruction'
documentation = '''
This node applies a Laplacian filtering to remove local defects from the raw Meshing cut.
'''
Expand Down
2 changes: 1 addition & 1 deletion meshroom/nodes/aliceVision/MeshResampling.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

class MeshResampling(desc.CommandLineNode):
commandLine = 'aliceVision_meshResampling {allParams}'

cpu = desc.Level.NORMAL
ram = desc.Level.NORMAL

category = 'Mesh Post-Processing'
documentation = '''
This node allows to recompute the mesh surface with a new topology and uniform density.
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/Meshing.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class Meshing(desc.CommandLineNode):
cpu = desc.Level.INTENSIVE
ram = desc.Level.INTENSIVE

category = 'Dense Reconstruction'
documentation = '''
This node creates a dense geometric surface representation of the scene.

Expand Down
3 changes: 1 addition & 2 deletions meshroom/nodes/aliceVision/PanoramaCompositing.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
class PanoramaCompositing(desc.CommandLineNode):
commandLine = 'aliceVision_panoramaCompositing {allParams}'
size = desc.DynamicNodeSize('input')

parallelization = desc.Parallelization(blockSize=5)
commandLineRange = '--rangeIteration {rangeIteration} --rangeSize {rangeBlockSize}'

cpu = desc.Level.INTENSIVE
ram = desc.Level.INTENSIVE

category = 'Panorama HDR'
documentation = '''
Once the images have been transformed geometrically (in PanoramaWarping),
they have to be fused together in a single panorama image which looks like a single photography.
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/PanoramaEstimation.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class PanoramaEstimation(desc.CommandLineNode):
commandLine = 'aliceVision_panoramaEstimation {allParams}'
size = desc.DynamicNodeSize('input')

category = 'Panorama HDR'
documentation = '''
Estimate relative camera rotations between input images.
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/PanoramaInit.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ class PanoramaInit(desc.CommandLineNode):
commandLine = 'aliceVision_panoramaInit {allParams}'
size = desc.DynamicNodeSize('input')

category = 'Panorama HDR'
documentation = '''
This node allows to setup the Panorama:

Expand Down
3 changes: 1 addition & 2 deletions meshroom/nodes/aliceVision/PanoramaMerging.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
class PanoramaMerging(desc.CommandLineNode):
commandLine = 'aliceVision_panoramaMerging {allParams}'
size = desc.DynamicNodeSize('input')

cpu = desc.Level.NORMAL
ram = desc.Level.INTENSIVE


category = 'Panorama HDR'
documentation = '''
Merge all inputs coming from PanoramaComposiring
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/PanoramaPrepareImages.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class PanoramaPrepareImages(desc.CommandLineNode):
commandLine = 'aliceVision_panoramaPrepareImages {allParams}'
size = desc.DynamicNodeSize('input')

category = 'Panorama HDR'
documentation = '''
Prepare images for Panorama pipeline: ensures that images orientations are coherent.
'''
Expand Down
2 changes: 1 addition & 1 deletion meshroom/nodes/aliceVision/PanoramaSeams.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
class PanoramaSeams(desc.CommandLineNode):
commandLine = 'aliceVision_panoramaSeams {allParams}'
size = desc.DynamicNodeSize('input')

cpu = desc.Level.INTENSIVE
ram = desc.Level.INTENSIVE

category = 'Panorama HDR'
documentation = '''
Estimate the seams lines between the inputs to provide an optimal compositing in a further node
'''
Expand Down
2 changes: 1 addition & 1 deletion meshroom/nodes/aliceVision/PanoramaWarping.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
class PanoramaWarping(desc.CommandLineNode):
commandLine = 'aliceVision_panoramaWarping {allParams}'
size = desc.DynamicNodeSize('input')

parallelization = desc.Parallelization(blockSize=5)
commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'

category = 'Panorama HDR'
documentation = '''
Compute the image warping for each input image in the panorama coordinate system.
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/PrepareDenseScene.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class PrepareDenseScene(desc.CommandLineNode):
parallelization = desc.Parallelization(blockSize=40)
commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'

category = 'Dense Reconstruction'
documentation = '''
This node export undistorted images so the depth map and texturing can be computed on Pinhole images without distortion.
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/Publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
class Publish(desc.Node):
size = desc.DynamicNodeSize('inputFiles')

category = 'Export'
documentation = '''
This node allows to copy files into a specific folder.
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/SfMAlignment.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class SfMAlignment(desc.CommandLineNode):
commandLine = 'aliceVision_utils_sfmAlignment {allParams}'
size = desc.DynamicNodeSize('input')

category = 'Utils'
documentation = '''
This node allows to change the coordinate system of one SfM scene to align it on another one.

Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/SfMTransfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class SfMTransfer(desc.CommandLineNode):
commandLine = 'aliceVision_utils_sfmTransfer {allParams}'
size = desc.DynamicNodeSize('input')

category = 'Utils'
documentation = '''
This node allows to transfer poses and/or intrinsics form one SfM scene onto another one.
'''
Expand Down
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/SfMTransform.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class SfMTransform(desc.CommandLineNode):
commandLine = 'aliceVision_utils_sfmTransform {allParams}'
size = desc.DynamicNodeSize('input')

category = 'Utils'
documentation = '''
This node allows to change the coordinate system of one SfM scene.

Expand Down
Loading