From e893a3dfc6b5e8e0273bdc056ce189d4ba207255 Mon Sep 17 00:00:00 2001 From: Yann Lanthony Date: Mon, 9 Oct 2017 12:16:20 +0200 Subject: [PATCH] rename package 'processGraph' to 'core' --- meshroom/compute.py | 2 +- meshroom/{processGraph => core}/__init__.py | 0 meshroom/{processGraph => core}/desc.py | 0 meshroom/{processGraph => core}/graph.py | 2 +- meshroom/{processGraph => core}/stats.py | 0 meshroom/newNodeType.py | 2 +- meshroom/nodes/CamPairs.py | 2 +- meshroom/nodes/CameraInit.py | 2 +- meshroom/nodes/DepthMap.py | 2 +- meshroom/nodes/DepthMapFilter.py | 2 +- meshroom/nodes/FeatureExtraction.py | 2 +- meshroom/nodes/FeatureMatching.py | 2 +- meshroom/nodes/Fuse.py | 2 +- meshroom/nodes/ImageMatching.py | 2 +- meshroom/nodes/Meshing.py | 2 +- meshroom/nodes/PrepareDenseScene.py | 2 +- meshroom/nodes/StructureFromMotion.py | 2 +- meshroom/nodes/Texturing.py | 2 +- meshroom/nodes/appendText.py | 2 +- meshroom/nodes/ls.py | 2 +- meshroom/statistics.py | 2 +- meshroom/status.py | 2 +- meshroom/ui/commands.py | 2 +- meshroom/ui/reconstruction.py | 2 +- tests/test_task.py | 2 +- 25 files changed, 22 insertions(+), 22 deletions(-) rename meshroom/{processGraph => core}/__init__.py (100%) rename meshroom/{processGraph => core}/desc.py (100%) rename meshroom/{processGraph => core}/graph.py (99%) rename meshroom/{processGraph => core}/stats.py (100%) diff --git a/meshroom/compute.py b/meshroom/compute.py index 6139ad28..1ef352b2 100755 --- a/meshroom/compute.py +++ b/meshroom/compute.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 import argparse -from meshroom.processGraph import graph as pg +from meshroom.core import graph as pg parser = argparse.ArgumentParser(description='Execute a Graph of processes.') parser.add_argument('graphFile', metavar='GRAPHFILE.mg', type=str, diff --git a/meshroom/processGraph/__init__.py b/meshroom/core/__init__.py similarity index 100% rename from meshroom/processGraph/__init__.py rename to meshroom/core/__init__.py diff --git a/meshroom/processGraph/desc.py b/meshroom/core/desc.py similarity index 100% rename from meshroom/processGraph/desc.py rename to meshroom/core/desc.py diff --git a/meshroom/processGraph/graph.py b/meshroom/core/graph.py similarity index 99% rename from meshroom/processGraph/graph.py rename to meshroom/core/graph.py index 1faf5a34..ecbcb340 100644 --- a/meshroom/processGraph/graph.py +++ b/meshroom/core/graph.py @@ -11,7 +11,7 @@ from enum import Enum # available by default in python3. For python2: "pip inst from pprint import pprint from . import stats -from meshroom import processGraph as pg +from meshroom import core as pg from meshroom.common import BaseObject, Model, Slot, Signal, Property # Replace default encoder to support Enums diff --git a/meshroom/processGraph/stats.py b/meshroom/core/stats.py similarity index 100% rename from meshroom/processGraph/stats.py rename to meshroom/core/stats.py diff --git a/meshroom/newNodeType.py b/meshroom/newNodeType.py index 098d96a5..45ab1b70 100755 --- a/meshroom/newNodeType.py +++ b/meshroom/newNodeType.py @@ -63,7 +63,7 @@ if sys.stdin.isatty(): inputCmdLineDoc = ''.join([line for line in sys.stdin]) outputNodeStr = ''' -from meshroom.processGraph import desc +from meshroom.core import desc class __COMMANDNAME__(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/CamPairs.py b/meshroom/nodes/CamPairs.py index ef9414ae..dee87dba 100644 --- a/meshroom/nodes/CamPairs.py +++ b/meshroom/nodes/CamPairs.py @@ -1,4 +1,4 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class CamPairs(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/CameraInit.py b/meshroom/nodes/CameraInit.py index bdea90c8..eae3cc21 100644 --- a/meshroom/nodes/CameraInit.py +++ b/meshroom/nodes/CameraInit.py @@ -1,5 +1,5 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class CameraInit(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/DepthMap.py b/meshroom/nodes/DepthMap.py index b6562ac1..9a8174e5 100644 --- a/meshroom/nodes/DepthMap.py +++ b/meshroom/nodes/DepthMap.py @@ -1,4 +1,4 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class DepthMap(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/DepthMapFilter.py b/meshroom/nodes/DepthMapFilter.py index 6727b5bb..d15f6ebc 100644 --- a/meshroom/nodes/DepthMapFilter.py +++ b/meshroom/nodes/DepthMapFilter.py @@ -1,4 +1,4 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class DepthMapFilter(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/FeatureExtraction.py b/meshroom/nodes/FeatureExtraction.py index bf89ddb7..784cc273 100644 --- a/meshroom/nodes/FeatureExtraction.py +++ b/meshroom/nodes/FeatureExtraction.py @@ -1,5 +1,5 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class FeatureExtraction(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/FeatureMatching.py b/meshroom/nodes/FeatureMatching.py index 45028a73..1242c373 100644 --- a/meshroom/nodes/FeatureMatching.py +++ b/meshroom/nodes/FeatureMatching.py @@ -1,5 +1,5 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class FeatureMatching(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/Fuse.py b/meshroom/nodes/Fuse.py index 7ef9642e..8bd9dd17 100644 --- a/meshroom/nodes/Fuse.py +++ b/meshroom/nodes/Fuse.py @@ -1,4 +1,4 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class Fuse(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/ImageMatching.py b/meshroom/nodes/ImageMatching.py index ac97404c..83a658d1 100644 --- a/meshroom/nodes/ImageMatching.py +++ b/meshroom/nodes/ImageMatching.py @@ -1,5 +1,5 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class ImageMatching(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/Meshing.py b/meshroom/nodes/Meshing.py index b69c3286..2bd7b966 100644 --- a/meshroom/nodes/Meshing.py +++ b/meshroom/nodes/Meshing.py @@ -1,4 +1,4 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class Meshing(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/PrepareDenseScene.py b/meshroom/nodes/PrepareDenseScene.py index 6ce16f8b..a95bd70f 100644 --- a/meshroom/nodes/PrepareDenseScene.py +++ b/meshroom/nodes/PrepareDenseScene.py @@ -1,4 +1,4 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class PrepareDenseScene(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/StructureFromMotion.py b/meshroom/nodes/StructureFromMotion.py index 0d9aef09..f2e5a54c 100644 --- a/meshroom/nodes/StructureFromMotion.py +++ b/meshroom/nodes/StructureFromMotion.py @@ -1,5 +1,5 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class StructureFromMotion(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/Texturing.py b/meshroom/nodes/Texturing.py index 038054ae..4113e6ee 100644 --- a/meshroom/nodes/Texturing.py +++ b/meshroom/nodes/Texturing.py @@ -1,4 +1,4 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class Texturing(desc.CommandLineNode): internalFolder = '{cache}/{nodeType}/{uid0}/' diff --git a/meshroom/nodes/appendText.py b/meshroom/nodes/appendText.py index a347fa27..da912113 100644 --- a/meshroom/nodes/appendText.py +++ b/meshroom/nodes/appendText.py @@ -1,4 +1,4 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class AppendText(desc.CommandLineNode): diff --git a/meshroom/nodes/ls.py b/meshroom/nodes/ls.py index 7fddd3db..532be991 100644 --- a/meshroom/nodes/ls.py +++ b/meshroom/nodes/ls.py @@ -1,4 +1,4 @@ -from meshroom.processGraph import desc +from meshroom.core import desc class Ls(desc.CommandLineNode): diff --git a/meshroom/statistics.py b/meshroom/statistics.py index 58f71862..47edbf06 100755 --- a/meshroom/statistics.py +++ b/meshroom/statistics.py @@ -4,7 +4,7 @@ import os from pprint import pprint from collections import Iterable, defaultdict -from meshroom.processGraph import graph as pg +from meshroom.core import graph as pg def addPlots(curves, title, fileObj): diff --git a/meshroom/status.py b/meshroom/status.py index e8796192..17d10daa 100755 --- a/meshroom/status.py +++ b/meshroom/status.py @@ -3,7 +3,7 @@ import argparse import os from pprint import pprint -from meshroom.processGraph import graph as pg +from meshroom.core import graph as pg parser = argparse.ArgumentParser(description='Query the status of nodes in a Graph of processes.') parser.add_argument('graphFile', metavar='GRAPHFILE.mg', type=str, diff --git a/meshroom/ui/commands.py b/meshroom/ui/commands.py index 5446a474..dd765527 100644 --- a/meshroom/ui/commands.py +++ b/meshroom/ui/commands.py @@ -1,6 +1,6 @@ from PySide2.QtWidgets import QUndoCommand, QUndoStack from PySide2.QtCore import Property, Signal -from meshroom.processGraph.graph import Node +from meshroom.core.graph import Node class UndoCommand(QUndoCommand): diff --git a/meshroom/ui/reconstruction.py b/meshroom/ui/reconstruction.py index ca66f1f2..b072d64e 100644 --- a/meshroom/ui/reconstruction.py +++ b/meshroom/ui/reconstruction.py @@ -1,6 +1,6 @@ from PySide2 import QtCore -from meshroom.processGraph import graph +from meshroom.core import graph from meshroom.ui import commands diff --git a/tests/test_task.py b/tests/test_task.py index ba89c5ac..148e8e85 100644 --- a/tests/test_task.py +++ b/tests/test_task.py @@ -1,4 +1,4 @@ -from meshroom.processGraph.graph import Graph +from meshroom.core.graph import Graph def test_depth():