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

Check for modified files and ask the user to reload if the file is changed.

Browse source
This commit is contained in:
daid303 2012-12-13 09:52:25 +01:00
parent cedfec86b5
commit 5b44f01b85
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Cura/gui/preview3d.py
View file

@ -145,6 +145,10 @@ class previewPanel(wx.Panel):
sizer.Add(self.glCanvas, 1, flag=wx.EXPAND)
sizer.Add(self.toolbar2, 0, flag=wx.EXPAND|wx.BOTTOM|wx.LEFT|wx.RIGHT, border=1)
self.SetSizer(sizer)
self.checkReloadFileTimer = wx.Timer(self)
self.Bind(wx.EVT_TIMER, self.OnCheckReloadFile, self.checkReloadFileTimer)
self.checkReloadFileTimer.Start(1000)
def returnToModelViewAndUpdateModel(self):
if self.glCanvas.viewMode == 'GCode' or self.glCanvas.viewMode == 'Mixed':
@ -272,18 +276,32 @@ class previewPanel(wx.Panel):
if profile.getProfileSettingFloat('model_scale') != 1.0 or profile.getProfileSettingFloat('model_rotate_base') != 0 or profile.getProfileSetting('flip_x') != 'False' or profile.getProfileSetting('flip_y') != 'False' or profile.getProfileSetting('flip_z') != 'False' or profile.getProfileSetting('swap_xz') != 'False' or profile.getProfileSetting('swap_yz') != 'False' or len(profile.getPluginConfig()) > 0:
self.ShowWarningPopup('Reset scale, rotation, mirror and plugins?', self.OnResetAll)
def loadReModelFiles(self, filelist):
#Only load this again if the filename matches the file we have already loaded (for auto loading GCode after slicing)
for idx in xrange(0, len(filelist)):
if self.objectList[idx].filename != filelist[idx]:
return False
def OnCheckReloadFile(self, e):
#Only show the reload popup when the window has focus, because the popup goes over other programs.
if self.GetParent().FindFocus() is None:
return
for obj in self.objectList:
if obj.filename != None and os.path.isfile(obj.filename) and obj.fileTime != os.stat(obj.filename).st_mtime:
self.checkReloadFileTimer.Stop()
self.ShowWarningPopup('File changed, reload?', self.reloadModelFiles)
def reloadModelFiles(self, filelist = None):
if filelist is not None:
#Only load this again if the filename matches the file we have already loaded (for auto loading GCode after slicing)
for idx in xrange(0, len(filelist)):
if self.objectList[idx].filename != filelist[idx]:
return False
else:
filelist = []
for idx in xrange(0, len(self.objectList)):
filelist.append(self.objectList[idx].filename)
self.loadModelFiles(filelist)
return True
def doFileLoadThread(self):
for obj in self.objectList:
if obj.filename != None and os.path.isfile(obj.filename) and obj.fileTime != os.stat(obj.filename).st_mtime:
obj.ileTime = os.stat(obj.filename).st_mtime
obj.fileTime = os.stat(obj.filename).st_mtime
mesh = meshLoader.loadMesh(obj.filename)
obj.dirty = False
obj.mesh = mesh
@ -319,6 +337,7 @@ class previewPanel(wx.Panel):
wx.CallAfter(self.glCanvas.Refresh)
elif not os.path.isfile(self.gcodeFilename):
self.gcode = None
wx.CallAfter(self.checkReloadFileTimer.Start, 1000)
def loadProgress(self, progress):
pass

2
Cura/gui/sliceProgessPanel.py
View file

@ -142,7 +142,7 @@ class sliceProgessPanel(wx.Panel):
self.sizer.Layout()
self.Layout()
self.abort = True
if self.mainWindow.preview3d.loadReModelFiles(self.filelist):
if self.mainWindow.preview3d.reloadModelFiles(self.filelist):
self.mainWindow.preview3d.setViewMode("GCode")
taskbar.setBusy(self.GetParent(), False)