Changeset 225aca8 in sasview for src/sas/guiframe/gui_manager.py

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

File:

• src/sas/guiframe/gui_manager.py (modified) (17 diffs)

src/sas/guiframe/gui_manager.py

@@ -235 +235 @@
         Initialize the Frame object
         """
-
         PARENT_FRAME.__init__(self, parent=parent, title=title, pos=pos, size=size)
         # title
@@ -364 +363 @@
                     frame.SetIcon(icon)
                 except:
-                    pass
+                    logging.error("ViewerFrame.put_icon: could not set icon")
 
     def get_client_size(self):
@@ -752 +751 @@
             self._toolbar.Realize()
 
-
     def build_gui(self):
         """
@@ -778 +776 @@
         # Append item from plugin under menu file if necessary
         self._populate_file_menu()
-
 
         if not wx.VERSION_STRING >= '3.0.0.0':
@@ -822 +819 @@
         # Load panels
         self._load_panels()
-        self.set_default_perspective()
 
     def SetStatusText(self, *args, **kwds):
@@ -931 +927 @@
                         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)
@@ -1511 +1503 @@
                 for item in plugin.populate_file_menu():
                     m_name, m_hint, m_handler = item
-                    id = wx.NewId()
-                    self._file_menu.Append(id, m_name, m_hint)
-                    wx.EVT_MENU(self, id, m_handler)
+                    wx_id = wx.NewId()
+                    self._file_menu.Append(wx_id, m_name, m_hint)
+                    wx.EVT_MENU(self, wx_id, m_handler)
                 self._file_menu.AppendSeparator()
 
         style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
         if OPEN_SAVE_MENU:
-            id = wx.NewId()
+            wx_id = wx.NewId()
             hint_load_file = "read all analysis states saved previously"
-            self._save_appl_menu = self._file_menu.Append(id, '&Open Project', hint_load_file)
-            wx.EVT_MENU(self, id, self._on_open_state_project)
+            self._save_appl_menu = self._file_menu.Append(wx_id, '&Open Project', hint_load_file)
+            wx.EVT_MENU(self, wx_id, self._on_open_state_project)
 
         if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
@@ -1527 +1519 @@
             hint_load_file = "Read a status files and load"
             hint_load_file += " them into the analysis"
-            id = wx.NewId()
-            self._save_appl_menu = self._file_menu.Append(id,
+            wx_id = wx.NewId()
+            self._save_appl_menu = self._file_menu.Append(wx_id,
                                                           '&Open Analysis', hint_load_file)
-            wx.EVT_MENU(self, id, self._on_open_state_application)
+            wx.EVT_MENU(self, wx_id, self._on_open_state_application)
         if OPEN_SAVE_MENU:
             self._file_menu.AppendSeparator()
-            id = wx.NewId()
-            self._file_menu.Append(id, '&Save Project',
+            wx_id = wx.NewId()
+            self._file_menu.Append(wx_id, '&Save Project',
                                    'Save the state of the whole analysis')
-            wx.EVT_MENU(self, id, self._on_save_project)
+            wx.EVT_MENU(self, wx_id, self._on_save_project)
         if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
-            id = wx.NewId()
-            self._save_appl_menu = self._file_menu.Append(id, \
+            wx_id = wx.NewId()
+            self._save_appl_menu = self._file_menu.Append(wx_id, \
                 '&Save Analysis', 'Save state of the current active analysis panel')
-            wx.EVT_MENU(self, id, self._on_save_application)
+            wx.EVT_MENU(self, wx_id, self._on_save_application)
         if not sys.platform == 'darwin':
             self._file_menu.AppendSeparator()
-            id = wx.NewId()
-            self._file_menu.Append(id, '&Quit', 'Exit')
-            wx.EVT_MENU(self, id, self.Close)
+            wx_id = wx.NewId()
+            self._file_menu.Append(wx_id, '&Quit', 'Exit')
+            wx.EVT_MENU(self, wx_id, self.Close)
 
     def _add_menu_file(self):
@@ -1717 +1709 @@
         """
         """
-        message = ""
         log_msg = ''
-        output = []
-        error_message = ""
         basename = os.path.basename(path)
-        root, extension = os.path.splitext(basename)
+        _, extension = os.path.splitext(basename)
         if extension.lower() not in EXTENSIONS:
             log_msg = "File Loader cannot "
@@ -2224 +2213 @@
             if hasattr(item, "post_init"):
                 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):
@@ -2414 +2391 @@
             total_plot_list.append(theory_data)
         for new_plot in total_plot_list:
-            id = new_plot.id
             for group_id in new_plot.list_group_id:
-                wx.PostEvent(self, NewPlotEvent(id=id,
+                wx.PostEvent(self, NewPlotEvent(id=new_plot.id,
                                                 group_id=group_id,
                                                 action='remove'))
                 #remove res plot: Todo: improve
-                wx.CallAfter(self._remove_res_plot, id)
+                wx.CallAfter(self._remove_res_plot, new_plot.id)
         self._data_manager.delete_data(data_id=data_id,
                                        theory_id=theory_id)
@@ -2455 +2431 @@
             ext_num = dlg.GetFilterIndex()
             if ext_num == 0:
-                format = '.txt'
+                ext_format = '.txt'
             else:
-                format = '.xml'
-            path = os.path.splitext(path)[0] + format
+                ext_format = '.xml'
+            path = os.path.splitext(path)[0] + ext_format
             mypath = os.path.basename(path)
 
             #Instantiate a loader
             loader = Loader()
-            format = ".txt"
-            if os.path.splitext(mypath)[1].lower() == format:
+            ext_format = ".txt"
+            if os.path.splitext(mypath)[1].lower() == ext_format:
                 # Make sure the ext included in the file name
                 # especially on MAC
-                fName = os.path.splitext(path)[0] + format
+                fName = os.path.splitext(path)[0] + ext_format
                 self._onsaveTXT(data, fName)
-            format = ".xml"
-            if os.path.splitext(mypath)[1].lower() == format:
+            ext_format = ".xml"
+            if os.path.splitext(mypath)[1].lower() == ext_format:
                 # Make sure the ext included in the file name
                 # especially on MAC
-                fName = os.path.splitext(path)[0] + format
-                loader.save(fName, data, format)
+                fName = os.path.splitext(path)[0] + ext_format
+                loader.save(fName, data, ext_format)
             try:
                 self._default_save_location = os.path.dirname(path)
@@ -2598 +2574 @@
             ext_num = dlg.GetFilterIndex()
             if ext_num == 0:
-                format = '.dat'
+                ext_format = '.dat'
             else:
-                format = ''
-            path = os.path.splitext(path)[0] + format
+                ext_format = ''
+            path = os.path.splitext(path)[0] + ext_format
             mypath = os.path.basename(path)
 
@@ -2607 +2583 @@
             loader = Loader()
 
-            format = ".dat"
-            if os.path.splitext(mypath)[1].lower() == format:
+            ext_format = ".dat"
+            if os.path.splitext(mypath)[1].lower() == ext_format:
                 # Make sure the ext included in the file name
                 # especially on MAC
-                fileName = os.path.splitext(path)[0] + format
-                loader.save(fileName, data, format)
+                fileName = os.path.splitext(path)[0] + ext_format
+                loader.save(fileName, data, ext_format)
             try:
                 self._default_save_location = os.path.dirname(path)
@@ -3206 +3182 @@
 
 
-class ViewApp(wx.App):
+class SasViewApp(wx.App):
     """
-    Toy application to test this Frame
+    SasView application
     """
     def OnInit(self):
@@ -3294 +3270 @@
             if len(os.listdir(model_folder)) > 0:
                 try:
-                    for file in os.listdir(model_folder):
-                        file_path = os.path.join(model_folder, file)
+                    for filename in os.listdir(model_folder):
+                        file_path = os.path.join(model_folder, filename)
                         if os.path.isfile(file_path):
                             os.remove(file_path)
@@ -3314 +3290 @@
         """
         #try to load file at the start
-        try:
-            self.open_file()
-        except:
-            raise
+        self.open_file()
         self.frame.build_gui()