Merge branch 'master' of github.com:daid/SkeinPyPy

SkeinPyPy/newui/preview3d.py

@@ -30,7 +30,7 @@ class previewPanel(wx.Panel):
 		
 		self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_3DDKSHADOW))
 		self.SetMinSize((440,320))
-
+		
 		self.glCanvas = PreviewGLCanvas(self)
 		self.init = 0
 		self.triangleMesh = None
@@ -60,7 +60,7 @@ class previewPanel(wx.Panel):
 		self.layerSpin = wx.SpinCtrl(self.toolbar, -1, '', size=(21*4,21), style=wx.SP_ARROW_KEYS)
 		self.toolbar.AddControl(self.layerSpin)
 		self.Bind(wx.EVT_SPINCTRL, self.OnLayerNrChange, self.layerSpin)
-
+		
 		self.toolbar2 = wx.ToolBar( self, -1 )
 		self.toolbar2.SetToolBitmapSize( ( 21, 21 ) )
 		self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Flip'))

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 = []

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

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()