Changeset e33fcd1 in sasview

Timestamp:

Dec 7, 2018 7:23:15 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

54398d5

Parents:

ccdee50 (diff), aea6bb7 (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) (1 diff)
• 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 self._low_extrapolate:
+            try:
+                qstar_low, qstar_low_err = inv.get_qstar_low()
+            except Exception as ex:
+                calculation_failed = True
+                msg += str(ex)
+        if self._high_extrapolate:
+            try:
+                qstar_high, qstar_high_err = inv.get_qstar_high()
+            except Exception as ex:
+                calculation_failed = True
+                msg += str(ex)
+
         if (calculation_failed):
             logging.warning('Calculation failed: {}'.format(msg))
             return self.model
-        else:
-
-            if self._low_extrapolate:
-                # for presentation in InvariantDetails
-                qstar_low, qstar_low_err = inv.get_qstar_low()
-                extrapolated_data = inv.get_extra_data_low(self._low_points)
-                power_low = inv.get_extrapolation_power(range='low')
-
-                # Plot the chart
-                title = "Low-Q extrapolation"
-
-                # Convert the data into plottable
-                extrapolated_data = self._manager.createGuiData(extrapolated_data)
-
-                extrapolated_data.name = title
-                extrapolated_data.title = title
-                extrapolated_data.symbol = "Line"
-                extrapolated_data.has_errors = False
-
-                # copy labels and units of axes for plotting
-                extrapolated_data._xaxis = temp_data._xaxis
-                extrapolated_data._xunit = temp_data._xunit
-                extrapolated_data._yaxis = temp_data._yaxis
-                extrapolated_data._yunit = temp_data._yunit
-
-                # Add the plot to the model item
-                # This needs to run in the main thread
-                reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
+
+        if self._low_extrapolate:
+            extrapolated_data = inv.get_extra_data_low(self._low_points)
+            power_low = inv.get_extrapolation_power(range='low')
+
+            # Plot the chart
+            title = "Low-Q extrapolation"
+
+            # Convert the data into plottable
+            extrapolated_data = self._manager.createGuiData(extrapolated_data)
+
+            extrapolated_data.name = title
+            extrapolated_data.title = title
+            extrapolated_data.symbol = "Line"
+            extrapolated_data.has_errors = False
+
+            # copy labels and units of axes for plotting
+            extrapolated_data._xaxis = temp_data._xaxis
+            extrapolated_data._xunit = temp_data._xunit
+            extrapolated_data._yaxis = temp_data._yaxis
+            extrapolated_data._yunit = temp_data._yunit
+
+            # Add the plot to the model item
+            # This needs to run in the main thread
+            reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
                                        self._model_item,
                                        extrapolated_data,
                                        title)
 
-            if self._high_extrapolate:
-                # for presentation in InvariantDetails
-                qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x)
-
-                if qmax_plot > Q_MAXIMUM:
-                    qmax_plot = Q_MAXIMUM
-                qstar_high, qstar_high_err = inv.get_qstar_high()
-                power_high = inv.get_extrapolation_power(range='high')
-                high_out_data = inv.get_extra_data_high(q_end=qmax_plot, npts=500)
-
-                # Plot the chart
-                title = "High-Q extrapolation"
-
-                # Convert the data into plottable
-                high_out_data = self._manager.createGuiData(high_out_data)
-                high_out_data.name = title
-                high_out_data.title = title
-                high_out_data.symbol = "Line"
-                high_out_data.has_errors = False
-
-                # copy labels and units of axes for plotting
-                high_out_data._xaxis = temp_data._xaxis
-                high_out_data._xunit = temp_data._xunit
-                high_out_data._yaxis = temp_data._yaxis
-                high_out_data._yunit = temp_data._yunit
-
-                # Add the plot to the model item
-                # This needs to run in the main thread
-                reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
+        if self._high_extrapolate:
+            # for presentation in InvariantDetails
+            qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x)
+
+            if qmax_plot > Q_MAXIMUM:
+                qmax_plot = Q_MAXIMUM
+            power_high = inv.get_extrapolation_power(range='high')
+            high_out_data = inv.get_extra_data_high(q_end=qmax_plot, npts=500)
+
+            # Plot the chart
+            title = "High-Q extrapolation"
+
+            # Convert the data into plottable
+            high_out_data = self._manager.createGuiData(high_out_data)
+            high_out_data.name = title
+            high_out_data.title = title
+            high_out_data.symbol = "Line"
+            high_out_data.has_errors = False
+
+            # copy labels and units of axes for plotting
+            high_out_data._xaxis = temp_data._xaxis
+            high_out_data._xunit = temp_data._xunit
+            high_out_data._yaxis = temp_data._yaxis
+            high_out_data._yunit = temp_data._yunit
+
+            # Add the plot to the model item
+            # This needs to run in the main thread
+            reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
                                        self._model_item, high_out_data, title)
 
-            item = QtGui.QStandardItem(str(float('%.3g'% volume_fraction)))
-            self.model.setItem(WIDGETS.W_VOLUME_FRACTION, item)
-            item = QtGui.QStandardItem(str(float('%.3g'% volume_fraction_error)))
-            self.model.setItem(WIDGETS.W_VOLUME_FRACTION_ERR, item)
-            if surface:
-                item = QtGui.QStandardItem(str(float('%.3g'% surface)))
-                self.model.setItem(WIDGETS.W_SPECIFIC_SURFACE, item)
-                item = QtGui.QStandardItem(str(float('%.3g'% surface_error)))
-                self.model.setItem(WIDGETS.W_SPECIFIC_SURFACE_ERR, item)
-            item = QtGui.QStandardItem(str(float('%.3g'% qstar_total)))
-            self.model.setItem(WIDGETS.W_INVARIANT, item)
-            item = QtGui.QStandardItem(str(float('%.3g'% qstar_total_error)))
-            self.model.setItem(WIDGETS.W_INVARIANT_ERR, item)
-
-            item = QtGui.QStandardItem(str(float('%.3g'% qstar_low)))
-            self.model.setItem(WIDGETS.D_LOW_QSTAR, item)
-            item = QtGui.QStandardItem(str(float('%.3g'% qstar_low_err)))
-            self.model.setItem(WIDGETS.D_LOW_QSTAR_ERR, item)
-            item = QtGui.QStandardItem(str(float('%.3g'% qstar_high)))
-            self.model.setItem(WIDGETS.D_HIGH_QSTAR, item)
-            item = QtGui.QStandardItem(str(float('%.3g'% qstar_high_err)))
-            self.model.setItem(WIDGETS.D_HIGH_QSTAR_ERR, item)
-
-            return self.model
+        item = QtGui.QStandardItem(str(float('%.3g'% volume_fraction)))
+        self.model.setItem(WIDGETS.W_VOLUME_FRACTION, item)
+        item = QtGui.QStandardItem(str(float('%.3g'% volume_fraction_error)))
+        self.model.setItem(WIDGETS.W_VOLUME_FRACTION_ERR, item)
+        if surface:
+            item = QtGui.QStandardItem(str(float('%.3g'% surface)))
+            self.model.setItem(WIDGETS.W_SPECIFIC_SURFACE, item)
+            item = QtGui.QStandardItem(str(float('%.3g'% surface_error)))
+            self.model.setItem(WIDGETS.W_SPECIFIC_SURFACE_ERR, item)
+        item = QtGui.QStandardItem(str(float('%.3g'% qstar_total)))
+        self.model.setItem(WIDGETS.W_INVARIANT, item)
+        item = QtGui.QStandardItem(str(float('%.3g'% qstar_total_error)))
+        self.model.setItem(WIDGETS.W_INVARIANT_ERR, item)
+
+        item = QtGui.QStandardItem(str(float('%.3g'% qstar_low)))
+        self.model.setItem(WIDGETS.D_LOW_QSTAR, item)
+        item = QtGui.QStandardItem(str(float('%.3g'% qstar_low_err)))
+        self.model.setItem(WIDGETS.D_LOW_QSTAR_ERR, item)
+        item = QtGui.QStandardItem(str(float('%.3g'% qstar_high)))
+        self.model.setItem(WIDGETS.D_HIGH_QSTAR, item)
+        item = QtGui.QStandardItem(str(float('%.3g'% qstar_high_err)))
+        self.model.setItem(WIDGETS.D_HIGH_QSTAR_ERR, item)
+
+        return self.model
 
     def title(self):

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):