Changeset 83ee3851 in sasview

Timestamp:

Jul 27, 2010 2:47:56 PM (15 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:

330c63b

Parents:

9fb814a

Message:

remove copy on data_loader

Location:

guiframe

Files:

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

guiframe/data_loader.py

@@ -245 +245 @@
            
             name = parse_name(name=str(item.run[0]), expression="_")
-            if not name in parent.indice_load_data.keys():
-                parent.indice_load_data[name] = 0
-            else:
+            #if not name in parent.indice_load_data.keys():
+            #    parent.indice_load_data[name] = 0
+            #else:
                 ## create a copy of the loaded data
                 
@@ -255 +255 @@
                 # counter arguments stronger? Is this feature developed
                 # to please at least 80% of the users or a special few?
-                parent.indice_load_data[name] += 1
-                name = name + "(copy %i)"%parent.indice_load_data[name]
+                #parent.indice_load_data[name] += 1
+                #name = name + "(copy %i)"%parent.indice_load_data[name]
                 
             new_plot.name = name

guiframe/gui_manager.py

@@ -919 +919 @@
             try:
                 self._default_save_location = os.path.dirname(path)
-               
-                #self.n_fileOpen += 1
-                if self.n_fileOpen==1:
-                    pos= self.filemenu.GetMenuItemCount()-1
-                    #self.filemenu.InsertSeparator(pos )
-               
-                id = wx.NewId()
-                filename= os.path.basename(path)
-                dir= os.path.split(self._default_save_location)[1]
-                title= str(os.path.join(dir,filename )) 
-                menuitem_name = str(self.n_fileOpen)+". "+ title
-                position= self.filemenu.GetMenuItemCount()-2
-                #self.filemenu.Insert(id=id, pos= position,text=menuitem_name,help=str(path) ) 
-                #self.filePathList.append(( id, menuitem_name, path, title))
-                #wx.EVT_MENU(self, id, self._onreloaFile)
-                
-                ## construct menu item for open file
-                if self.n_fileOpen == self.n_maxfileopen +1:
-                    ## reach the maximun number of path to store
-                    self.n_fileOpen = 0
-                    id, menuitem_name , path, title = self.filePathList[0]
-                    self.filemenu.Delete(id)
-                    self.filePathList.pop(0)
-                    for item in self.filePathList:
-                        id, menuitem_name , path, title = item
-                        self.n_fileOpen += 1
-                        label = str(self.n_fileOpen)+". "+ title
-                        #self.filemenu.FindItemById(id).SetItemLabel(label)   
             except:
-                raise
-                #pass
+                pass
         return path