Changeset 29eb947 in sasview

Timestamp:

Mar 23, 2017 3:41:31 AM (8 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:

b1e36a3

Parents:

0979dfb

Message:

Fixed tooltip size. Fixed a bug in structure factor control

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/FittingWidget.py (modified) (3 diffs)
• UI/DataExplorerUI.ui (modified) (2 diffs)

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

@@ -256 +256 @@
             self.disableModelCombo()
             self.enableStructureCombo()
+            self._model_model.clear()
             return
 
@@ -309 +310 @@
         """
         model = str(self.cbModel.currentText())
+        category = str(self.cbCategory.currentText())
         structure = str(self.cbStructureFactor.currentText())
+        if category == CATEGORY_STRUCTURE:
+            model = None
         self.SASModelToQModel(model, structure_factor=structure)
 
@@ -419 +423 @@
         name_index = self._poly_model.index(model_row, 0)
         # Extract changed value. Assumes proper validation by QValidator/Delegate
-        value = float(item.text())
+        # Checkbox in column 0
+        if model_column == 0:
+            value = item.checkState()
+        else:
+            value = float(item.text())
         parameter_name = str(self._poly_model.data(name_index).toPyObject()) # "distribution of sld" etc.
         if "Distribution of" in parameter_name:

src/sas/qtgui/UI/DataExplorerUI.ui

@@ -61 +61 @@
            </property>
            <property name="toolTip">
-            <string>Load a file with data</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Load a file with data&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="styleSheet">
@@ -205 +205 @@
            </property>
            <property name="toolTip">
-            <string>Send data to perspective</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Send data to perspective&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="styleSheet">