Changeset b63dc6e in sasview for guiframe

Timestamp:

Aug 11, 2010 10:50:58 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7a07864

Parents:

9b18735

Message:

minor fixes of state

Location:

guiframe

Files:

• data_loader.py (modified) (3 diffs)
• gui_manager.py (modified) (1 diff)

guiframe/data_loader.py

@@ -172 +172 @@
         load_error(sys.exc_value)
         return
-    
+    basename  = os.path.basename(path)
     # Notify user if the loader completed the load but no data came out
     if output == None:
-        basename  = os.path.basename(path)
         if  not basename.endswith('.svs'):
             load_error("The data file appears to be empty.")
         return
   
-     
+    root, extension = os.path.splitext(basename)
+    ext =  extension.lower()
     filename = os.path.basename(path)
     if not  output.__class__.__name__ == "list":
@@ -229 +229 @@
         # plot data
         wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))
-        if format in SVS_FILE_EXT:
+        if ext in SVS_FILE_EXT:
             # set state and plot computation if exists
             wx.PostEvent(parent,InvStateUpdateEvent())
@@ -299 +299 @@
                 wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
                 
-                if format in SVS_FILE_EXT:
+                if ext in SVS_FILE_EXT:
                     # set state and plot computation if exists
                     wx.PostEvent(parent,InvStateUpdateEvent())

guiframe/gui_manager.py

@@ -795 +795 @@
             fd.close()
         else:
+            print "Nothing to save..."
             raise RuntimeError, "%s is not a SansView (.svs) file..." % path