Improve Graph Editor UX

bin/meshroom_compute

@@ -6,6 +6,7 @@ import meshroom
 meshroom.setupEnvironment()
 
 import meshroom.core.graph
+import meshroom.core.taskManager
 from meshroom.core.node import Status
 
 
@@ -39,15 +40,19 @@ graph.update()
 if args.node:
     # Execute the node
     node = graph.findNode(args.node)
-    submittedStatuses = [Status.SUBMITTED, Status.RUNNING]
+    submittedStatuses = [Status.RUNNING]
+    if not args.extern:
+        # If running as "extern", the task is supposed to have the status SUBMITTED.
+        # If not running as "extern", the SUBMITTED status should generate a warning.
+        submittedStatuses.append(Status.SUBMITTED)
     if not args.forceStatus and not args.forceCompute:
         if args.iteration != -1:
             chunks = [node.chunks[args.iteration]]
         else:
             chunks = node.chunks
         for chunk in chunks:
             if chunk.status.status in submittedStatuses:
-                print('Error: Node is already submitted with status "{}". See file: "{}"'.format(chunk.status.status.name, chunk.statusFile))
+                print('Warning: Node is already submitted with status "{}". See file: "{}"'.format(chunk.status.status.name, chunk.statusFile))
                 # sys.exit(-1)
     if args.iteration != -1:
         chunk = node.chunks[args.iteration]
@@ -61,5 +66,7 @@ else:
     toNodes = None
     if args.toNode:
         toNodes = graph.findNodes([args.toNode])
-    meshroom.core.graph.executeGraph(graph, toNodes=toNodes, forceCompute=args.forceCompute, forceStatus=args.forceStatus)
+
+    taskManager = meshroom.core.taskManager.TaskManager()
+    taskManager.compute(graph, toNodes=toNodes, forceCompute=args.forceCompute, forceStatus=args.forceStatus)
 

bin/meshroom_photogrammetry

@@ -8,6 +8,7 @@ import meshroom
 meshroom.setupEnvironment()
 
 import meshroom.core.graph
+import meshroom.core.taskManager
 from meshroom import multiview
 
 parser = argparse.ArgumentParser(description='Launch the full photogrammetry or Panorama HDR pipeline.')
@@ -197,7 +198,9 @@ if args.submit:
     if not args.save:
         raise ValueError('Need to save the project to file to submit on renderfarm.')
     # submit on renderfarm
-    meshroom.core.graph.submit(args.save, args.submitter, toNode=toNodes)
+    taskManager = meshroom.core.taskManager.TaskManager()
+    taskManager.submitFromFile(args.save, args.submitter, toNode=toNodes)
 elif args.compute:
     # start computation
-    meshroom.core.graph.executeGraph(graph, toNodes=toNodes, forceCompute=args.forceCompute, forceStatus=args.forceStatus)
+    taskManager = meshroom.core.taskManager.TaskManager()
+    taskManager.compute(graph, toNodes=toNodes, forceCompute=args.forceCompute, forceStatus=args.forceStatus)

bin/meshroom_submit

@@ -5,6 +5,7 @@ import meshroom
 meshroom.setupEnvironment()
 
 import meshroom.core.graph
+import meshroom.core.taskManager
 
 parser = argparse.ArgumentParser(description='Submit a Graph of processes on renderfarm.')
 parser.add_argument('meshroomFile', metavar='MESHROOMFILE.mg', type=str,
@@ -18,4 +19,5 @@ parser.add_argument('--submitter',
                     help='Execute job with a specific submitter.')
 
 args = parser.parse_args()
-meshroom.core.graph.submit(args.meshroomFile, args.submitter, toNode=args.toNode)
+taskManager = meshroom.core.taskManager.TaskManager()
+taskManager.submitFromFile(args.meshroomFile, args.submitter, toNode=args.toNode)

meshroom/__init__.py

@@ -78,7 +78,12 @@ def addToEnvPath(var, val, index=-1):
         if not isinstance(val, (list, tuple)):
             val = [val]
 
-        paths[index:index] = val
+        if index == -1:
+            paths.extend(val)
+        elif index == 0:
+            paths = val + paths
+        else:
+            raise ValueError("addToEnvPath: index must be -1 or 0.")
         os.environ[var] = os.pathsep.join(paths)
 
     # setup root directory (override possible by setting "MESHROOM_INSTALL_DIR" environment variable)