Changeset e6de6b8 in sasview for src/sas/sasgui/guiframe

Timestamp:

Oct 7, 2016 4:03:49 PM (8 years ago)

Author:

krzywon

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:

95eef00

Parents:

ff3f5821

Message:

Delinting and small structural changes.

File:

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

src/sas/sasgui/guiframe/gui_manager.py

@@ -1152 +1152 @@
                 self.delete_panel(ID)
                 break
-        self.cpanel_on_focus.SetFocus()
+        if self.cpanel_on_focus is not None:
+            self.cpanel_on_focus.SetFocus()
 
 
@@ -1917 +1918 @@
                 self._default_save_location = os.path.dirname(path)
                 dlg.Destroy()
-
-            # Reset to a base state
-            self._on_reset_state()
-
-            # Load the project file
-            self.load_state(path=path, is_project=True)
+                # Reset to a base state
+                self._on_reset_state()
+                # Load the project file
+                self.load_state(path=path, is_project=True)
 
     def _on_reset_state(self):
@@ -1930 +1929 @@
         """
         # Reset all plugins to their base state
+        self._data_panel.set_panel_on_focus()
+        # Remove all loaded data
+        self._data_panel.selection_cbox.SetValue('Select all Data')
+        self._data_panel._on_selection_type(None)
         for plugin in self.plugins:
             plugin.clear_panel()
         # Reset plot number to 0
         self.graph_num = 0
-        # Remove all loaded data
-        self._data_panel.selection_cbox.SetValue('Select all Data')
-        self._data_panel._on_selection_type(None)
 
     def _on_save_application(self, event):