Changeset b91c736 in sasview

Timestamp:

Mar 19, 2010 3:09:45 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:

837a043

Parents:

d2f1595

Message:

append more than one dat into the panel on focus

Location:

guiframe

Files:

• data_loader.py (modified) (3 diffs)
• gui_manager.py (modified) (3 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (5 diffs)

guiframe/data_loader.py

@@ -22 +22 @@
     return path
 
+def append_data_to_existing_panel(panel_name, data_name):
+    """
+        Pop up an error message.
+        
+        @param panel_name: the name of the current panel
+        @param data_name: the name of the current data
+    """
+    message = " Do you want to append %s data\n in "%(str(data_name))
+    message += " %s panel?\n\n"%(str(panel_name))
+    dial = wx.MessageDialog(None, message, 'Question',
+                       wx.YES_NO|wx.NO_DEFAULT|wx.ICON_QUESTION)
+    if dial.ShowModal() == wx.ID_YES:
+        return True
+    else:
+        return False
+   
 
 def load_ascii_1D(path):
@@ -142 +158 @@
         ## 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)
+            title = str(new_plot.title.lstrip().rstrip())
             if title == "":
                 title = str(name)
         else:
             title = str(name)
-        wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title ))
+        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 existing_panel.__class__.__name__ == "ModelPanel1D"\
+                    and existing_panel.group_id is not None:
+                    if append_data_to_existing_panel(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
@@ -190 +215 @@
             new_plot.name = name
             new_plot.interactive = True
-         
             new_plot.group_id = name
             new_plot.id = name
-     
-            new_plot.is_data =True
+            new_plot.is_data = True
+        
             if hasattr(item,"title"):
-                title = 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 existing_panel.__class__.__name__ == "ModelPanel1D"\
+                    and existing_panel.group_id is not None:
+                    if append_data_to_existing_panel(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

@@ -40 +40 @@
 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")
@@ -220 +220 @@
         # Welcome panel
         self.defaultPanel = None
-
+        #panel on focus
+        self.panel_on_focus = None
         # Check for update
         #self._check_update(None)
@@ -238 +239 @@
         # Register to status events
         self.Bind(EVT_STATUS, self._on_status_event)
-    
+        #Register add extra data on the same panel event on load
+        self.Bind(EVT_ADD_MANY_DATA, self.set_panel_on_focus)
+        
+    def set_panel_on_focus(self, event):
+        """
+            Store reference to the last panel on focus
+        """
+        self.panel_on_focus = event.panel
         
     def build_gui(self):

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -24 +24 @@
 from sans.guicomm.events import EVT_NEW_PLOT
 from sans.guicomm.events import StatusEvent ,NewPlotEvent,SlicerEvent,ErrorDataEvent
-from sans.guicomm.events import RemoveDataEvent
+from sans.guicomm.events import RemoveDataEvent, AddManyDataEvent
 from sans.guiframe.utils import PanelMenu
 from sans.guiframe.dataFitting import Data1D
@@ -79 +79 @@
         self.graph.yaxis("\\rm{Intensity} ","cm^{-1}")
         self.graph.render(self)
-   
-   
+        
+    def on_kill_focus(self, event):
+        """
+            reset the panel color and post even just after the panel has been on 
+            focus to make sure the group_id is filled after _onEVT_1DREPLOT
+            is called
+        """
+        self.SetColor(None)
+        self.draw()
+        #post nd event to notify guiframe that this panel is on focus
+        wx.PostEvent(self.parent, AddManyDataEvent(panel=self))
+        
     def _reset(self):
         """
@@ -88 +98 @@
         self.plots      = {}
         self.action_ids = {}
-    
     
     def _onEVT_1DREPLOT(self, event):
@@ -157 +166 @@
         else:
             self._on_add_errors( evt=None)
-        return
     
     def onLeftDown(self,event): 
@@ -169 +177 @@
             position = "x: %8.3g    y: %8.3g" % (event.xdata, event.ydata)
             wx.PostEvent(self.parent, StatusEvent(status=position))
-
-
+     
     def _onRemove(self, event):
         """