Changeset 54398d5 in sasview

Timestamp:

Dec 7, 2018 9:09:34 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

b1626bea

Parents:

e33fcd1 (diff), 1dc1d431 (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 'ESS_GUI_Invariant' into ESS_GUI

Location:

src/sas/qtgui

Files:

• Perspectives/Invariant/InvariantPerspective.py (modified) (2 diffs)
• Calculators/KiessigPanel.py (modified) (1 diff)
• Calculators/UI/KiessigPanel.ui (modified) (1 diff)
• Utilities/GridPanel.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -329 +329 @@
             surface = None
 
+        if (calculation_failed):
+            logging.warning('Calculation failed: {}'.format(msg))
+            return self.model
+
+        low_calculation_pass = True
+        high_calculation_pass = True
         if self._low_extrapolate:
             try:
                 qstar_low, qstar_low_err = inv.get_qstar_low()
             except Exception as ex:
-                calculation_failed = True
+                low_calculation_pass = False
                 msg += str(ex)
+                logging.warning('Low-q calculation failed: {}'.format(msg))
         if self._high_extrapolate:
             try:
                 qstar_high, qstar_high_err = inv.get_qstar_high()
             except Exception as ex:
-                calculation_failed = True
+                high_calculation_pass = False
                 msg += str(ex)
-
-        if (calculation_failed):
-            logging.warning('Calculation failed: {}'.format(msg))
-            return self.model
-
-        if self._low_extrapolate:
+                logging.warning('High-q calculation failed: {}'.format(msg))
+
+
+        if self._low_extrapolate and low_calculation_pass:
             extrapolated_data = inv.get_extra_data_low(self._low_points)
             power_low = inv.get_extrapolation_power(range='low')
@@ -374 +379 @@
                                        title)
 
-        if self._high_extrapolate:
+        if self._high_extrapolate and high_calculation_pass:
             # for presentation in InvariantDetails
             qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x)

src/sas/qtgui/Calculators/KiessigPanel.py

@@ -30 +30 @@
         self.deltaq_in.textChanged.connect(self.onCompute)
         self.deltaq_in.setText("0.05")
+
+        # Set focus away from Close
+        self.computeButton.setFocus()
 
         # no reason to have this widget resizable

src/sas/qtgui/Calculators/UI/KiessigPanel.ui

@@ -8 +8 @@
     <y>0</y>
     <width>365</width>
-    <height>193</height>
+    <height>197</height>
    </rect>
+  </property>
+  <property name="focusPolicy">
+   <enum>Qt::TabFocus</enum>
   </property>
   <property name="windowTitle">

src/sas/qtgui/Utilities/GridPanel.py

@@ -187 +187 @@
         """
         url = "/user/qtgui/Perspectives/Fitting/fitting_help.html#batch-fit-mode"
-        location = GuiUtils.HELP_DIRECTORY_LOCATION + url
-        if os.path.isdir(location) == False:
-            sas_path = os.path.abspath(os.path.dirname(sys.argv[0]))
-            location = sas_path + "/" + location
-        try:
-            webbrowser.open('file://' + os.path.realpath(location))
-        except webbrowser.Error as ex:
-            logging.warning("Cannot display help. %s" % ex)
+        GuiUtils.showHelp(url)
+
 
     def onPlot(self):