Changeset 99ce461 in sasview for src

Timestamp:

Sep 8, 2018 4:31:01 AM (6 years ago)

Author:

Laura Forster <Awork@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

3090270, d4ba565

Parents:

309fa1b (diff), c20d163 (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' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• UnitTesting/FittingLogicTest.py (modified) (2 diffs)
• UnitTesting/FittingOptionsTest.py (modified) (1 diff)
• UI/OptionsWidgetUI.ui (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

@@ -99 +99 @@
         data.name = "boop"
         data.id = "poop"
-        return_data = (data.x,data.y, 7, None, None,
-                       0, True, 0.0, 1, data,
-                       data, False, None,
-                       None, None, None,
-                       None, None)
+        # Condensed return data (new1DPlot only uses these fields)
+        return_data = dict(x = data.x,
+                           y = data.y,
+                           model = data,
+                           data = data)
+        # return_data = (data.x,data.y, 7, None, None,
+        #                0, True, 0.0, 1, data,
+        #                data, False, None,
+        #                None, None, None,
+        #                None, None)
 
         new_plot = self.logic.new1DPlot(return_data=return_data, tab_id=0)
@@ -139 +144 @@
         qmin, qmax, npts = self.logic.computeDataRange()
 
-        return_data = (x_0, data, 7, data, None,
-                        True, 0.0, 1, 0, qmin, qmax,
-                        0.1, False, None)
+        # Condensed return data (new2DPlot only uses these fields)
+        return_data = dict(image = x_0,
+                           data = data,
+                           page_id = 7,
+                           model = data)
+        # return_data = (x_0, data, 7, data, None,
+        #                 True, 0.0, 1, 0, qmin, qmax,
+        #                 0.1, False, None)
 
         new_plot = self.logic.new2DPlot(return_data=return_data)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingOptionsTest.py

@@ -38 +38 @@
         # The combo box
         self.assertIsInstance(self.widget.cbAlgorithm, QtWidgets.QComboBox)
-        self.assertEqual(self.widget.cbAlgorithm.count(), 5)
+        self.assertEqual(self.widget.cbAlgorithm.count(), 6)
         self.assertEqual(self.widget.cbAlgorithm.itemText(0), 'Nelder-Mead Simplex')
         self.assertEqual(self.widget.cbAlgorithm.itemText(4), 'Levenberg-Marquardt')

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

@@ -32 +32 @@
         <item row="0" column="1">
          <widget class="QLineEdit" name="txtMinRange">
+          <property name="minimumSize">
+           <size>
+            <width>80</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="toolTip">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Minimum value of Q.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -54 +60 @@
         <item row="1" column="1">
          <widget class="QLineEdit" name="txtMaxRange">
+          <property name="minimumSize">
+           <size>
+            <width>80</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="toolTip">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum value of Q.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>