From 089289beae99dd92d76bf205c116dde954bea69c Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Thu, 5 Mar 2020 11:53:27 +0100 Subject: [PATCH] [ui] add "New Pipeline" submenu --- meshroom/ui/qml/main.qml | 11 +++++++++++ meshroom/ui/reconstruction.py | 10 ++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/meshroom/ui/qml/main.qml b/meshroom/ui/qml/main.qml index 50fbb35c..c1a7aea3 100755 --- a/meshroom/ui/qml/main.qml +++ b/meshroom/ui/qml/main.qml @@ -314,6 +314,17 @@ ApplicationWindow { shortcut: "Ctrl+N" onTriggered: ensureSaved(function() { _reconstruction.new() }) } + Menu { + title: "New Pipeline" + Action { + text: "Photogrammetry" + onTriggered: ensureSaved(function() { _reconstruction.new("photogrammetry") }) + } + Action { + text: "HDRI" + onTriggered: ensureSaved(function() { _reconstruction.new("hdri") }) + } + } Action { text: "Open" shortcut: "Ctrl+O" diff --git a/meshroom/ui/reconstruction.py b/meshroom/ui/reconstruction.py index e5c54d32..5ccb89d1 100755 --- a/meshroom/ui/reconstruction.py +++ b/meshroom/ui/reconstruction.py @@ -403,17 +403,19 @@ class Reconstruction(UIGraph): self._defaultPipeline = defaultPipeline @Slot() - def new(self): + @Slot(str) + def new(self, pipeline=None): + p = pipeline if pipeline != None else self._defaultPipeline """ Create a new photogrammetry pipeline. """ - if self._defaultPipeline.lower() == "photogrammetry": + if p.lower() == "photogrammetry": # default photogrammetry pipeline self.setGraph(multiview.photogrammetry()) - elif self._defaultPipeline.lower() == "hdri": + elif p.lower() == "hdri": # default hdri pipeline self.setGraph(multiview.hdri()) else: # use the user-provided default photogrammetry project file - self.load(self._defaultPipeline, setupProjectFile=False) + self.load(p, setupProjectFile=False) def load(self, filepath, setupProjectFile=True): try: