Changeset 25ccf33 in sasview

Timestamp:

May 21, 2009 8:08:48 AM (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:

588f84f

Parents:

b0eee0f0

Message:

load copy of data

Location:

guiframe

Files:

• data_loader.py (modified) (3 diffs)
• gui_manager.py (modified) (2 diffs)

guiframe/data_loader.py

@@ -103 +103 @@
             dxl = None
             dxw = None
-        ## data 's name
-        if output.filename==None:
-            output.filename=str(filename)
+       
             
         ## Creating a Data2D with output
@@ -130 +128 @@
         ## source will request in dataLoader .manipulation module
         new_plot.source=output.source
+        ## data 's name
+        if output.filename==None:
+            output.filename=str(filename)
         ## name of the data allow to differentiate data when plotted
         name= output.filename
-        
+        if not name in parent.indice_load_data.keys():
+            parent.indice_load_data[name]=0
+        else:
+            ## create a copy of the loaded data
+            parent.indice_load_data[name]+=1
+            name = name +"(copy %i)"%parent.indice_load_data[name]
+            
         new_plot.name = name
         ## allow to highlight data when plotted
@@ -172 +179 @@
             
             name= str(item.run[0])
-            
+            if not name in parent.indice_load_data.keys():
+                parent.indice_load_data[name]=0
+            else:
+                ## create a copy of the loaded data
+                parent.indice_load_data[name]+=1
+                name = name +"(copy %i)"%parent.indice_load_data[name]
+                
             new_plot.name = name
             new_plot.interactive = True

guiframe/gui_manager.py

@@ -237 +237 @@
         ## list of open file with name form menu
         #self._saveOpenData()
+        ## Dictionary of open file where keys are filename  and values are number of copy of data plotted
+        ## using the same loaded file 
+        self.indice_load_data={}
         # Register the close event so it calls our own method
         wx.EVT_CLOSE(self, self._onClose)
@@ -805 +808 @@
                 self._default_save_location = os.path.dirname(path)
                
-                self.n_fileOpen += 1
+                #self.n_fileOpen += 1
                 if self.n_fileOpen==1:
                     pos= self.filemenu.GetMenuItemCount()-1