Move the validators from gui to util, they do not have gui specific code.
parent
0951b35a44
commit
d631b51e4d
|
@ -16,7 +16,6 @@ import platform
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
|
|
||||||
from util import profile
|
from util import profile
|
||||||
from util import sliceRun
|
|
||||||
|
|
||||||
__author__ = 'Daid'
|
__author__ = 'Daid'
|
||||||
__credits__ = """
|
__credits__ = """
|
||||||
|
@ -69,6 +68,7 @@ def main():
|
||||||
return
|
return
|
||||||
|
|
||||||
if options.slice != None:
|
if options.slice != None:
|
||||||
|
from util import sliceRun
|
||||||
sliceRun.runSlice(args)
|
sliceRun.runSlice(args)
|
||||||
else:
|
else:
|
||||||
if len(args) > 0:
|
if len(args) > 0:
|
||||||
|
|
|
@ -3,7 +3,7 @@ import __init__
|
||||||
|
|
||||||
import wx, wx.lib.stattext, os, sys, platform, types
|
import wx, wx.lib.stattext, os, sys, platform, types
|
||||||
|
|
||||||
from gui import validators
|
from util import validators
|
||||||
from util import profile
|
from util import profile
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
|
@ -8,7 +8,7 @@ from gui import configBase
|
||||||
from gui import preview3d
|
from gui import preview3d
|
||||||
from gui import sliceProgessPanel
|
from gui import sliceProgessPanel
|
||||||
from gui import alterationPanel
|
from gui import alterationPanel
|
||||||
from gui import validators
|
from util import validators
|
||||||
|
|
||||||
class expertConfigWindow(configBase.configWindowBase):
|
class expertConfigWindow(configBase.configWindowBase):
|
||||||
"Expert configuration window"
|
"Expert configuration window"
|
||||||
|
|
|
@ -8,7 +8,6 @@ from gui import expertConfig
|
||||||
from gui import preview3d
|
from gui import preview3d
|
||||||
from gui import sliceProgessPanel
|
from gui import sliceProgessPanel
|
||||||
from gui import alterationPanel
|
from gui import alterationPanel
|
||||||
from gui import validators
|
|
||||||
from gui import preferencesDialog
|
from gui import preferencesDialog
|
||||||
from gui import configWizard
|
from gui import configWizard
|
||||||
from gui import firmwareInstall
|
from gui import firmwareInstall
|
||||||
|
@ -19,6 +18,7 @@ from gui import batchRun
|
||||||
from gui import flatSlicerWindow
|
from gui import flatSlicerWindow
|
||||||
from gui import icon
|
from gui import icon
|
||||||
from gui import dropTarget
|
from gui import dropTarget
|
||||||
|
from util import validators
|
||||||
from util import profile
|
from util import profile
|
||||||
from util import version
|
from util import version
|
||||||
from util import sliceRun
|
from util import sliceRun
|
||||||
|
|
|
@ -5,7 +5,7 @@ import wx, os, platform, types, string
|
||||||
import ConfigParser
|
import ConfigParser
|
||||||
|
|
||||||
from gui import configBase
|
from gui import configBase
|
||||||
from gui import validators
|
from util import validators
|
||||||
from util import machineCom
|
from util import machineCom
|
||||||
from util import profile
|
from util import profile
|
||||||
|
|
||||||
|
|
|
@ -20,9 +20,9 @@ from gui import opengl
|
||||||
from gui import toolbarUtil
|
from gui import toolbarUtil
|
||||||
from gui import icon
|
from gui import icon
|
||||||
from gui import configBase
|
from gui import configBase
|
||||||
from gui import validators
|
|
||||||
from gui import printWindow
|
from gui import printWindow
|
||||||
from gui import dropTarget
|
from gui import dropTarget
|
||||||
|
from util import validators
|
||||||
from util import profile
|
from util import profile
|
||||||
from util import util3d
|
from util import util3d
|
||||||
from util import stl
|
from util import stl
|
||||||
|
|
|
@ -6,12 +6,12 @@ import wx, os, platform, types, webbrowser
|
||||||
from gui import configBase
|
from gui import configBase
|
||||||
from gui import preview3d
|
from gui import preview3d
|
||||||
from gui import sliceProgessPanel
|
from gui import sliceProgessPanel
|
||||||
from gui import validators
|
|
||||||
from gui import preferencesDialog
|
from gui import preferencesDialog
|
||||||
from gui import configWizard
|
from gui import configWizard
|
||||||
from gui import firmwareInstall
|
from gui import firmwareInstall
|
||||||
from gui import printWindow
|
from gui import printWindow
|
||||||
from gui import icon
|
from gui import icon
|
||||||
|
from util import validators
|
||||||
from util import profile
|
from util import profile
|
||||||
from util import version
|
from util import version
|
||||||
from util import sliceRun
|
from util import sliceRun
|
||||||
|
|
Loading…
Reference in New Issue