From 520c856c577052ab6a5eb11dc99e96b68f090132 Mon Sep 17 00:00:00 2001 From: Ross Hendrickson Date: Sun, 8 Sep 2013 19:41:33 -0500 Subject: [PATCH] Move cura to slicer module. Fix integration points. --- octoprint/gcodefiles.py | 2 +- octoprint/{cura/tests/.__init__.py => slicers/__init__.py} | 0 octoprint/{ => slicers}/cura/.__init__.py | 0 octoprint/{ => slicers}/cura/__init__.py | 0 octoprint/slicers/cura/tests/.__init__.py | 0 octoprint/{ => slicers}/cura/tests/test_cura.py | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename octoprint/{cura/tests/.__init__.py => slicers/__init__.py} (100%) rename octoprint/{ => slicers}/cura/.__init__.py (100%) rename octoprint/{ => slicers}/cura/__init__.py (100%) create mode 100644 octoprint/slicers/cura/tests/.__init__.py rename octoprint/{ => slicers}/cura/tests/test_cura.py (100%) diff --git a/octoprint/gcodefiles.py b/octoprint/gcodefiles.py index e0fc7ce9..58be003b 100644 --- a/octoprint/gcodefiles.py +++ b/octoprint/gcodefiles.py @@ -161,7 +161,7 @@ class GcodeManager: def processSTL(self, absolutePath, callBack, callBackArgs): - from octoprint.cura import CuraFactory + from octoprint.slicers.cura import CuraFactory cura = CuraFactory.create_slicer() gcodePath = util.genGcodeFileName(absolutePath) diff --git a/octoprint/cura/tests/.__init__.py b/octoprint/slicers/__init__.py similarity index 100% rename from octoprint/cura/tests/.__init__.py rename to octoprint/slicers/__init__.py diff --git a/octoprint/cura/.__init__.py b/octoprint/slicers/cura/.__init__.py similarity index 100% rename from octoprint/cura/.__init__.py rename to octoprint/slicers/cura/.__init__.py diff --git a/octoprint/cura/__init__.py b/octoprint/slicers/cura/__init__.py similarity index 100% rename from octoprint/cura/__init__.py rename to octoprint/slicers/cura/__init__.py diff --git a/octoprint/slicers/cura/tests/.__init__.py b/octoprint/slicers/cura/tests/.__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/octoprint/cura/tests/test_cura.py b/octoprint/slicers/cura/tests/test_cura.py similarity index 100% rename from octoprint/cura/tests/test_cura.py rename to octoprint/slicers/cura/tests/test_cura.py