Changeset ccfe03b in sasview for src/sas/qtgui

Timestamp:

Mar 29, 2019 6:52:16 AM (6 years ago)

Author:

ibressler

Branches:

ESS_GUI_bumps_abstraction

Children:

f86343bd

Parents:

fec5842

Message:

FittingOptions?: now with tooltips again

• extracted from generated FittingOptions? UI file
• moved to bumps related interface code
  • could be provided by bumps directly instead
  • alternatively, extract the tooltips from the documentation programatically, perhaps?

File:

• src/sas/qtgui/Perspectives/Fitting/FittingOptions.py (modified) (5 diffs)

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

@@ -27 +27 @@
     _longName = None
     _type = None
+    _description = None # an optional description for the user, will be shown as UI tooltip
     _defaultValue = None
     value = None
 
-    def __init__(self, shortName, longName, dtype, defaultValue):
+    def __init__(self, shortName, longName, dtype, defaultValue, description = None):
         self._shortName = shortName
         self._longName = longName
         self._type = dtype
+        self._description = description
         self._defaultValue = defaultValue
         self.value = defaultValue
@@ -48 +50 @@
     def type(self):
         return self._type
+
+    @property
+    def description(self):
+        return self._description
 
     @property
@@ -136 +142 @@
     def __str__(self):
         return "\n".join(["{}: {}".format(key, fm) for key, fm in self._methods.items()])
+
+from sas.sascalc.fit.BumpsFitting import toolTips as bumpsToolTips
 
 class FittingMethodBumps(FittingMethod):
@@ -162 +170 @@
                 longName, dtype = bumps.options.FIT_FIELDS[shortName]
                 dtype = self._convertParamType(dtype)
-                param = FittingMethodParameter(shortName, longName, dtype, defValue)
+                key = shortName+"_"+f.id
+                descr = bumpsToolTips.get(key, None)
+                param = FittingMethodParameter(shortName, longName, dtype, defValue,
+                                               description=descr)
                 params.append(param)
             self.add(FittingMethodBumps(f.id, f.name, params))
@@ -308 +319 @@
         for param in fm.params.values():
             row = layout.rowCount()+1
-            layout.addWidget(self._makeLabel(param.longName), row, 0)
+            label = self._makeLabel(param.longName)
+            layout.addWidget(label, row, 0)
             widget = self._inputWidgetFromType(param.type, self)
             if widget is None:
                 continue
+            if param.description is not None:
+                widget.setToolTip(param.description)
+                label.setToolTip(param.description)
+            layout.addWidget(widget, row, 1)
             widgetName = param.shortName+'_'+fm.shortName
-            layout.addWidget(widget, row, 1)
             setattr(self, widgetName, widget)
         layout.addItem(QtWidgets.QSpacerItem(0, 0, vPolicy=QtWidgets.QSizePolicy.Expanding))