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

Merge branch 'master' of evefit.org:pyfa

Browse Source
This commit is contained in:
cncfanatics
2010-10-13 19:22:28 +02:00
parent 77d1ade1fe 5ab553f901
commit d1683cada5
3 changed files with 17 additions and 9 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() sFit = service.Fit.getInstance()
if self._toggleEdit == -1: if self._toggleEdit == -1:
if self._fitsFromFile: if self._fitsFromFile:
sFit.saveImportedFits(self._fitsFromFile) try:
self.stStatus.SetLabel("Status: %d fit(s) imported" % len(self._fitsFromFile)) 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 self._fitsFromFile = None
else: else:
self.stStatus.SetLabel("Status: No fits were specified. Use Browse button.") self.stStatus.SetLabel("Status: No fits were specified. Use Browse button.")
else: else:
buffer = self.tcEdit.GetValue() buffer = self.tcEdit.GetValue()
if len(buffer) != 0: if len(buffer) != 0:
self._fitsFromEdit = sFit.importFitFromBuffer(buffer) try:
sFit.saveImportedFits(self._fitsFromEdit) self._fitsFromEdit = sFit.importFitFromBuffer(buffer)
self.stStatus.SetLabel("Status: %d fit(s) imported" % len(self._fitsFromEdit)) 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: else:
self.stStatus.SetLabel("Status: Nothing specified.") self.stStatus.SetLabel("Status: Nothing specified.")
event.Skip() event.Skip()
@@ -107,8 +113,11 @@ class ImportDialog(wx.Dialog):
def prepareFileFits(self, event): def prepareFileFits(self, event):
sFit = service.Fit.getInstance() sFit = service.Fit.getInstance()
self._fitsFromFile = sFit.importFit(event.Path) try:
self.stStatus.SetLabel("Found %d fit(s)." % len(self._fitsFromFile)) 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 ): def ImportFromFile( self, event ):
print event.Path print event.Path

2
gui/pygauge.py
View File

@@ -442,7 +442,7 @@ class PyGauge(wx.PyWindow):
start = 0 start = 0
end = oldValue - value end = oldValue - value
step=self.OUT_QUART(self._animStep, start, end, self._animDuration) step=self.OUT_QUAD(self._animStep, start, end, self._animDuration)
self._animStep += self._period self._animStep += self._period
if self._timerId == event.GetId(): if self._timerId == event.GetId():

1
service/fit.py
View File

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