From 405f4880cd4b108d85cc70447bdc4b7cbebaae2a Mon Sep 17 00:00:00 2001 From: daid Date: Wed, 28 Mar 2012 14:26:40 +0200 Subject: [PATCH] Split gui to gui and util directories. --- Cura/cura.py | 2 +- Cura/cura_sf/__init__.py | 9 +++++++++ Cura/cura_sf/fabmetheus_utilities/settings.py | 2 +- Cura/gui/alterationPanel.py | 2 +- Cura/gui/configBase.py | 2 +- Cura/gui/configWizard.py | 2 +- Cura/gui/machineCom.py | 2 +- Cura/gui/mainWindow.py | 2 +- Cura/gui/preview3d.py | 6 +++--- Cura/gui/sliceProgessPanel.py | 2 +- Cura/gui/validators.py | 2 +- Cura/util/__init__.py | 0 Cura/{gui => util}/gcodeInterpreter.py | 2 +- Cura/{gui => util}/profile.py | 0 Cura/{gui => util}/sliceRun.py | 2 +- Cura/{gui => util}/util3d.py | 0 16 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 Cura/cura_sf/__init__.py create mode 100644 Cura/util/__init__.py rename Cura/{gui => util}/gcodeInterpreter.py (99%) rename Cura/{gui => util}/profile.py (100%) rename Cura/{gui => util}/sliceRun.py (99%) rename Cura/{gui => util}/util3d.py (100%) diff --git a/Cura/cura.py b/Cura/cura.py index 3633e41a..4de0ed12 100644 --- 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 index 00000000..bdac25da --- /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 626bb04c..3c27c0f4 100644 --- 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 cd99b625..425c823c 100644 --- a/Cura/gui/alterationPanel.py +++ b/Cura/gui/alterationPanel.py @@ -1,7 +1,7 @@ import wx import sys,math,threading,os -from gui import profile +from util import profile class alterationPanel(wx.Panel): def __init__(self, parent): diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py index 4b87473a..9d28af4f 100644 --- 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 8d72d39e..923f5a14 100644 --- 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 from gui import machineCom -from gui import profile +from util import profile class InfoPage(wx.wizard.WizardPageSimple): def __init__(self, parent, title): diff --git a/Cura/gui/machineCom.py b/Cura/gui/machineCom.py index bdf0d458..605d05ce 100644 --- 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 7d33a323..20eb44d0 100644 --- 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 ce857722..7f06f3e4 100644 --- a/Cura/gui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -17,9 +17,9 @@ except: print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/" hasOpenGLlibs = False -from gui import profile -from gui import gcodeInterpreter -from gui import util3d +from util import profile +from util import gcodeInterpreter +from util import util3d from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.vector3 import Vector3 diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py index 7c9528ac..5854060e 100644 --- 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 55e02547..d7db5c82 100644 --- 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 index 00000000..e69de29b 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 2b775507..ca2117cf 100644 --- 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 5a32fbe2..e18fb98a 100644 --- 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 -- 2.30.2