Changeset 381bafd in sasview

Timestamp:

Oct 8, 2016 12:47:51 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:

d73998c

Parents:

a4c2445 (diff), b58654c (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 branch 'master' of ​https://github.com/SasView/sasview

Files:

• docs/sphinx-docs/source/user/tools.rst (modified) (1 diff)
• sasview/setup_mac.py (modified) (1 diff)
• src/sas/sasgui/perspectives/calculator/calculator.py (modified) (1 diff)
• src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) (2 diffs)
• sasview/test/save_states/project_multiplicative_constraint.svs (added)
• src/sas/sasgui/guiframe/gui_manager.py (modified) (3 diffs)

docs/sphinx-docs/source/user/tools.rst

@@ -11 +11 @@
    Data Operations Utility <sasgui/perspectives/calculator/data_operator_help>
 
+   SLD Calculator <sasgui/perspectives/calculator/sld_calculator_help>
+
    Density/Volume Calculator <sasgui/perspectives/calculator/density_calculator_help>
+
+   Slit Size Calculator <sasgui/perspectives/calculator/slit_calculator_help>
+
+   Kiessig Thickness Calculator <sasgui/perspectives/calculator/kiessig_calculator_help>
+
+   Q Resolution Estimator <sasgui/perspectives/calculator/resolution_calculator_help>
 
    Generic SANS Calculator <sasgui/perspectives/calculator/sas_calculator_help>
 
+   Python Shell <sasgui/perspectives/calculator/python_shell_help>
+
    Image Viewer <sasgui/perspectives/calculator/image_viewer_help>
 
-   Kiessig Thickness Calculator <sasgui/perspectives/calculator/kiessig_calculator_help>
-
-   SLD Calculator <sasgui/perspectives/calculator/sld_calculator_help>
-
-   Slit Size Calculator <sasgui/perspectives/calculator/slit_calculator_help>
-
-   Q Resolution Estimator <sasgui/perspectives/calculator/resolution_calculator_help>
-
-   Python Shell <sasgui/perspectives/calculator/python_shell_help>
-
    File Converter <sasgui/perspectives/file_converter/file_converter_help>
+   

sasview/setup_mac.py

@@ -62 +62 @@
 
 APP = ['sasview.py']
-DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py',
-               'default_categories.json']
+DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py']
 if os.path.isfile("BUILD_NUMBER"):
     DATA_FILES.append("BUILD_NUMBER")

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

@@ -80 +80 @@
                 ("Kiessig Thickness Calculator",
                         kiessig_help, self.on_calculate_kiessig),
-                          ("SAS Resolution Estimator",
+                          ("Q Resolution Estimator",
                         resolution_help, self.on_calculate_resoltuion),
                 ("Generic Scattering Calculator",

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

@@ -63 +63 @@
     """
     ## Internal nickname for the window, used by the AUI manager
-    window_name = "SAS Resolution Estimator"
+    window_name = "Q Resolution Estimator"
     ## Name to appear on the window title bar
     window_caption = ""
@@ -1329 +1329 @@
     """
     def __init__(self, parent=None, manager=None,
-                 title="SAS Resolution Estimator",
+                 title="Q Resolution Estimator",
                  size=(PANEL_WIDTH * 2, PANEL_HEIGHT), *args, **kwds):
         kwds['title'] = title

src/sas/sasgui/guiframe/gui_manager.py

@@ -677 +677 @@
         update edit menu if available
         """
-        if event != None:
+        if event is not None:
             self.panel_on_focus = event.panel
         if self.panel_on_focus is not None:
-            #Disable save application if the current panel is in batch mode
-            flag = self.panel_on_focus.get_save_flag()
-            if self._save_appl_menu != None:
-                self._save_appl_menu.Enable(flag)
-
-            if self.panel_on_focus not in self.plot_panels.values():
-                for ID in self.panels.keys():
-                    if self.panel_on_focus != self.panels[ID]:
-                        self.panels[ID].on_kill_focus(None)
-
-            if self._data_panel is not None and \
-                            self.panel_on_focus is not None:
-                self.set_panel_on_focus_helper()
-                #update toolbar
-                self._update_toolbar_helper()
-                #update edit menu
-                self.enable_edit_menu()
+            # Disable save application if the current panel is in batch mode
+            try:
+                flag = self.panel_on_focus.get_save_flag()
+                if self._save_appl_menu != None:
+                    self._save_appl_menu.Enable(flag)
+
+                if self.panel_on_focus not in self.plot_panels.values():
+                    for ID in self.panels.keys():
+                        if self.panel_on_focus != self.panels[ID]:
+                            self.panels[ID].on_kill_focus(None)
+
+                if self._data_panel is not None and \
+                                self.panel_on_focus is not None:
+                    self.set_panel_on_focus_helper()
+                    #update toolbar
+                    self._update_toolbar_helper()
+                    #update edit menu
+                    self.enable_edit_menu()
+            except wx._core.PyDeadObjectError:
+                pass
 
     def disable_app_menu(self, p_panel=None):
@@ -1904 +1907 @@
     def _on_open_state_project(self, event):
         """
+        Load in a .svs project file after removing all data from SasView
         """
         path = None
         if self._default_save_location == None:
             self._default_save_location = os.getcwd()
-        msg = "This operation will set SasView to its freshly opened state "
-        msg += "before loading the project. Do you wish to continue?"
+        msg = "This operation will set remove all data, plots and analyses from"
+        msg += " SasView before loading the project. Do you wish to continue?"
+        self._data_panel.selection_cbox.SetValue('Select all Data')
+        self._data_panel._on_selection_type(None)
+        for _, theory_dict in self._data_panel.list_cb_theory.iteritems():
+            for  key, value in theory_dict.iteritems():
+                item, _, _ = value
+                item.Check(True)
         if not self._data_panel.on_remove(None, msg):
             wx.PostEvent(self, StatusEvent(status="Loading Project file..."))
@@ -1934 +1944 @@
         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()