Rename of skein to slice

diff --git a/SkeinPyPy/newui/preview3d.py b/SkeinPyPy/newui/preview3d.py
index 5607f9c129958c6e78b92fcbe999bb7791ed5084..2778b6640b0d6359b48facb0c6a8c009a7f0bd63 100644 (file)
--- a/SkeinPyPy/newui/preview3d.py
+++ b/SkeinPyPy/newui/preview3d.py
@@ -30,7 +30,7 @@ class previewPanel(wx.Panel):
                \r
                self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_3DDKSHADOW))\r
                self.SetMinSize((440,320))\r
-\r
+               \r
                self.glCanvas = PreviewGLCanvas(self)\r
                self.init = 0\r
                self.triangleMesh = None\r
@@ -60,7 +60,7 @@ class previewPanel(wx.Panel):
                self.layerSpin = wx.SpinCtrl(self.toolbar, -1, '', size=(21*4,21), style=wx.SP_ARROW_KEYS)\r
                self.toolbar.AddControl(self.layerSpin)\r
                self.Bind(wx.EVT_SPINCTRL, self.OnLayerNrChange, self.layerSpin)\r
-\r
+               \r
                self.toolbar2 = wx.ToolBar( self, -1 )\r
                self.toolbar2.SetToolBitmapSize( ( 21, 21 ) )\r
                self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Flip'))\r

diff --git a/SkeinPyPy/newui/sliceProgessPanel.py b/SkeinPyPy/newui/sliceProgessPanel.py
index 8d2a83e85e7e6f5c0991f58959a0dd03db9c0cdd..ba10bb4def58a8be31a88a6dd79cc6003ac6579a 100644 (file)
--- a/SkeinPyPy/newui/sliceProgessPanel.py
+++ b/SkeinPyPy/newui/sliceProgessPanel.py
@@ -8,7 +8,7 @@ import threading
 import subprocess
 import time
 
-from newui import skeinRun
+from newui import sliceRun
 
 class sliceProgessPanel(wx.Panel):
        def __init__(self, mainWindow, parent, filename):
@@ -115,7 +115,7 @@ class WorkerThread(threading.Thread):
                self.start()
 
        def run(self):
-               p = subprocess.Popen(skeinRun.getSkeinCommand(self.filename), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+               p = subprocess.Popen(sliceRun.getSliceCommand(self.filename), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
                line = p.stdout.readline()
                maxValue = 1
                self.progressLog = []

diff --git a/SkeinPyPy/newui/skeinRun.py b/SkeinPyPy/newui/sliceRun.py
similarity index 96%
rename from SkeinPyPy/newui/skeinRun.py
rename to SkeinPyPy/newui/sliceRun.py
index 8709d2150150c64e2cb72e309380215394880f45..22327682d61dd272f7bf4eb17a34897e2fd46194 100644 (file)
--- a/SkeinPyPy/newui/skeinRun.py
+++ b/SkeinPyPy/newui/sliceRun.py
@@ -23,7 +23,7 @@ def getPyPyExe():
                        return pypyExe 
        return False
 
-def runSkein(fileNames):
+def runSlice(fileNames):
        "Run the slicer on the files. If we are running with PyPy then just do the slicing action. If we are running as Python, try to find pypy."
        pypyExe = getPyPyExe()
        for fileName in fileNames:
@@ -40,7 +40,7 @@ def runSkein(fileNames):
                else:
                        subprocess.call([pypyExe, os.path.join(sys.path[0], sys.argv[0]), fileName])
 
-def getSkeinCommand(filename):
+def getSliceCommand(filename):
        pypyExe = getPyPyExe()
        if pypyExe == False:
                pypyExe = sys.executable

diff --git a/SkeinPyPy/skeinpypy.py b/SkeinPyPy/skeinpypy.py
index 6aa5ef3d3d0a23143c434e0ea1dcba3a50d60763..f307961794c9c4ad1e2aa0db04915a7d09aa18e0 100644 (file)
--- a/SkeinPyPy/skeinpypy.py
+++ b/SkeinPyPy/skeinpypy.py
@@ -16,7 +16,7 @@ import sys
 import platform
 
 from optparse import OptionParser
-from newui import skeinRun
+from newui import sliceRun
 
 __author__ = 'Daid'
 __credits__ = """
@@ -47,7 +47,7 @@ def main():
        (options, args) = parser.parse_args()
        sys.argv = [sys.argv[0]] + args
        if len( args ) > 0:
-               skeinRun.runSkein(args)
+               sliceRun.runSlice(args)
        else:
                from newui import mainWindow
                mainWindow.main()