Changeset ec72ceb in sasview

Timestamp:

Oct 10, 2016 1:28:08 PM (8 years ago)

Author:

smk78

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

68669da

Parents:

13f5656

Message:

Changed various occurrences of 'custom models' in window titles, etc, to
'plugin models'. Under Fitting menu also changed 'Edit Custom Model' to
'Plugin Model Operations' and changed menu options below this.

Location:

src/sas/sasgui/perspectives

Files:

• calculator/model_editor.py (modified) (1 diff)
• calculator/pyconsole.py (modified) (1 diff)
• fitting/fitting.py (modified) (7 diffs)

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -70 +70 @@
 
     This Dialog pops up for the user when they press 'Sum|Multi(p1,p2)' under
-    'Edit Custom Model' under 'Fitting' menu.  This is currently called as
+    'Plugin Model Operations' under 'Fitting' menu.  This is currently called as
     a Modal Dialog.
 

src/sas/sasgui/perspectives/calculator/pyconsole.py

@@ -103 +103 @@
     window_name = "Custom Model Editor"
     ## Name to appear on the window title bar
-    window_caption = "Custom Model Editor"
+    window_caption = "Plugin Model Editor"
     ## Flag to tell the AUI manager to put this panel in the center pane
     CENTER_PANE = False

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -221 +221 @@
         self.id_edit = wx.NewId()
         editmodel_help = "Edit customized model sample file"
-        self.menu1.AppendMenu(self.id_edit, "Edit Custom Model",
+        self.menu1.AppendMenu(self.id_edit, "Plugin Model Operations",
                               self.edit_model_menu, editmodel_help)
         #create  menubar items
@@ -236 +236 @@
         frame = PyConsole(parent=self.parent, manager=self,
                           panel=self.fit_panel,
-                          title='Advanced Custom Model Editor',
+                          title='Advanced Plugin Model Editor',
                           filename=filename)
         self.put_icon(frame)
@@ -302 +302 @@
             event_id = event.GetId()
             dir_path = models.find_plugins_dir()
-            title = "New Custom Model Function"
+            title = "New Plugin Model Function"
             self.new_model_frame = EditorWindow(parent=self, base=self,
                                                 path=dir_path, title=title)
@@ -319 +319 @@
         Update custom model list in the fitpage combo box
         """
-        custom_model = 'Customized Models'
+        custom_model = 'Plugin Models'
         try:
             # Update edit menus
@@ -350 +350 @@
         wx_id = wx.NewId()
         #new_model_menu = wx.Menu()
-        self.edit_model_menu.Append(wx_id, 'New',
+        self.edit_model_menu.Append(wx_id, 'New Plugin Model',
                                    'Add a new model function')
         wx.EVT_MENU(owner, wx_id, self.make_new_model)
@@ -362 +362 @@
         self.edit_menu = wx.Menu()
         self.edit_model_menu.AppendMenu(e_id,
-                                    'Advanced', self.edit_menu)
+                                    'Advanced Plugin Editor', self.edit_menu)
         self.set_edit_menu_helper(owner, self.edit_custom_model)
 
@@ -368 +368 @@
         self.delete_menu = wx.Menu()
         self.edit_model_menu.AppendMenu(d_id,
-                                        'Delete', self.delete_menu)
+                                        'Delete Plugin Models', self.delete_menu)
         self.set_edit_menu_helper(owner, self.delete_custom_model)
 
         wx_id = wx.NewId()
-        self.edit_model_menu.Append(wx_id, 'Load Models',
+        self.edit_model_menu.Append(wx_id, 'Load Plugin Models',
           '(Re)Load all models present in user plugin_models folder')
         wx.EVT_MENU(owner, wx_id, self.load_plugin_models)