Changeset 35eeea8 in sasview

Timestamp:

Mar 20, 2009 5:24:05 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

f2776f6

Parents:

bb18ef1

Message:

remove unused code

File:

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

guiframe/data_loader.py

@@ -79 +79 @@
     from sans.guicomm.events import NewPlotEvent, StatusEvent
     from DataLoader.loader import  Loader
-    
+    ## dictionary of loaded data
+    ##{data.name, number of copy}
+    data_name_list={}
+    ## number of copies of the same loaded data
+    data_n= 1
     #Instantiate a loader 
     L = Loader()
@@ -134 +138 @@
         new_plot.source=output.source
         ## name of the data allow to differentiate data when plotted
-        new_plot.name = output.filename
+        name= output.filename
+        if output.filename in data_name_list.iterkeys():
+            indice = " copy"+ str(data_n)
+            
+            name += indice
+            data_n += 1
+            #print "load data",name
+        else:
+            data_name_list[output.filename]=[]
+        data_name_list[output.filename].append(data_n)
+            
+        #print "data_name_list",data_name_list
+        new_plot.name = name
         ## allow to highlight data when plotted
         new_plot.interactive = True
         ## when 2 data have the same id override the 1 st plotted
-        new_plot.id = output.filename
+        new_plot.id = name
         ## info is a reference to output of dataloader that can be used
         ## to save  data 1D as cansas xml file
@@ -148 +164 @@
         new_plot.yaxis(output._yaxis,output._yunit)
         ##group_id specify on which panel to plot this data
-        new_plot.group_id = output.filename
+        new_plot.group_id = name
         ##post data to plot
-        wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(output.filename)))
+        wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(name)))
         
     ## the output of the loader is a list , some xml files contain more than one data
@@ -171 +187 @@
            
             new_plot.source=item.source
-            new_plot.name = str(item.run[0])
+            
+            name= str(item.run[0])
+            
+            new_plot.name = name
             new_plot.interactive = True
             new_plot.detector =item.detector
@@ -177 +196 @@
             new_plot.xaxis(item._xaxis,item._xunit)
             new_plot.yaxis(item._yaxis,item._yunit)
-            new_plot.group_id = str(item.run[0])
-            new_plot.id = str(item.run[0])
+            new_plot.group_id = name
+            new_plot.id = name
             new_plot.info= item
             
@@ -184 +203 @@
                 title= item.title
             else:
-                title= str(item.run[0])
+                title= name
             wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
             i+=1