From 7b59303fee8024d3e3b1b19d813dbb2ec1885a7d Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Wed, 13 Oct 2010 18:15:25 +0300
Subject: [PATCH 1/2] Import dlg - display a msg when an error occurred
 importingstuff

---
 gui/importExport.py | 23 ++++++++++++++++-------
 service/fit.py      |  1 -
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gui/importExport.py b/gui/importExport.py
index 6bd8fbebc..26aa92ebf 100755
--- a/gui/importExport.py
+++ b/gui/importExport.py
@@ -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
diff --git a/service/fit.py b/service/fit.py
index 1b6dd0372..3ef6128f6 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -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
\ No newline at end of file

From 5ab553f901449a5d6a4db5f07d66ed34b415e1f1 Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Wed, 13 Oct 2010 19:30:20 +0300
Subject: [PATCH 2/2] Reverted pygauge animation type to OUT_QUAD, seems to be
 nicer than OUT_QUART

---
 gui/pygauge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/pygauge.py b/gui/pygauge.py
index b9f4011fd..48cafc50e 100644
--- a/gui/pygauge.py
+++ b/gui/pygauge.py
@@ -442,7 +442,7 @@ class PyGauge(wx.PyWindow):
             start = 0
             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
 
         if self._timerId == event.GetId():