dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Import dlg - display a msg when an error occurred importingstuff

Browse Source
This commit is contained in:
HomeWorld
2010-10-13 18:15:25 +03:00
parent 02dd0815ac
commit 7b59303fee
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gui/importExport.py
View File

@@ -89,17 +89,23 @@ class ImportDialog(wx.Dialog):
sFit = service.Fit.getInstance()
if self._toggleEdit == -1:
if self._fitsFromFile:
sFit.saveImportedFits(self._fitsFromFile)
self.stStatus.SetLabel("Status: %d fit(s) imported" % len(self._fitsFromFile))
try:
sFit.saveImportedFits(self._fitsFromFile)
self.stStatus.SetLabel("Status: %d fit(s) imported" % len(self._fitsFromFile))
except:
self.stStatus.SetLabel("Status: Error importing from file!")
self._fitsFromFile = None
else:
self.stStatus.SetLabel("Status: No fits were specified. Use Browse button.")
else:
buffer = self.tcEdit.GetValue()
if len(buffer) != 0:
self._fitsFromEdit = sFit.importFitFromBuffer(buffer)
sFit.saveImportedFits(self._fitsFromEdit)
self.stStatus.SetLabel("Status: %d fit(s) imported" % len(self._fitsFromEdit))
try:
self._fitsFromEdit = sFit.importFitFromBuffer(buffer)
sFit.saveImportedFits(self._fitsFromEdit)
self.stStatus.SetLabel("Status: %d fit(s) imported" % len(self._fitsFromEdit))
except:
self.stStatus.SetLabel("Status: Error importing from text editor!")
else:
self.stStatus.SetLabel("Status: Nothing specified.")
event.Skip()
@@ -107,8 +113,11 @@ class ImportDialog(wx.Dialog):
def prepareFileFits(self, event):
sFit = service.Fit.getInstance()
self._fitsFromFile = sFit.importFit(event.Path)
self.stStatus.SetLabel("Found %d fit(s)." % len(self._fitsFromFile))
try:
self._fitsFromFile = sFit.importFit(event.Path)
self.stStatus.SetLabel("Status: Found %d fit(s)." % len(self._fitsFromFile))
except:
self.stStatus.SetLabel("Status: Invalid fitting file!")
def ImportFromFile( self, event ):
print event.Path

1
service/fit.py
View File

@@ -279,4 +279,3 @@ class Fit(object):
def saveImportedFits(self, fits):
for fit in fits:
eos.db.save(fit)
#should return -1 in case of errors