Changes in / [95eef00:60df6c1] in sasview

Location:

src/sas/sasgui

Files:

• guiframe/panel_base.py (modified) (1 diff)
• perspectives/file_converter/converter_panel.py (modified) (2 diffs)
• perspectives/invariant/invariant_panel.py (modified) (4 diffs)
• perspectives/pr/inversion_panel.py (modified) (5 diffs)

src/sas/sasgui/guiframe/panel_base.py

@@ -317 +317 @@
         """
         return self._drag_flag
-    
+
+    def _set_analysis(self, flag):
+        """
+        Set the Analysis Save state flag and informs the manager
+        so it refreshes the menu/whole panel
+        """
+        self._set_save_flag(flag)
+        if self._manager is not None:
+            wx.PostEvent(self._manager.parent, PanelOnFocusEvent(panel=self))
+
     def _set_reset_flag(self, flag=True):
         """

src/sas/sasgui/perspectives/file_converter/converter_panel.py

@@ -499 +499 @@
         vbox = wx.BoxSizer(wx.VERTICAL)
 
-        instructions = ("Select either single column ASCII files or 1D OTOKO "
-        "files containing the Q-Axis and Intensity-Axis data, or a 2D BSL file"
-        ", then chose where to save the converted file, and click Convert.\n"
-        "ASCII and OTOKO files can be converted to CanSAS XML, or NXcanSAS "
-        "HDF5 format. OTOKO files can only be converted to NXcanSAS.\nCanSAS "
-        "metadata can also be optionally input below.")
+        instructions = (
+        "Select linked single column 1D ASCII files containing the Q-axis and "
+        "Intensity-axis data, or 1D BSL/OTOKO files, or a 2D BSL/OTOKO file, "
+        "then choose where to save the converted file, and click Convert.\n"
+        "1D ASCII and BSL/OTOKO files can be converted to CanSAS (XML) or "
+        "NXcanSAS (HDF5) formats. 2D BSL/OTOKO files can only be converted to "
+        "the NXcanSAS format.\n"
+        "Metadata can be optionally added for the CanSAS XML format."
+        )
 
         instruction_label = wx.StaticText(self, -1, instructions,
@@ -527 +530 @@
         ascii_btn.Bind(wx.EVT_RADIOBUTTON, self.datatype_changed)
         radio_sizer.Add(ascii_btn)
-        otoko_btn = wx.RadioButton(self, -1, "OTOKO 1D", name="otoko")
+        otoko_btn = wx.RadioButton(self, -1, "BSL 1D", name="otoko")
         otoko_btn.Bind(wx.EVT_RADIOBUTTON, self.datatype_changed)
         radio_sizer.Add(otoko_btn)

src/sas/sasgui/perspectives/invariant/invariant_panel.py

@@ -95 +95 @@
         self.is_state_data = False
         self.is_power_out = False
+        self._set_analysis(False)
 
         #container of invariant value
@@ -170 +171 @@
             self._reset_state_list()
             self._set_bookmark_flag(True)
+            self._set_analysis(True)
         return True
 
@@ -281 +283 @@
             self.new_state = False
             self.is_state_data = False
+            self._set_analysis(True)
 
     def clear_panel(self):
@@ -911 +914 @@
         self.button_calculate.SetFocus()
         #self.SetupScrolling()
+        self._set_analysis(False)
 
     def _set_state(self, event):

src/sas/sasgui/perspectives/pr/inversion_panel.py

@@ -43 +43 @@
         #Set window's font size
         self.SetWindowVariant(variant=FONT_VARIANT)
+        self._set_analysis(False)
 
         self.plots = plots
@@ -396 +397 @@
             self.bck = state.bck
 
+        # We have the data available for serialization
+        self._set_analysis(True)
+
         # Perform inversion
         self._on_invert(None)
@@ -401 +405 @@
     def set_manager(self, manager):
         self._manager = manager
+        if manager is not None:
+            self._set_analysis(False)
 
     def _do_layout(self):
@@ -752 +758 @@
         self.nterms_estimate_ctl.Enable(False)
         self.nterms_estimate_ctl.SetLabel("")
+        self._set_analysis(False)
+
         self._on_pars_changed()
 
@@ -936 +944 @@
                 self._on_pars_changed(None)
                 self._on_invert(None)
+                self._set_analysis(True)
             except:
                 msg = "InversionControl._change_file: %s" % sys.exc_value