Split gui to gui and util directories.

diff --git a/Cura/cura.py b/Cura/cura.py
index 3633e41aa7415f7e348c33290d084b5715550b21..4de0ed12122e285797165b350acd414aedade29a 100644 (file)
--- a/Cura/cura.py
+++ b/Cura/cura.py
@@ -16,7 +16,7 @@ import sys
 import platform
 from optparse import OptionParser
 
-from gui import sliceRun
+from util import sliceRun
 
 __author__ = 'Daid'
 __credits__ = """

diff --git a/Cura/cura_sf/__init__.py b/Cura/cura_sf/__init__.py
new file mode 100644 (file)
index 0000000..bdac25d
--- /dev/null
+++ b/Cura/cura_sf/__init__.py
@@ -0,0 +1,9 @@
+#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
+import os
+import sys
+numberOfLevelsDeepInPackageHierarchy = 1
+packageFilePath = os.path.abspath(__file__)
+for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
+       packageFilePath = os.path.dirname( packageFilePath )
+if packageFilePath not in sys.path:
+       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py
index 626bb04cee60e2671e0ee472f4a243e68dd3ec5f..3c27c0f45817c04c5ec752d59ee997e08436bae5 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/settings.py
+++ b/Cura/cura_sf/fabmetheus_utilities/settings.py
@@ -10,7 +10,7 @@ import __init__
 import os, sys
 import types, math
 
-from gui import profile
+from util import profile
 from fabmetheus_utilities import archive
 
 def DEFSET(setting):

diff --git a/Cura/gui/alterationPanel.py b/Cura/gui/alterationPanel.py
index cd99b62520f9fa09ddceb2abdca4d94e71f08ef9..425c823c9dd2eb126bfdb58ce9eb370b639ddaa7 100644 (file)
--- a/Cura/gui/alterationPanel.py
+++ b/Cura/gui/alterationPanel.py
@@ -1,7 +1,7 @@
 import wx\r
 import sys,math,threading,os\r
 \r
-from gui import profile\r
+from util import profile\r
 \r
 class alterationPanel(wx.Panel):\r
        def __init__(self, parent):\r

diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py
index 4b87473ab0a95c963078b646904ace30cf182fc3..9d28af4f643533643d60f6726b5fc3a103c6b09f 100644 (file)
--- a/Cura/gui/configBase.py
+++ b/Cura/gui/configBase.py
@@ -4,7 +4,7 @@ import __init__
 import wx, os, sys, platform, types
 
 from gui import validators
-from gui import profile
+from util import profile
 
 def main():
        app = wx.App(False)

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 8d72d39e0b088c5bdd6151271ff251855f9fdb81..923f5a14473e61bad2f57ca14d2ce7d15edcce11 100644 (file)
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -5,7 +5,7 @@ import wx, os, platform, types, webbrowser, threading, time, re
 import wx.wizard\r
 \r
 from gui import machineCom\r
-from gui import profile\r
+from util import profile\r
 \r
 class InfoPage(wx.wizard.WizardPageSimple):\r
        def __init__(self, parent, title):\r

diff --git a/Cura/gui/machineCom.py b/Cura/gui/machineCom.py
index bdf0d458f3c8e78f2f208384c52f6256e9596558..605d05cefabaedae590abc9f529e3ae6a62f7223 100644 (file)
--- a/Cura/gui/machineCom.py
+++ b/Cura/gui/machineCom.py
@@ -9,7 +9,7 @@ from avr_isp import stk500v2
 from avr_isp import ispBase
 from avr_isp import intelHex
 
-from gui import profile
+from util import profile
 
 try:
        import _winreg

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 7d33a323d6b59136bdfc91ee2a2e88a9f81eb66d..20eb44d06fa01a9711a1dc0e21ded6155b6fe198 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -12,8 +12,8 @@ from gui import validators
 from gui import preferencesDialog
 from gui import configWizard
 from gui import machineCom
-from gui import profile
 from gui import printWindow
+from util import profile
 
 def main():
        app = wx.App(False)

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index ce857722f3697d1b9f45d1ab2ae8c37f6948d019..7f06f3e47b1214ae8a39d47f588420ea16e623ea 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -17,9 +17,9 @@ except:
        print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"\r
        hasOpenGLlibs = False\r
 \r
-from gui import profile\r
-from gui import gcodeInterpreter\r
-from gui import util3d\r
+from util import profile\r
+from util import gcodeInterpreter\r
+from util import util3d\r
 \r
 from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret\r
 from fabmetheus_utilities.vector3 import Vector3\r

diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 7c9528ac91c94c982eb0744994e509c30c5b0d7f..5854060ee48a8fa1dfe8fcd18fb73952a727f601 100644 (file)
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -8,7 +8,7 @@ import threading
 import subprocess
 import time
 
-from gui import sliceRun
+from util import sliceRun
 
 class sliceProgessPanel(wx.Panel):
        def __init__(self, mainWindow, parent, filename):

diff --git a/Cura/gui/validators.py b/Cura/gui/validators.py
index 55e02547fceb3087a8a3b27a592f81dfff315cbf..d7db5c828385e3dcaa749022d1e7a5e7c11d9bca 100644 (file)
--- a/Cura/gui/validators.py
+++ b/Cura/gui/validators.py
@@ -4,7 +4,7 @@ import __init__
 import types
 import math
 
-from gui import profile
+from util import profile
 
 SUCCESS = 0
 WARNING = 1

diff --git a/Cura/util/__init__.py b/Cura/util/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/Cura/gui/gcodeInterpreter.py b/Cura/util/gcodeInterpreter.py
similarity index 99%
rename from Cura/gui/gcodeInterpreter.py
rename to Cura/util/gcodeInterpreter.py
index 2b775507a67c78bc50bd1edafc9614b3d1ec5e05..ca2117cfcfb301aad8fdc838c58751baa2405e40 100644 (file)
--- a/Cura/gui/gcodeInterpreter.py
+++ b/Cura/util/gcodeInterpreter.py
@@ -7,7 +7,7 @@ import threading
 import re
 import os
 
-from gui import util3d
+from util import util3d
 
 class gcodePath():
        def __init__(self, newType, pathType, layerNr, startPoint):

diff --git a/Cura/gui/profile.py b/Cura/util/profile.py
similarity index 100%
rename from Cura/gui/profile.py
rename to Cura/util/profile.py

diff --git a/Cura/gui/sliceRun.py b/Cura/util/sliceRun.py
similarity index 99%
rename from Cura/gui/sliceRun.py
rename to Cura/util/sliceRun.py
index 5a32fbe2fa2d1c27777fb95b9d4322c7bd04d55b..e18fb98af8d780bdee1d4592dfab5c4f2cc4f27f 100644 (file)
--- a/Cura/gui/sliceRun.py
+++ b/Cura/util/sliceRun.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import
 import platform, os, subprocess, sys
 
 from cura_sf.skeinforge_application.skeinforge_utilities import skeinforge_craft
-from gui import profile
+from util import profile
 
 def getPyPyExe():
        "Return the path to the pypy executable if we can find it. Else return False"

diff --git a/Cura/gui/util3d.py b/Cura/util/util3d.py
similarity index 100%
rename from Cura/gui/util3d.py
rename to Cura/util/util3d.py