Changeset f21d496 in sasview for src

Timestamp:

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

Author:

Doucet, Mathieu <doucetm@…>

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:

78f75d02

Parents:

3a5f7c8

Message:

Cleaning up old "standalone" code

Location:

src/sas

Files:

• guiframe/gui_manager.py (modified) (3 diffs)
• guiframe/local_perspectives/data_loader/data_loader.py (modified) (1 diff)
• guiframe/local_perspectives/plotting/plotting.py (modified) (1 diff)
• guiframe/plugin_base.py (modified) (3 diffs)
• perspectives/calculator/calculator.py (modified) (1 diff)
• perspectives/fitting/fitting.py (modified) (14 diffs)
• perspectives/invariant/invariant.py (modified) (1 diff)
• perspectives/pr/inversion_panel.py (modified) (2 diffs)
• perspectives/pr/pr.py (modified) (5 diffs)

src/sas/guiframe/gui_manager.py

@@ -818 +818 @@
         # Load panels
         self._load_panels()
-        self.set_default_perspective()
 
     def SetStatusText(self, *args, **kwds):
@@ -927 +926 @@
                         if hasattr(module, "PLUGIN_ID"):
                             try:
-                                plug = module.Plugin()
-                                if plug.set_default_perspective():
-                                    self._current_perspective = plug
-                                plugins.append(plug)
-
+                                plugins.append(module.Plugin())
                                 msg = "Found plug-in: %s" % module.PLUGIN_ID
                                 logging.info(msg)
@@ -2199 +2194 @@
                 item.post_init()
 
-    def set_default_perspective(self):
-        """
-        Choose among the plugin the first plug-in that has
-        "set_default_perspective" method and its return value is True will be
-        as a default perspective when the welcome page is closed
-        """
-        for item in self.plugins:
-            if hasattr(item, "set_default_perspective"):
-                if item.set_default_perspective():
-                    item.on_perspective(event=None)
-                    return
-
     def set_perspective(self, panels):
         """

src/sas/guiframe/local_perspectives/data_loader/data_loader.py

@@ -41 +41 @@
 class Plugin(PluginBase):
 
-    def __init__(self, standalone=False):
-        PluginBase.__init__(self, name="DataLoader", standalone=standalone)
+    def __init__(self):
+        PluginBase.__init__(self, name="DataLoader")
         # Default location
         self._default_save_location = DEFAULT_OPEN_FOLDER

src/sas/guiframe/local_perspectives/plotting/plotting.py

@@ -36 +36 @@
     """
 
-    def __init__(self, standalone=False):
-        PluginBase.__init__(self, name="Plotting", standalone=standalone)
+    def __init__(self):
+        PluginBase.__init__(self, name="Plotting")
 
         ## Plot panels

src/sas/guiframe/plugin_base.py

@@ -34 +34 @@
     """
 
-    def __init__(self, name="Test_plugin", standalone=True):
+    def __init__(self, name="Test_plugin"):
         """
         Abstract class for gui_manager Plugins.
@@ -42 +42 @@
         ## Plug-in name. It will appear on the application menu.
         self.sub_menu = name
-        #standalone flag
-        self.standalone = standalone
         ## Reference to the parent window. Filled by get_panels() below.
         self.parent = None
@@ -263 +261 @@
         pass
 
-    def set_default_perspective(self):
-        """
-       Call back method that True to notify the parent that the current plug-in
-       can be set as default  perspective.
-       when returning False, the plug-in is not candidate for an automatic
-       default perspective setting
-        """
-        if self.standalone:
-            return True
-        return False
-
     def set_state(self, state=None, datainfo=None):    
         """

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/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
@@ -516 +516 @@
         selected_data_list = []
         if self.batch_on:
-            page = self.add_fit_page(data=data_list)
+            self.add_fit_page(data=data_list)
         else:
             if len(data_list) > MAX_NBR_DATA:
@@ -537 +537 @@
                         if group_id not in data.list_group_id:
                             data.list_group_id.append(group_id)
-                        page = self.add_fit_page(data=[data])
+                        self.add_fit_page(data=[data])
             except:
                 msg = "Fitting Set_data: " + str(sys.exc_value)
@@ -715 +715 @@
         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)
@@ -1564 +1564 @@
         """
         if event.panel is not None:
-            new_panel = event.panel
             self.slicer_panels.append(event.panel)
             # Set group ID if available
@@ -1648 +1647 @@
             #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