Changeset 225aca8 in sasview for src/sas/perspectives

Timestamp:

Jul 28, 2015 10:14:38 AM (9 years ago)

Author:

mathieu

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:

a910c788

Parents:

ae2a197 (diff), d06c34c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #3 from SasView?/standalone_cleanup

Standalone cleanup

Location:

src/sas/perspectives

Files:

• calculator/calculator.py (modified) (1 diff)
• fitting/fitpage.py (modified) (9 diffs)
• fitting/fitting.py (modified) (12 diffs)
• invariant/invariant.py (modified) (1 diff)
• pr/inversion_panel.py (modified) (2 diffs)
• pr/pr.py (modified) (5 diffs)
• fitting/resultpanel.py (modified) (2 diffs)

src/sas/perspectives/calculator/calculator.py

@@ -33 +33 @@
     for calculator perspective
     """
-    def __init__(self, standalone=True):
-        PluginBase.__init__(self, name="Calculator", standalone=standalone)
+    def __init__(self):
+        PluginBase.__init__(self, name="Calculator")
         # Log startup
         logging.info("Calculator plug-in started")

src/sas/perspectives/fitting/fitpage.py

@@ -268 +268 @@
         weighting_box.Add(sizer_weighting)
 
-        sizer_fit = wx.GridSizer(2, 5, 2, 6)
-
         # combobox for smear2d accuracy selection
         self.smear_accuracy = wx.ComboBox(self, -1, size=(50, -1),
@@ -282 +280 @@
 
         #Fit button
-        self.btFit = wx.Button(self, wx.NewId(), 'Fit', size=(88, 25))
+        self.btFit = wx.Button(self, wx.NewId(), 'Fit')
         self.default_bt_colour = self.btFit.GetDefaultAttributes()
         self.btFit.Bind(wx.EVT_BUTTON, self._onFit, id=self.btFit.GetId())
@@ -288 +286 @@
 
         #General Help button
-        self.btFitHelp = wx.Button(self, -1, 'HELP')
-        self.btFitHelp.SetToolTipString("General Fitting Help.")
+        self.btFitHelp = wx.Button(self, -1, 'Help')
+        self.btFitHelp.SetToolTipString("General fitting help.")
         self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp)
         
@@ -303 +301 @@
         self.btSmearHelp = wx.Button(self, -1, '?', style=wx.BU_EXACTFIT,\
                                      size=size_q)
-        self.btSmearHelp.SetToolTipString("Resolution Smearing Help.")
+        self.btSmearHelp.SetToolTipString("Resolution smearing help.")
         self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp)
         
@@ -362 +360 @@
         self.disable_smearer.SetValue(True)
 
-        # add 4 types of smearing to the sizer
-        # Note from June 14, 2015
-        # removed the extra (10,10) spaces to make room for help.  Actually
-        # don't see the need for those anyway as the wx.LEFT, xx should take
-        # care of spacing anyway though it does not seem to work for some
-        # reason.  Currently leaving as we are in "code freeze" only making
-        # minimal changes necessary for release 3.1.  We probably want to clean
-        # up the whole fitpage (and basepage and fitpanel etc) eventually.
-        #                          ---- PDB
         sizer_smearer.Add(self.disable_smearer, 0, wx.LEFT, 10)
-#        sizer_smearer.Add((10, 10))
         sizer_smearer.Add(self.enable_smearer)
-#        sizer_smearer.Add((10, 10))
         sizer_smearer.Add(self.pinhole_smearer)
-#        sizer_smearer.Add((10, 10))
         sizer_smearer.Add(self.slit_smearer)
-#        sizer_smearer.Add((10, 10))
         sizer_smearer.Add(self.btSmearHelp)
         sizer_smearer.Add((10, 10))
@@ -397 +382 @@
 
         # Update and Draw button
-        self.draw_button = wx.Button(self, wx.NewId(),
-                                     'Compute', size=(88, 24))
+        self.draw_button = wx.Button(self, wx.NewId(), 'Compute')
         self.draw_button.Bind(wx.EVT_BUTTON, \
                               self._onDraw, id=self.draw_button.GetId())
@@ -414 +398 @@
         box_description_1 = wx.StaticText(self, -1, '   Chi2/Npts')
         box_description_2 = wx.StaticText(self, -1, 'Npts(Fit)')
-        #box_description_3 = wx.StaticText(self, -1, 'Total Npts')
-        #box_description_3.SetToolTipString( \
-        #                        " Total Npts : total number of data points")
-
-        sizer_fit.Add(box_description_1, 0, 0)
-        sizer_fit.Add(box_description_2, 0, 0)
-        sizer_fit.Add(self.points_sizer, 0, 0)
-        #sizer_fit.Add(box_description_3, 0, 0)
-        sizer_fit.Add(self.draw_button, 0, 0)
-        sizer_fit.Add((-1,5))
-        sizer_fit.Add(self.tcChi, 0, 0)
-        sizer_fit.Add(self.Npts_fit, 0, 0)
-        sizer_fit.Add(self.Npts_total, 0, 0)
-        sizer_fit.Add(self.btFit, 0, 0)
-        sizer_fit.Add(self.btFitHelp, 0, 0)
 
         # StaticText for smear
@@ -576 +545 @@
         self.qmin.Bind(wx.EVT_TEXT, self.on_qrange_text)
         self.qmax.Bind(wx.EVT_TEXT, self.on_qrange_text)
-        id = wx.NewId()
-        self.reset_qrange = wx.Button(self, id, 'Reset', size=(77, 20))
-
-        self.reset_qrange.Bind(wx.EVT_BUTTON, self.on_reset_clicked, id=id)
+        wx_id = wx.NewId()
+        self.reset_qrange = wx.Button(self, wx_id, 'Reset')
+
+        self.reset_qrange.Bind(wx.EVT_BUTTON, self.on_reset_clicked, id=wx_id)
         self.reset_qrange.SetToolTipString("Reset Q range to the default")
 
-        sizer = wx.GridSizer(2, 4, 2, 6)
-
-        self.btEditMask = wx.Button(self, wx.NewId(), 'Editor', size=(88, 23))
+        sizer = wx.GridSizer(5, 5, 2, 6)
+
+        self.btEditMask = wx.Button(self, wx.NewId(), 'Editor')
         self.btEditMask.Bind(wx.EVT_BUTTON, self._onMask,
                              id=self.btEditMask.GetId())
@@ -594 +563 @@
         sizer.Add(wx.StaticText(self, -1, ' Max[1/A]'))
         sizer.Add(self.EditMask_title)
+        sizer.Add((-1,5))
+
         sizer.Add(self.reset_qrange)
         sizer.Add(self.qmin)
         sizer.Add(self.qmax)
-        #sizer.Add(self.theory_npts_tcrtl)
         sizer.Add(self.btEditMask)
+        sizer.Add((-1,5))
+
+        sizer.AddMany(5*[(-1,5)])
+
+        sizer.Add(box_description_1, 0, 0)
+        sizer.Add(box_description_2, 0, 0)
+        sizer.Add(self.points_sizer, 0, 0)
+        sizer.Add(self.draw_button, 0, 0)
+        sizer.Add((-1,5))
+        
+        sizer.Add(self.tcChi, 0, 0)
+        sizer.Add(self.Npts_fit, 0, 0)
+        sizer.Add(self.Npts_total, 0, 0)
+        sizer.Add(self.btFit, 0, 0)
+        sizer.Add(self.btFitHelp, 0, 0)
+        
         boxsizer_range.Add(sizer_chi2)
-        boxsizer_range.Add((10, 10))
         boxsizer_range.Add(sizer)
-
-        boxsizer_range.Add((10, 15))
-        boxsizer_range.Add(sizer_fit)
         if is_2Ddata:
             self.btEditMask.Enable()

src/sas/perspectives/fitting/fitting.py

@@ -61 +61 @@
     Fitting plugin is used to perform fit
     """
-    def __init__(self, standalone=False):
-        PluginBase.__init__(self, name="Fitting", standalone=standalone)
+    def __init__(self):
+        PluginBase.__init__(self, name="Fitting")
 
         #list of panel to send to guiframe
@@ -221 +221 @@
         Get the python editor panel
         """
-        id = event.GetId()
-        label = self.edit_menu.GetLabel(id)
+        event_id = event.GetId()
+        label = self.edit_menu.GetLabel(event_id)
         from sas.perspectives.calculator.pyconsole import PyConsole
         filename = os.path.join(models.find_plugins_dir(), label)
@@ -236 +236 @@
         Delete custom model file
         """
-        id = event.GetId()
-        label = self.delete_menu.GetLabel(id)
+        event_id = event.GetId()
+        label = self.delete_menu.GetLabel(event_id)
         toks = os.path.splitext(label)
         path = os.path.join(models.find_plugins_dir(), toks[0])
@@ -256 +256 @@
                 #                                      info='warning'))
             else:
-                self.delete_menu.Delete(id)
+                self.delete_menu.Delete(event_id)
                 for item in self.edit_menu.GetMenuItems():
                     if item.GetLabel() == label:
@@ -272 +272 @@
         Edit summodel template and make one
         """
-        id = event.GetId()
+        event_id = event.GetId()
         model_manager = models.ModelManager()
         model_list = model_manager.get_model_name_list()
@@ -290 +290 @@
             self.new_model_frame.Show(True)
         else:
-            id = event.GetId()
+            event_id = event.GetId()
             dir_path = models.find_plugins_dir()
             title = "New Custom Model Function"
@@ -332 +332 @@
         Set list of the edit model menu labels
         """
-        id = wx.NewId()
+        wx_id = wx.NewId()
         #new_model_menu = wx.Menu()
-        self.edit_model_menu.Append(id, 'New',
+        self.edit_model_menu.Append(wx_id, 'New',
                                    'Add a new model function')
-        wx.EVT_MENU(owner, id, self.make_new_model)
-        id = wx.NewId()
-        self.edit_model_menu.Append(id, 'Sum|Multi(p1, p2)',
+        wx.EVT_MENU(owner, wx_id, self.make_new_model)
+        wx_id = wx.NewId()
+        self.edit_model_menu.Append(wx_id, 'Sum|Multi(p1, p2)',
                                     'Sum of two model functions')
-        wx.EVT_MENU(owner, id, self.make_sum_model)
+        wx.EVT_MENU(owner, wx_id, self.make_sum_model)
         e_id = wx.NewId()
         self.edit_menu = wx.Menu()
@@ -376 +376 @@
                         has_file = True
                 if not has_file:
-                    id = wx.NewId()
-                    submenu.Append(id, name)
-                    wx.EVT_MENU(owner, id, menu)
+                    wx_id = wx.NewId()
+                    submenu.Append(wx_id, name)
+                    wx.EVT_MENU(owner, wx_id, menu)
                     has_file = False
 
@@ -397 +397 @@
         Create a page to access simultaneous fit option
         """
-        id = event.GetId()
+        event_id = event.GetId()
         caption = "Const & Simul Fit"
         page = self.sim_page
-        if id == self.id_batchfit:
+        if event_id == self.id_batchfit:
             caption = "Combined Batch"
             page = self.batch_page
@@ -719 +719 @@
         for uid, value in self.page_finder.iteritems():
             if uid != sim_page_id and uid != self.batch_page.uid:
-                list = value.get_model()
-                model = list[0]
+                model_list = value.get_model()
+                model = model_list[0]
                 if model.name == modelname:
                     value.set_model_param(names, values)
@@ -1568 +1568 @@
         """
         if event.panel is not None:
-            new_panel = event.panel
             self.slicer_panels.append(event.panel)
             # Set group ID if available
@@ -1652 +1651 @@
             #find if this theory was already plotted and replace that plot given
             #the same id
-            theory_data = self.page_finder[page_id].get_theory_data(fid=data.id)
+            self.page_finder[page_id].get_theory_data(fid=data.id)
 
             if data.is_data:

src/sas/perspectives/invariant/invariant.py

@@ -33 +33 @@
     """
 
-    def __init__(self, standalone=False):
-        PluginBase.__init__(self, name="Invariant", standalone=standalone)
+    def __init__(self):
+        PluginBase.__init__(self, name="Invariant")
 
         # dictionary containing data name and error on dy of that data

src/sas/perspectives/pr/inversion_panel.py

@@ -35 +35 @@
     oscillation_max = 1.5
 
-    def __init__(self, parent, id=-1, plots=None, standalone=False, **kwargs):
+    def __init__(self, parent, id=-1, plots=None, **kwargs):
         """
         """
@@ -83 +83 @@
         ## Data manager
         self._manager = None
-        ## Standalone flage
-        self.standalone = standalone
         ## Default file location for save
         self._default_save_location = os.getcwd()

src/sas/perspectives/pr/pr.py

@@ -54 +54 @@
     DEFAULT_DMAX = 140.0
 
-    def __init__(self, standalone=True):
-        PluginBase.__init__(self, name="Pr Inversion", standalone=standalone)
+    def __init__(self):
+        PluginBase.__init__(self, name="Pr Inversion")
         ## Simulation window manager
         self.simview = None
@@ -94 +94 @@
         ## Number of P(r) points to display on the output plot
         self._pr_npts = 51
-        ## Flag to let the plug-in know that it is running standalone
-        self.standalone = standalone
         self._normalize_output = False
         self._scale_output_unity = False
@@ -623 +621 @@
             return []
         elif item.id == graph.selected_plottable:
-            if not self.standalone and issubclass(item.__class__, Data1D):
+            if issubclass(item.__class__, Data1D):
                 return [["Compute P(r)",
                          "Compute P(r) from distribution",
@@ -1238 +1236 @@
         self.frame = MDIFrame(self.parent, None, 'None', (100, 200))
         self.control_panel = InversionControl(self.frame, -1,
-                                              style=wx.RAISED_BORDER,
-                                              standalone=self.standalone)
+                                              style=wx.RAISED_BORDER)
         self.frame.set_panel(self.control_panel)
         self._frame_set_helper()
@@ -1317 +1314 @@
             [Somehow openGL needs this call]
         """
-        if self.standalone:
-            self.parent.set_perspective(self.perspective)
+        pass

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)
+