Changeset 9b18735 in sasview for guiframe

Timestamp:

Aug 11, 2010 5:35:03 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:

b63dc6e

Parents:

3eb2811

Message:

now all panels are reset when opening svs files: except prview

Location:

guiframe

Files:

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

guiframe/data_loader.py

@@ -12 +12 @@
 
 from sans.guicomm.events import NewPlotEvent, StatusEvent
+SVS_FILE_EXT = ['.svs','.inv','.prv','.fitv']
 
 def enable_add_data(existing_panel, new_plot):
@@ -228 +229 @@
         # plot data
         wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))
-        # set state and plot computation if exists
-        wx.PostEvent(parent,InvStateUpdateEvent())
-        wx.PostEvent(parent,FitStateUpdateEvent())
+        if format in SVS_FILE_EXT:
+            # set state and plot computation if exists
+            wx.PostEvent(parent,InvStateUpdateEvent())
+            wx.PostEvent(parent,FitStateUpdateEvent())
     ## the output of the loader is a list , some xml files contain more than one data
     else:
@@ -262 +264 @@
                 new_plot.copy_from_datainfo(item)    
                 item.clone_without_data(clone=new_plot)    
-                
+                # find original data file name without timestemp
                 name = parse_name(name=str(item.run[0]), expression="_")
-                    
+                max_char = name.find("[")
+                if max_char < 0:
+                    max_char = len(name)
+                original_name =name[0:max_char]
                 #TODO: this is a very annoying feature. We should make this
                 # an option. Excel doesn't do this. Why should we?
@@ -272 +277 @@
                 new_plot.name = name
                 new_plot.interactive = True
-                new_plot.group_id = name
+                new_plot.group_id = original_name
                 new_plot.id = name
                 new_plot.is_data = True
@@ -293 +298 @@
                 # plot data
                 wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
-
-                # set state and plot computation if exists
-                wx.PostEvent(parent,InvStateUpdateEvent())
-                wx.PostEvent(parent,FitStateUpdateEvent())
+                
+                if format in SVS_FILE_EXT:
+                    # set state and plot computation if exists
+                    wx.PostEvent(parent,InvStateUpdateEvent())
+                    wx.PostEvent(parent,FitStateUpdateEvent())
             except:
                 raise

guiframe/gui_manager.py

@@ -715 +715 @@
         
         from data_loader import plot_data
+        from sans.perspectives import invariant
         if path and os.path.isfile(path):
              basename  = os.path.basename(path)
              if  basename.endswith('.svs'):
+                #remove panels for new states
+                 for item in self.panels:
+                     try:
+                         self.panels[item].clear_panel()
+                     except: pass
                  plot_data(self, path,'.inv')
                  plot_data(self, path,'.prv')