Changeset 9df6a03 in sasview

Timestamp:

Jul 13, 2015 11:13:47 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

24386b9

Parents:

a12c0a6

Message:

fix toolbar on bumps/tools graphs. Fixes #452

File:

• src/sas/perspectives/fitting/resultpanel.py (modified) (2 diffs)

src/sas/perspectives/fitting/resultpanel.py

@@ -9 +9 @@
 import wx.lib.newevent
 from wx.aui import AuiNotebook as Notebook
+
+from bumps.gui.convergence_view import ConvergenceView
+from bumps.gui.uncertainty_view import UncertaintyView, CorrelationView, TraceView
+from bumps.dream.stats import var_stats, format_vars
 
 from sas.guiframe.panel_base import PanelBase
@@ -55 +59 @@
         result = event.result[0][0]
         if hasattr(result, 'convergence'):
-            from bumps.gui.convergence_view import ConvergenceView
             best, pop = result.convergence[:, 0], result.convergence[:, 1:]
-            self.get_panel(ConvergenceView).update(best, pop)
+            self._get_view(ConvergenceView).update(best, pop)
+        else:
+            self._del_view(ConvergenceView)
         if hasattr(result, 'uncertainty_state'):
-            from bumps.gui.uncertainty_view import UncertaintyView, CorrelationView, TraceView
-            from bumps.dream.stats import var_stats, format_vars
             stats = var_stats(result.uncertainty_state.draw())
             msg = format_vars(stats)
-            self.get_panel(CorrelationView).update(result.uncertainty_state)
-            self.get_panel(UncertaintyView).update((result.uncertainty_state, stats))
-            self.get_panel(TraceView).update(result.uncertainty_state)
+            self._get_view(CorrelationView).update(result.uncertainty_state)
+            self._get_view(UncertaintyView).update((result.uncertainty_state, stats))
+            self._get_view(TraceView).update(result.uncertainty_state)
             # TODO: stats should be stored in result rather than computed in bumps UncertaintyView
             wx.PostEvent(self.frame.parent,
                          StatusEvent(status=msg, info="info"))
-            print
+        else:
+            for view in (CorrelationView, UncertaintyView, TraceView):
+                self._del_view(view)
 
     def get_frame(self):
         return self.frame
 
-    def add_panel(self, panel):
-        self.AddPage(panel, panel.title)
-
-    def get_panel(self, panel_class):
+    def _get_view(self, view_class):
         for idx in range(self.PageCount):
-            if self.GetPageText(idx) == panel_class.title:
+            if self.GetPageText(idx) == view_class.title:
                 return self.GetPage(idx)
         else:
-            panel = panel_class(self)
-            self.add_panel(panel)
+            panel = view_class(self)
+            self.AddPage(panel, panel.title)
             return panel
+
+    def _del_view(self, view_class):
+        for idx in range(self.PageCount):
+            if self.GetPageText(idx) == view_class.title:
+                self.DeletePage(idx)
+