Changeset 4da35bc in sasview for guiframe

Timestamp:

Aug 8, 2010 5:24:15 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:

ef16f59

Parents:

028a0e8

Message:

improved theoryplot display from (inv file)

File:

• guiframe/data_loader.py (modified) (3 diffs)

guiframe/data_loader.py

@@ -8 +8 @@
 from DataLoader.loader import Loader
 from load_thread import DataReader
+from sans.perspectives.invariant import InvStateUpdateEvent
+from perspectives.fitting import FitStateUpdateEvent
 
 from sans.guicomm.events import NewPlotEvent, StatusEvent
@@ -232 +234 @@
                         new_plot.group_id = existing_panel.group_id
         wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))
-        
+        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:
+        
         i=1
         for item in output:
             try:
-                msg = "Loading 1D data: %s"%str(item.run[0])
-                wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
-                try:
-                    dx = item.dx
-                    dxl = item.dxl
-                    dxw = item.dxw
-                except:
-                    dx = None
-                    dxl = None
-                    dxw = None
-    
-                new_plot = Data1D(x=item.x,y=item.y,dx=dx,dy=item.dy)
+                ## Creating a Data2D with output
+                if hasattr(item,'data'):
+                    msg = "Loading 2D data: %s"%item.filename
+                    wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
+                    new_plot = Data2D(image=None, err_image=None)
+              
+                else:
+                    msg = "Loading 1D data: %s"%str(item.run[0])
+                    wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
+                    try:
+                        dx = item.dx
+                        dxl = item.dxl
+                        dxw = item.dxw
+                    except:
+                        dx = None
+                        dxl = None
+                        dxw = None
+        
+                    new_plot = Data1D(x=item.x,y=item.y,dx=dx,dy=item.dy)
+                    
+                    new_plot.dxl = dxl
+                    new_plot.dxw = dxw
+                    
+                item.clone_without_data(clone=new_plot)    
                 new_plot.copy_from_datainfo(item)
-                item.clone_without_data(clone=new_plot)
-                new_plot.dxl = dxl
-                new_plot.dxw = dxw
-                
                 name = parse_name(name=str(item.run[0]), expression="_")
                 #if not name in parent.indice_load_data.keys():
@@ -290 +302 @@
                             new_plot.group_id = existing_panel.group_id
                 wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
+                wx.PostEvent(parent,InvStateUpdateEvent())
+                wx.PostEvent(parent,FitStateUpdateEvent())
                 i+=1
             except:
-                raise
+                pass