pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Daid 2012-03-24 10:52:00 +01:00
commit ed55f52e71
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SkeinPyPy/newui/mainWindow.py
View file

@ -243,6 +243,7 @@ class mainWindow(configBase.configWindowBase):
return return
self.lastPath = os.path.split(self.filename)[0] self.lastPath = os.path.split(self.filename)[0]
self.preview3d.loadModelFile(self.filename) self.preview3d.loadModelFile(self.filename)
self.preview3d.setViewMode("Model - Normal")
dlg.Destroy() dlg.Destroy()
def OnSlice(self, e): def OnSlice(self, e):

8
SkeinPyPy/newui/preview3d.py
View file

@ -184,6 +184,11 @@ class previewPanel(wx.Panel):
self.moveModel() self.moveModel()
self.glCanvas.Refresh() self.glCanvas.Refresh()
def setViewMode(self, mode):
self.viewSelect.SetValue(mode)
self.glCanvas.viewMode = self.viewSelect.GetValue()
wx.CallAfter(self.glCanvas.Refresh)
def loadModelFile(self, filename): def loadModelFile(self, filename):
if self.modelFilename != filename: if self.modelFilename != filename:
self.modelFileTime = None self.modelFileTime = None
@ -203,8 +208,9 @@ class previewPanel(wx.Panel):
def loadReModelFile(self, filename): def loadReModelFile(self, filename):
#Only load this again if the filename matches the file we have already loaded (for auto loading GCode after slicing) #Only load this again if the filename matches the file we have already loaded (for auto loading GCode after slicing)
if self.modelFilename != filename: if self.modelFilename != filename:
return return False
self.loadModelFile(filename) self.loadModelFile(filename)
return True
def doFileLoadThread(self): def doFileLoadThread(self):
if os.path.isfile(self.modelFilename) and self.modelFileTime != os.stat(self.modelFilename).st_mtime: if os.path.isfile(self.modelFilename) and self.modelFileTime != os.stat(self.modelFilename).st_mtime:

6
SkeinPyPy/newui/sliceProgessPanel.py
View file

@ -67,8 +67,7 @@ class sliceProgessPanel(wx.Panel):
def OnShowGCode(self, e): def OnShowGCode(self, e):
self.mainWindow.preview3d.loadModelFile(self.filename) self.mainWindow.preview3d.loadModelFile(self.filename)
self.mainWindow.preview3d.viewSelect.SetValue("GCode") self.mainWindow.preview3d.setViewMode("GCode")
self.mainWindow.preview3d.OnViewChange(None)
def OnShowLog(self, e): def OnShowLog(self, e):
LogWindow('\n'.join(self.progressLog)) LogWindow('\n'.join(self.progressLog))
@ -93,7 +92,8 @@ class sliceProgessPanel(wx.Panel):
self.sizer.Layout() self.sizer.Layout()
self.Layout() self.Layout()
self.abort = True self.abort = True
self.mainWindow.preview3d.loadReModelFile(self.filename) if self.mainWindow.preview3d.loadReModelFile(self.filename):
self.mainWindow.preview3d.setViewMode("GCode")
def SetProgress(self, stepName, layer, maxLayer): def SetProgress(self, stepName, layer, maxLayer):
if self.prevStep != stepName: if self.prevStep != stepName: