Changeset e4c475b7 in sasview

Timestamp:

Mar 5, 2018 1:39:00 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

3b3b40b, fca1f50

Parents:

91ad45c

Message:

Minor fixes

Location:

src/sas

Files:

• qtgui/Perspectives/Fitting/ConstraintWidget.py (modified) (1 diff)
• qtgui/Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui (modified) (4 diffs)
• qtgui/Plotting/LinearFit.py (modified) (3 diffs)
• sascalc/fit/expression.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

@@ -177 +177 @@
             no_params_msg = "Fitting can not be performed.\n" +\
                             "Not all tabs chosen for fitting have parameters selected for fitting."
-            QtWidgets.QMessageBox.question(self,
+            QtWidgets.QMessageBox.warning(self,
                                            'Warning',
                                             no_params_msg,

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -1174 +1174 @@
             msg = "Fitting did not converge!"
             self.communicate.statusBarUpdateSignal.emit(msg)
+            msg += res.mesg
             logging.error(msg)
             return

src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>448</width>
-    <height>526</height>
+    <width>568</width>
+    <height>605</height>
    </rect>
   </property>
@@ -452 +452 @@
        <property name="minimumSize">
         <size>
-         <width>75</width>
-         <height>23</height>
+         <width>93</width>
+         <height>28</height>
         </size>
        </property>
@@ -471 +471 @@
        <property name="minimumSize">
         <size>
-         <width>75</width>
-         <height>23</height>
+         <width>93</width>
+         <height>28</height>
         </size>
        </property>
@@ -490 +490 @@
        <property name="minimumSize">
         <size>
-         <width>75</width>
-         <height>23</height>
+         <width>93</width>
+         <height>28</height>
         </size>
        </property>

src/sas/qtgui/Plotting/LinearFit.py

@@ -13 +13 @@
 from sas.qtgui.Plotting import DataTransform
 from sas.qtgui.Plotting.LineModel import LineModel
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 # Local UI
@@ -56 +57 @@
         self.txtRangeMin.setText(str(max_range[0]))
         self.txtRangeMax.setText(str(max_range[1]))
-        self.txtFitRangeMin.setText(str(fit_range[0]))
-        self.txtFitRangeMax.setText(str(fit_range[1]))
+        # Assure nice display of ranges
+        fr_min = GuiUtils.formatNumber(fit_range[0])
+        fr_max = GuiUtils.formatNumber(fit_range[1])
+        self.txtFitRangeMin.setText(str(fr_min))
+        self.txtFitRangeMax.setText(str(fr_max))
 
         # cast xLabel into html
@@ -113 +117 @@
         # Set the qmin and qmax in the panel that matches the
         # transformed min and max
-        #value_xmin = X_VAL_DICT[self.xLabel].floatTransform(xmin)
-        #value_xmax = X_VAL_DICT[self.xLabel].floatTransform(xmax)
-
         value_xmin = self.floatInvTransform(xmin)
         value_xmax = self.floatInvTransform(xmax)

src/sas/sascalc/fit/expression.py

@@ -210 +210 @@
 
     #print("Function: "+functiondef)
-    exec (functiondef in globals,locals)
+    # Python 2.7
+    #exec (functiondef in globals,locals)
+    # Python 3.5
+    exec (functiondef, globals, locals)
+
     retfn = locals['eval_expressions']