Changeset 3c44c66 in sasview

Timestamp:

Jul 20, 2010 12:36:35 PM (14 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:

cb19af9f

Parents:

1b17a64

Message:

working on guiframe

Files:

• calculator/sans/__init__.py (added)
• calculator/sld_calculator.py (deleted)
• guicomm/events.py (modified) (1 diff)
• guiframe/data_loader.py (modified) (8 diffs)
• guiframe/data_manager.py (added)
• guiframe/data_panel.py (added)
• guiframe/gui_manager.py (modified) (13 diffs)
• guiframe/local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• guiframe/local_perspectives/plotting/plotting.py (modified) (4 diffs)
• invariantview/perspectives/invariant/invariant_panel.py (modified) (4 diffs)
• prview/perspectives/pr/inversion_panel.py (modified) (1 diff)
• sansview/2d_state.fitv (deleted)
• sansview/perspectives/fitting/basepage.py (modified) (5 diffs)
• sansview/perspectives/fitting/fitpage.py (modified) (1 diff)
• sansview/perspectives/fitting/fitpanel.py (modified) (2 diffs)
• sansview/perspectives/fitting/pagestate.py (modified) (3 diffs)
• sansview/welcome_panel.py (modified) (2 diffs)
• theoryview/perspectives/theory/model_panel.py (modified) (1 diff)

guicomm/events.py

@@ -1 +1 @@
 import wx.lib.newevent
+#send  data to data manager
+(NewStoreDataEvent, EVT_NEW_STORE_DATA) = wx.lib.newevent.NewEvent()
+# send data to other perspectives
+(NewLoadedDataEvent, EVT_NEW_LOADED_DATA) = wx.lib.newevent.NewEvent()
 # plot data
 (NewPlotEvent, EVT_NEW_PLOT) = wx.lib.newevent.NewEvent()

guiframe/data_loader.py

@@ -9 +9 @@
 from load_thread import DataReader
 
-from sans.guicomm.events import NewPlotEvent, StatusEvent
+from sans.guicomm.events import StatusEvent
+from sans.guicomm.events import  NewStoreDataEvent
+from sans.guicomm.events import NewPlotEvent
+
 
 def enable_add_data(existing_panel, new_plot):
@@ -38 +41 @@
 def choose_data_file(parent, location=None):
     """
+    return a list of file path to read
     """
     path = None
@@ -47 +51 @@
     wlist = '|'.join(cards)
     
-    dlg = wx.FileDialog(parent, "Choose a file", location, "", wlist, wx.OPEN)
+    dlg = wx.FileDialog(parent, "Choose a file", location, "", wlist,
+                        style=wx.OPEN|wx.MULTIPLE|wx.CHANGE_DIR)
+    if dlg.ShowModal() == wx.ID_OK:
+        path = dlg.GetPaths()
+        if path:
+            mypath = os.path.basename(path[0])
+    dlg.Destroy()
+   
+    return path
+
+def choose_data_folder(parent, location=None):
+    """
+    return a list of folder to read
+    """
+    path = None
+    if location == None:
+        location = os.getcwd()
+    
+    l = Loader()
+    cards = l.get_wildcards()
+    wlist = '|'.join(cards)
+    
+    dlg = wx.DirDialog(parent, "Choose a directory", location,
+                        style=wx.DD_DEFAULT_STYLE)
     if dlg.ShowModal() == wx.ID_OK:
         path = dlg.GetPath()
@@ -53 +80 @@
     dlg.Destroy()
     
-    return path
+    return [path]
 
 def open_dialog_append_data(panel_name, data_name):
@@ -71 +98 @@
     else:
         return False
-   
-
-def load_ascii_1D(path):
-    """
-    Load a 1D ascii file, with errors
-    """
-    if path and os.path.isfile(path):
-    
-        file_x = numpy.zeros(0)
-        file_y = numpy.zeros(0)
-        file_dy = numpy.zeros(0)
-        file_dx = numpy.zeros(0)
-        
-        input_f = open(path,'r')
-        buff = input_f.read()
-        lines = buff.split('\n')
-        
-        has_dy = False
-        has_dx = False
-        
-        for line in lines:
-            try:
-                toks = line.split()
-                x = float(toks[0])
-                y = float(toks[1])
-                if len(toks)==3:
-                    has_dy = True
-                    errdy = float(toks[2])
-                else:
-                    errdy = 0.0
-                if len(toks) == 4:
-                    has_dx = True
-                    errdx = float(toks[3])
-                else:
-                    errdx = 0.0
-                file_x  = numpy.append(file_x, x)
-                file_y  = numpy.append(file_y, y)
-                file_dy = numpy.append(file_dy, dyerr)
-                file_dx = numpy.append(file_dx, dxerr)
-            except:
-                print "READ ERROR", line
-    
-        if has_dy == False:
-            file_dy = None
-        if has_dx == False:
-            file_dx = None
-            
-        return file_x, file_y, file_dy, file_dx
-    return None, None, None, None
+
 
 def load_error(error=None):
@@ -143 +122 @@
                                                 type="stop"))
     
-def plot_data(parent, path):
-    """
-    Use the DataLoader loader to created data to plot.
-    
-    :param path: the path of the data to load
-    
-    """
-    from sans.guicomm.events import NewPlotEvent, StatusEvent
-    from DataLoader.loader import  Loader
-   
-    # Instantiate a loader 
-    L = Loader()
-    
-    # Load data 
-    try:
-        output = L.load(path)
-    except:
-        load_error(sys.exc_value)
-        return
-    
-    # Notify user if the loader completed the load but no data came out
-    if output == None:
-        load_error("The data file appears to be empty.")
-        return
-  
-     
+
+
+def read_data(parent, path):
+    """
+    Create a list of data to read
+    """
+    list = []
+    if path is not None and len(path) > 0:
+        for p in path:
+            if os.path.isdir(p):
+               list = [os.path.join(os.path.abspath(p), file) for file in os.listdir(p) ]
+              
+            if os.path.isfile(p):
+               list.append(p)
+               
+    return plot_data(parent, numpy.array(list))
+    
+def load_helper(parent , output, path):
+    """
+    """
     filename = os.path.basename(path)
-    
+    #print output.process
     if not  output.__class__.__name__ == "list":
         ## Creating a Data2D with output
         if hasattr(output,'data'):
-            msg = "Loading 2D data: %s"%output.filename
+            msg = "Loading 2D data: %s "%output.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"%output.filename
+            msg = "Loading 1D data: %s "%output.filename
             wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
             new_plot = Data1D(x=[], y=[], dx=None, dy=None)
@@ -222 +195 @@
                         #add this plot the an existing panel
                         new_plot.group_id = existing_panel.group_id
-        wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))
+        return [(new_plot, path)]
+        #wx.PostEvent(parent, NewStoreDataEvent(data=new_plot))
         
     ## the output of the loader is a list , some xml files contain more than one data
     else:
         i=1
+        temp=[]
         for item in output:
-            msg = "Loading 1D data: %s"%str(item.run[0])
+            msg = "Loading 1D data: %s "%str(item.run[0])
             wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
             try:
@@ -279 +254 @@
                         #add this plot the an existing panel
                         new_plot.group_id = existing_panel.group_id
+            temp.append((new_plot, path))
+            #wx.PostEvent(parent, NewStoreDataEvent(data=new_plot))
+            i+=1
+        return temp
+    
+    
+def plot_data(parent, path):
+    """
+    Use the DataLoader loader to created data to plot.
+    
+    :param path: the path of the data to load
+    
+    """
+    from sans.guicomm.events import NewPlotEvent, StatusEvent
+    from DataLoader.loader import  Loader
+   
+    # Instantiate a loader 
+    L = Loader()
+    
+    # Load data 
+    msg = ""
+    list_of_data = []
+    for p in path:
+        try:
+            list_of_data.append((L.load(p), p))
+        except:
+            p_msg = "Loading... " + str(sys.exc_value)
+            wx.PostEvent(parent, StatusEvent(status=p_msg, info="warning"))
+            msg += (str(sys.exc_value)+"\n")
+    if msg.lstrip().rstrip() != "":
+        load_error(msg)
+        
+    #output = map(L.load, path)
+   
+    # Notify user if the loader completed the load but no data came out
+    if len(list_of_data) == 0 or numpy.array(list_of_data).all() is None:
+        load_error("The data file appears to be empty.")
+        msg = "Loading complete: %s"%output.filename
+        wx.PostEvent(parent, StatusEvent(status=msg, info="warning", type="stop"))
+        return
+    result =[]
+    for output , path in list_of_data:
+        result += load_helper(parent=parent, output=output, path=path)
+    msg = "Loading complete: %s"%output.filename
+    wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
+    return result
+    
+    
+def old_plot_data(parent, path):
+    """
+    Use the DataLoader loader to created data to plot.
+    
+    :param path: the path of the data to load
+    
+    """
+    from sans.guicomm.events import NewPlotEvent, StatusEvent
+    from DataLoader.loader import  Loader
+   
+    # Instantiate a loader 
+    L = Loader()
+    
+    # Load data 
+    try:
+        output = L.load(path)
+    except:
+        raise
+        #load_error(sys.exc_value)
+        return
+    
+    # Notify user if the loader completed the load but no data came out
+    if output == None:
+        load_error("The data file appears to be empty.")
+        return
+  
+     
+    filename = os.path.basename(path)
+    
+    if not  output.__class__.__name__ == "list":
+        ## Creating a Data2D with output
+        if hasattr(output,'data'):
+            msg = "Loading 2D data: %s"%output.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"%output.filename
+            wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
+            new_plot = Data1D(x=[], y=[], dx=None, dy=None)
+            
+        new_plot.copy_from_datainfo(output) 
+        output.clone_without_data(clone=new_plot)      
+      
+        ## data 's name
+        if output.filename is None or output.filename == "":
+            output.filename = str(filename)
+        ## name of the data allow to differentiate data when plotted
+        name = parse_name(name=output.filename, expression="_")
+        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 +"[%i]"%parent.indice_load_data[name]
+       
+        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 = name
+        ##group_id specify on which panel to plot this data
+        new_plot.group_id = name
+        new_plot.is_data = True
+        ##post data to plot
+        title = output.filename
+        if hasattr(new_plot,"title"):
+            title = str(new_plot.title.lstrip().rstrip())
+            if title == "":
+                title = str(name)
+        else:
+            title = str(name)
+        if hasattr(parent, "panel_on_focus") and not(parent.panel_on_focus is None):
+                existing_panel  = parent.panel_on_focus
+                panel_name = existing_panel.window_caption
+                data_name = new_plot.name
+                if enable_add_data(existing_panel, new_plot):
+                    if open_dialog_append_data(panel_name, data_name):
+                        #add this plot the an existing panel
+                        new_plot.group_id = existing_panel.group_id
+        wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))
+        
+    ## the output of the loader is a list , some xml files contain more than one data
+    else:
+        i=1
+        for item in output:
+            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.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():
+                parent.indice_load_data[name] = 0
+            else:
+                ## create a copy of the loaded data
+                
+                #TODO: this is a very annoying feature. We should make this
+                # an option. Excel doesn't do this. Why should we?
+                # What is the requirement for this feature, and are the
+                # 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]
+                
+            new_plot.name = name
+            new_plot.interactive = True
+            new_plot.group_id = name
+            new_plot.id = name
+            new_plot.is_data = True
+        
+            if hasattr(item,"title"):
+                title = item.title.lstrip().rstrip()
+                if title == "":
+                    title = str(name)
+            else:
+                title = name
+            if hasattr(parent, "panel_on_focus") and not(parent.panel_on_focus is None):
+                existing_panel  = parent.panel_on_focus
+                panel_name = existing_panel.window_caption
+                data_name = new_plot.name
+                if enable_add_data(existing_panel, new_plot):
+                    if open_dialog_append_data(panel_name, data_name):
+                        #add this plot the an existing panel
+                        new_plot.group_id = existing_panel.group_id
             wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
             i+=1
-         
+  

guiframe/gui_manager.py

@@ -41 +41 @@
     # Didn't find local config, load the default 
     import config
-    
+ 
+import warnings
+warnings.simplefilter("ignore")
+import logging  
+ 
+from sans.guicomm.events import NewPlotEvent
+from sans.guicomm.events import NewLoadedDataEvent
 from sans.guicomm.events import EVT_STATUS
 from sans.guicomm.events import EVT_NEW_PLOT,EVT_SLICER_PARS_UPDATE
 from sans.guicomm.events import EVT_ADD_MANY_DATA
-import warnings
-warnings.simplefilter("ignore")
-
-import logging
+from sans.guicomm.events import StatusEvent
+
+
+from data_manager import DataManager
+from data_panel import DataFrame
 
 def quit_guiframe(parent=None):
@@ -168 +175 @@
         return self.perspective
     
-    def on_perspective(self, event):
+    def on_perspective(self, event=None):
         """
         Call back function for the perspective menu item.
@@ -226 +233 @@
         ## Application manager
         self.app_manager = None
-        
+        ## data manager 
+        self.data_manager = DataManager(parent=self)
+        ## panel to display available data
+        self.data_panel = DataFrame(parent=self, list=[])
+        self.data_panel.set_manager(manager=self.data_manager)
+        self.data_panel.set_owner(owner=self)
         ## Find plug-ins
         # Modify this so that we can specify the directory to look into
@@ -514 +526 @@
         self._mgr.RestoreMaximizedPane()
         
-        
         # Register for showing/hiding the panel
-        
         wx.EVT_MENU(self, ID, self._on_view)
         
@@ -533 +543 @@
         
         id = wx.NewId()
-        self.filemenu.Append(id, '&Load Data', 'Load data file into the application')
-        wx.EVT_MENU(self, id, self._on_open)
-        #self.filemenu.AppendSeparator()
-        
+        self.filemenu.Append(id, '&Load File', 'Load data file(s) into the application')
+        wx.EVT_MENU(self, id, self._on_open_file)
+        id = wx.NewId()
+        self.filemenu.Append(id, '&Load Folder', 'Load data folder into the application')
+        wx.EVT_MENU(self, id, self._on_open_folder)
+        
+        self.filemenu.AppendSeparator()
+        id = wx.NewId()
+        self.filemenu.Append(id, '&Available Data', 'Data available in the application')
+        wx.EVT_MENU(self, id, self._on_display_data)
+         
+        self.filemenu.AppendSeparator()
         id = wx.NewId()
         self.filemenu.Append(id,'&Quit', 'Exit') 
@@ -576 +594 @@
         
         if n_perspectives>1:
+            list=[]
             p_menu = wx.Menu()
             for plug in self.plugins:
@@ -582 +601 @@
                     p_menu.Append(id, plug.sub_menu, "Switch to %s perspective" % plug.sub_menu)
                     wx.EVT_MENU(self, id, plug.on_perspective)
+                    list.append(plug)
             menubar.Append(p_menu,   '&Perspective')
- 
+        self.data_panel.layout_perspective(list_of_perspective=list)
         # Tools menu
         # Go through plug-ins and find tools to populate the tools menu
@@ -697 +717 @@
         
             self._mgr.Update()
-   
-    def _on_open(self, event):
+       
+    def _on_display_data(self, event):
+        """
+        """
+        self.data_panel.Show(True)
+        
+    def _on_open_file(self, event):
         """
         """
         path = self.choose_file()
-        if path is None:
+        if path is None or path[0] is None:
             return
         
-        from data_loader import plot_data
-        if path and os.path.isfile(path):
-            plot_data(self, path)
-           
+        from data_loader import read_data
+        if os.path.isfile(path[0]):
+            data = read_data(self, path)
+            data = self.data_manager.on_get_data(data_list=data)
+            self.data_panel.load_list(list=data)
+            self.data_panel.Show(True)
+            
+    def _on_open_folder(self, event):
+        """
+        """
+        path = self.choose_file(folder=True)
+        msg = "Loading .... "
+        event = StatusEvent(status=msg, info="info", type="progress")
+        self._on_status_event( evt=event)
+        if path is None or path[0] is None:
+            msg = "Loading stopped.... "
+            event = StatusEvent(status=msg, info="info", type="stop")
+            self._on_status_event( evt=event)
+            return
+        from data_loader import read_data
+        if os.path.isdir(path[0]):
+            data = read_data(self, path)
+            data = self.data_manager.on_get_data(data_list=data)
+            self.data_panel.load_list(list=data)
+            self.data_panel.Show(True)
+            
+    def post_data(self, list_of_data, perspective=None,plot=False):
+        """
+        Receive a list of data from data_manager to send to a current 
+        active perspective. if plot is True sends the list of data to plotting
+        perspective
+        """
+        if perspective is not None:
+             for plug in self.plugins:
+                if len(plug.get_perspective()) > 0:
+                    id = wx.NewId()
+                    if plug.sub_menu == perspective:
+                        plug.on_perspective(event=None)
+        if plot:
+             wx.PostEvent(self, NewLoadedDataEvent(plots=list_of_data))
+             return 
+        if self.defaultPanel is not None and \
+            self._mgr.GetPane(self.panels["default"].window_name).IsShown():
+            self.on_close_welcome_panel()
+            
+        for item in self.panels:
+            if self._mgr.GetPane(self.panels[item].window_name).IsShown():
+                self.panels[item].set_data(list=list_of_data)
+    
     def _onClose(self, event):
         """
@@ -737 +807 @@
         except:
             pass
-        
+        if self.data_panel is not None or not self.data_panel.IsBeingDeleted():
+            self.data_panel.Destroy()
         import sys
         wx.Exit()
@@ -748 +819 @@
         flag = quit_guiframe(parent=self)
         if flag:
+            if self.data_panel is not None or not self.data_panel.IsBeingDeleted():
+                self.data_panel.Destroy()
             import sys
             wx.Frame.Close(self)
@@ -803 +876 @@
             dialog = aboutbox.DialogAbout(None, -1, "")
             dialog.ShowModal()            
-            
-    def _onreloaFile(self, event):  
-        """
-        load a data previously opened 
-        """
-        from data_loader import plot_data
-        for item in self.filePathList:
-            id, menuitem_name , path, title = item
-            if id == event.GetId():
-                if path and os.path.isfile(path):
-                    plot_data(self, path)
-                    break
-            
+        
     def set_manager(self, manager):
         """
@@ -864 +925 @@
                 if not self._mgr.GetPane(self.panels[item].window_name).IsShown():
                     self._mgr.GetPane(self.panels[item].window_name).Show()
+                    list_of_data = self.data_manager.get_selected_data()
+                    self.panels[item].set_data(list=list_of_data)
             else:
                 if self._mgr.GetPane(self.panels[item].window_name).IsShown():
@@ -869 +932 @@
     
         self._mgr.Update()
-        
-    def choose_file(self, path=None):
+    
+        if self.data_panel is not None:
+            for plug in self.plugins:
+                if len(plug.get_perspective()) > 0:
+                    for panel in plug.get_perspective():
+                        if panel in panels:
+                            self.data_panel.set_perspective(plug.sub_menu)
+                            break 
+            
+    def choose_file(self, path=None, folder=False):
         """ 
         Functionality that belongs elsewhere
         Should add a hook to specify the preferred file type/extension.
         """
-        #TODO: clean this up
-        from data_loader import choose_data_file
-        
         # Choose a file path
-        if path==None:
-            path = choose_data_file(self, self._default_save_location)
-            
-        if not path==None:
+        if path is None:
+            if folder:
+                from data_loader import choose_data_folder
+                path = choose_data_folder(self, self._default_save_location)
+            else:
+                from data_loader import choose_data_file
+                path = choose_data_file(self, self._default_save_location)
+            
+        if path is not None:
             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)   
+                self._default_save_location = os.path.dirname(path[0])
             except:
-                raise
-                #pass
+                pass
         return path
-    
-    def load_ascii_1D(self, path):
-        """
-        """
-        from data_loader import load_ascii_1D
-        return load_ascii_1D(path)
-                  
+ 
 class DefaultPanel(wx.Panel):
     """

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -81 +81 @@
         self.graph.render(self)
    
+    def set_data(self, list=[]):
+        """
+        """
+        pass
+    
+    
     def _reset(self):
         """

guiframe/local_perspectives/plotting/plotting.py

@@ -15 +15 @@
 import sys
 from sans.guicomm.events import EVT_NEW_PLOT
+from sans.guicomm.events import NewPlotEvent
+from sans.guicomm.events import EVT_NEW_LOADED_DATA
 from sans.guicomm.events import StatusEvent 
 
 
+class PlottingDialog(wx.Dialog):
+    """
+    Dialog to display plotting option
+    """
+    def __init__(self, parent=None, panel_on_focus=None, list_of_data=[]):
+        """
+        """
+        wx.Dialog.__init__(self, parent=parent,title="Plotting", size=(300, 280))
+        self.parent = parent
+        self.panel_on_focus = panel_on_focus
+        self.list_of_data = list_of_data
+        self.define_structure()
+        self.layout_plot_on_panel(list_of_data=self.list_of_data)
+        self.layout_data_name(list_of_data=self.list_of_data)
+        self.layout_button()
+        
+    def define_structure(self):
+        """
+        """
+        #Dialog interface
+        vbox  = wx.BoxSizer(wx.VERTICAL)
+        self.sizer_data = wx.BoxSizer(wx.HORIZONTAL)
+        
+        self.sizer_selection = wx.BoxSizer(wx.VERTICAL)
+        self.sizer_button = wx.BoxSizer(wx.HORIZONTAL)
+        vbox.Add(self.sizer_data)
+        vbox.Add(self.sizer_selection)
+        vbox.Add(self.sizer_button)
+        self.SetSizer(vbox)
+        self.Centre()
+        
+    def layout_button(self):
+        """
+        """
+        self.bt_ok = wx.Button(self, wx.NewId(), "Ok", (30, 10))
+        self.bt_ok.SetToolTipString("plot data")
+        wx.EVT_BUTTON(self, self.bt_ok.GetId(), self.on_ok)
+        
+        self.sizer_button.AddMany([((40,40), 0,
+                                     wx.LEFT|wx.ADJUST_MINSIZE, 100 ),
+                                     (self.bt_ok, 0, wx.ALL,10)])
+        
+    def layout_data_name(self, list_of_data=[]):
+        """
+        """
+        self.data_tcl = wx.TextCtrl(self, -1,size=(260,80), style=wx.TE_MULTILINE)
+        hint_data = "Data to plot."
+        self.data_tcl.SetToolTipString(hint_data)
+        self.data_tcl.SetEditable(False)
+        for item in list_of_data:
+            self.data_tcl.AppendText(item.name+"\n")
+            
+        self.sizer_data.AddMany([(self.data_tcl, 1, wx.ALL, 10)])
+        
+    def layout_plot_on_panel(self, list_of_data=[]):
+        """
+        """
+        if len(list_of_data) == 0:
+            return
+        elif len(list_of_data) ==1:
+            self.layout_single_data(list_of_data=list_of_data)
+        else:
+            self.layout_multiple(list_of_data=list_of_data)
+            
+    def layout_single_data(self, list_of_data=[]):
+        """
+        """
+        self.sizer_selection.Clear(True)
+        if self.panel_on_focus is None and list_of_data < 1:
+            return 
+        else:
+            name = "Plot data on new panel"
+            self.rb_single_data_panel = wx.RadioButton(self, -1,name, 
+                                                    style=wx.RB_GROUP)   
+            msg = "Each data will be plotted separately on a new panel"
+            self.rb_single_data_panel.SetToolTipString(msg)
+            self.rb_single_data_panel.SetValue(True)
+            self.Bind(wx.EVT_RADIOBUTTON, self.on_choose_panel, 
+                                id=self.rb_single_data_panel.GetId())
+            self.rb_panel_on_focus = wx.RadioButton(self, -1,"No Panel on Focus")
+            msg = "All Data will be appended to panel on focus"
+            self.rb_panel_on_focus.SetToolTipString(msg)
+            self.rb_panel_on_focus.Disable()
+            self.Bind(wx.EVT_RADIOBUTTON, self.on_choose_panel, 
+                                id=self.rb_panel_on_focus.GetId())
+            if self.panel_on_focus is not  None:
+                self.rb_panel_on_focus.Enable()
+                self.rb_panel_on_focus.SetLabel(str(panel.window_name))
+            self.sizer_selection.AddMany([(self.rb_single_data_panel,
+                                            1, wx.ALL, 10),
+                     (self.rb_panel_on_focus,1, wx.ALL, 10)])
+            
+    def layout_multiple(self, list_of_data=[]):
+        """
+        """
+        self.sizer_selection.Clear(True)
+        if self.panel_on_focus is None and list_of_data <= 1:
+            return 
+        name = "Plot each data separately"
+        self.rb_single_data_panel = wx.RadioButton(self, -1,name, 
+                                                    style=wx.RB_GROUP)
+        msg = "Each data will be plotted separately on a new panel"
+        self.rb_single_data_panel.SetToolTipString(msg)
+        self.rb_single_data_panel.SetValue(True)
+        self.Bind(wx.EVT_RADIOBUTTON, self.on_choose_panel, 
+                            id=self.rb_single_data_panel.GetId())
+        name = "Append all to new panel"
+        self.rb_new_panel = wx.RadioButton(self, -1,name)
+        msg = "All Data will be appended to a new panel"
+        self.rb_new_panel.SetToolTipString(msg)
+        self.Bind(wx.EVT_RADIOBUTTON, self.on_choose_panel, 
+                            id=self.rb_new_panel.GetId())
+        self.rb_panel_on_focus = wx.RadioButton(self, -1,"No Panel on Focus")
+        msg = "All Data will be appended to panel on focus"
+        self.rb_panel_on_focus.SetToolTipString(msg)
+        self.rb_panel_on_focus.Disable()
+        self.Bind(wx.EVT_RADIOBUTTON, self.on_choose_panel, 
+                            id=self.rb_panel_on_focus.GetId())
+        if self.panel_on_focus is not  None:
+            self.rb_panel_on_focus.Enable()
+            self.rb_panel_on_focus.SetLabel(str(panel.window_name))
+       
+        self.sizer_selection.AddMany([(self.rb_single_data_panel,
+                                            1, wx.LEFT|wx.RIGHT|wx.BOTTOM, 10),
+                (self.rb_new_panel, 1, wx.LEFT|wx.RIGHT|wx.BOTTOM, 10),
+                (self.rb_panel_on_focus, 1, wx.LEFT|wx.RIGHT|wx.BOTTOM, 10),])
+    def on_ok(self, event):
+        """
+        """
+    def on_choose_panel(self, event):
+        """
+        """
 class Plugin:
     """
@@ -62 +196 @@
         self.parent = parent
         # Connect to plotting events
+        self.parent.Bind(EVT_NEW_LOADED_DATA, self._on_plot)
         self.parent.Bind(EVT_NEW_PLOT, self._on_plot_event)
         # We have no initial panels for this plug-in
@@ -92 +227 @@
         pass
     
-    
+    def _on_plot(self, event):
+        """
+        check the contains of event.
+        if it is a list of data to plot plot each one at the time
+        """
+        list_of_data1d = []
+        if hasattr(event, "plots"):
+            for plot, path in event.plots:
+                print "plotting _on_plot"
+                if plot.__class__.__name__ == "Data2D":
+                    wx.PostEvent(self.parent, 
+                                 NewPlotEvent(plot=plot, title=plot.name))
+                else:
+                    list_of_data1d.append((plot, path))
+  
     def _on_plot_event(self, event):
         """
@@ -178 +327 @@
         return
         
+class Data(object): 
+    def __init__(self, name):
+        self.name = str(name)
+class MyApp(wx.App):
+    def OnInit(self):
+        wx.InitAllImageHandlers()
+        list =[Data(name="Data1D")]#,
+                                   # Data(name="Data2D"),Data(name="Data3D")]
+        dialog = PlottingDialog(list_of_data=list)
+        if dialog.ShowModal() == wx.ID_OK:
+            pass
+        dialog.Destroy()
+        
+        return 1
+  
+# end of class MyApp
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()      

invariantview/perspectives/invariant/invariant_panel.py

@@ -113 +113 @@
         return flag
     
-    def set_data(self, data):
+    def set_data(self, list=[], state=None):
+        """
+        Receive  a list of data from gui_manager to compute invariant
+        """
+        if list==[]:
+            msg = "Please select data for Invariant perspective.\n"
+            dial = wx.MessageDialog(None, msg, 'Error Loading File', 
+                                    wx.OK | wx.ICON_EXCLAMATION)
+            dial.ShowModal() 
+            return
+        elif len(list) == 1:
+            data, filepath = list[0]
+            if data.__class__.__name__ == "Data2D":
+                msg = "Invariant cannot be computed for Data2D.\n"
+                msg += "Please load another file.\n"
+                dial = wx.MessageDialog(None, msg, 'Error Loading File', 
+                                        wx.OK | wx.ICON_EXCLAMATION)
+                dial.ShowModal() 
+            else:
+                 self.set_current_data(data=data)
+        else:
+            msg = " Invariant cannot be computed for more than one data.\n"
+            msg += "Please load only file.\n"
+            dial = wx.MessageDialog(None, msg, 'Error Loading File', 
+                                    wx.OK | wx.ICON_EXCLAMATION)
+            dial.ShowModal() 
+    
+    def set_current_data(self, data):
         """
         Set the data
         
-        : return: True/False; if False, it will not set_data
+        : return: True/False; if False, it will not set_current_data
         """
         # warn the users
@@ -178 +205 @@
             self.state = IState()
         else:
-            if not self.set_data(data):
+            if not self.set_current_data(data):
                 return
             self.new_state = True
@@ -826 +853 @@
     def _reset_state_list(self,data=None):
         """
-        Reset the state_list just before data was loading: Used in 'set_data()'
+        Reset the state_list just before data was loading: Used in 'set_current_data()'
         """
         #if data == None: return
@@ -1703 +1730 @@
 
         data.name = data.filename
-        self.panel.set_data(data)
+        self.panel.set_current_data(data)
         self.Centre()
         self.Show(True)

prview/perspectives/pr/inversion_panel.py

@@ -297 +297 @@
         """
         if list==[]:
+            msg = "Please select data for Pr perspective.\n"
+            dial = wx.MessageDialog(None, msg, 'Error Loading File', 
+                                    wx.OK | wx.ICON_EXCLAMATION)
+            dial.ShowModal() 
             return
         elif len(list) == 1:

sansview/perspectives/fitting/basepage.py

@@ -44 +44 @@
         #Set window's font size 
         self.SetWindowVariant(variant=FONT_VARIANT)
+       
         ## parent of the page
         self.parent = parent
@@ -160 +161 @@
         ## layout
         self.set_layout()
-       
+        
     class ModelTextCtrl(wx.TextCtrl):
         """
@@ -233 +234 @@
         def _silent_kill_focus(self,event):
             """
-            do nothing to kill focus
+            Save the state of the page
             """
+            
             event.Skip()
             pass
@@ -803 +805 @@
         self._copy_parameters_state(self.fittable_param, self.state.fittable_param)
         self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
-    
-
+        #save chisqr
+        self.state.tcChi = self.tcChi.GetValue()
+        
     def save_current_state_fit(self):
         """
@@ -1008 +1011 @@
         ## draw the model with previous parameters value
         self._onparamEnter_helper()
+        #reset the value of chisqr when not consistent with the value computed
+        self.tcChi.SetValue(str(self.state.tcChi))
         ## reset context menu items
         self._reset_context_menu()
+        
         ## set the value of the current state to the state given as parameter
         self.state = state.clone() 

sansview/perspectives/fitting/fitpage.py

@@ -1936 +1936 @@
             self.tcChi.SetValue(str(format_number(output)))
 
-            self.state.tcChi =self.tcChi
+            self.state.tcChi = self.tcChi.GetValue()
         except:
             pass  

sansview/perspectives/fitting/fitpanel.py

@@ -200 +200 @@
         self.Center()
         
+    def set_data(self, list=[]):
+        """
+        Receive a list of data and create new 
+        """
+        if list==[]:
+            msg = "Please select data for Fitting perspective.\n"
+            dial = wx.MessageDialog(None, msg, 'Error Loading File', 
+                                    wx.OK | wx.ICON_EXCLAMATION)
+            dial.ShowModal() 
+            return 
+        for data, path in list:
+            self.manager.add_fit_page(data=data)
+            
     def set_state(self, state):
         """
@@ -415 +428 @@
                 return panel 
             else:
-                for name, panel in self.opened_pages.values():
-                    #Don't return any panel is the exact same page is created
-                    if name == page_info.window_name:
+                for value in self.opened_pages.values():
+                    if page_info.window_name == str(value[0]):
+                        #Don't return any panel is the exact same page is created
                         return None
-                    else:
-                        panel = self.add_page(page_info=page_info)
-                        return panel        
+                panel = self.add_page(page_info=page_info)
+                return panel        
         else:
             #a new type of page is created

sansview/perspectives/fitting/pagestate.py

@@ -362 +362 @@
         rep += "model  : %s\n\n"% str(self.model)
         rep += "number parameters(self.parameters): %s\n"%len(self.parameters)
-        rep += self._repr_helper( list=self.parameters, rep=rep)
+        rep = self._repr_helper( list=self.parameters, rep=rep)
         rep += "number orientation parameters"
         rep += "(self.orientation_params): %s\n"%len(self.orientation_params)
-        rep += self._repr_helper( list=self.orientation_params, rep=rep)
+        rep = self._repr_helper( list=self.orientation_params, rep=rep)
         rep += "number dispersity parameters"
         rep += "(self.orientation_params_disp): %s\n"%len(self.orientation_params_disp)
-        rep += self._repr_helper( list=self.orientation_params_disp, rep=rep)
+        rep = self._repr_helper( list=self.orientation_params_disp, rep=rep)
         
         return rep
@@ -1138 +1138 @@
                 output[0].filename = state.file
                 state.data = output[0]
-                state.data.name = state.data_name
+                state.data.name = output[0].filename #state.data_name
                 state.data.id = state.data_id
                 state.data.id = state.data_id
@@ -1182 +1182 @@
             fitstate.toXML(file=filename)
         
-"""     
-Example: ::
+
   
-    if __name__ == "__main__":
-        state = PageState(parent=None)
-        state.toXML()
-        print "state", state
+if __name__ == "__main__":
+    state = PageState(parent=None)
+    #state.toXML()
+    """
     
-"""
+    file = open("test_state", "w")
+    pickle.dump(state, file)
+    print pickle.dumps(state)
+    state.data_name = "hello---->"
+    pickle.dump(state, file)
+    file = open("test_state", "r")
+    new_state= pickle.load(file)
+    print "new state", new_state
+    new_state= pickle.load(file)
+    print "new state", new_state
+    #print "state", state
+    """
+    import bsddb
+    import pickle
+    db= bsddb.btopen('file_state.db', 'c')
+    val = (pickle.dumps(state), "hello", "hi")
+    db['state1']= pickle.dumps(val)
+    print pickle.loads(db['state1'])
+    state.data_name = "hello---->22"
+    db['state2']= pickle.dumps(state)
+    state.data_name = "hello---->2"
+    db['state3']= pickle.dumps(state)
+    del db['state3']
+    state.data_name = "hello---->3"
+    db['state4']= pickle.dumps(state)
+    new_state = pickle.loads(db['state1'])
+    #print db.last()
+    db.set_location('state2')
+    state.data_name = "hello---->5"
+    db['aastate5']= pickle.dumps(state)
+    db.keys().sort()
+    print pickle.loads(db['state2'])
+  
+    db.close()

sansview/welcome_panel.py

@@ -66 +66 @@
             self.parent.on_close_welcome_panel()
         event.Veto() 
-   
+        
+    def set_data(self, list=[]):
+        """
+        """
+        pass
+    
+    
 class WelcomePage(wx.Panel):
     """
@@ -127 +133 @@
         self.SetSizer(sizer_main)
         self.Fit()
-
+        
+    def set_data(self, list=[]):
+        """
+        """
+        pass
 
 class ViewApp(wx.App):

theoryview/perspectives/theory/model_panel.py

@@ -363 +363 @@
         wx.PostEvent(self.parent, event)
               
-                
+    def set_data(self, list=[], state=None):
+        """
+        Receive  a list of data from gui_manager to plot theory
+        """
+        if list==[]:
+            msg = "Please select data for Theory perspective.\n"
+            dial = wx.MessageDialog(None, msg, 'Error Loading File', 
+                                    wx.OK | wx.ICON_EXCLAMATION)
+            dial.ShowModal() 
+            return
+        else :
+            msg = "Theory perspective does not allow Data.\n"
+            msg += "Please import theory or go the theory perspective.\n"
+            dial = wx.MessageDialog(None, msg, 'Error Loading File', 
+                                    wx.OK | wx.ICON_EXCLAMATION)
+            dial.ShowModal() 
+     
     def reset_page(self, state):
         """