Changeset fed94a2 in sasview

Timestamp:

Jan 9, 2017 3:28:03 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:

a66ff280

Parents:

570a58f9

Message:

Improved label formatting in charts

Location:

src/sas/qtgui

Files:

• GuiUtils.py (modified) (1 diff)
• LinearFit.py (modified) (6 diffs, 1 prop)
• Plotter.py (modified) (5 diffs)
• ScaleProperties.py (modified) (1 diff)

src/sas/qtgui/GuiUtils.py

@@ -9 +9 @@
 import webbrowser
 import urlparse
+import numpy
 
 warnings.simplefilter("ignore")

src/sas/qtgui/LinearFit.py

@@ -2 +2 @@
 Adds a linear fit plot to the chart
 """
+import re
 import numpy
 from PyQt4 import QtGui
@@ -46 +47 @@
         self.txtBerr.setText("0")
         self.txtChi2.setText("0")
+
         # Initial ranges
         self.txtRangeMin.setText(str(max_range[0]))
@@ -52 +54 @@
         self.txtFitRangeMax.setText(str(fit_range[1]))
 
-        self.lblRange.setText('Fit range of ' + self.xLabel)
+        # cast xLabel into html
+        label = re.sub(r'\^\((.)\)(.*)', r'<span style=" vertical-align:super;">\1</span>\2',
+                      str(self.xLabel).rstrip())
+        self.lblRange.setText('Fit range of ' + label)
 
         self.model = LineModel()
@@ -62 +67 @@
         self.transform = transform
 
+        # connect Fit button
         self.cmdFit.clicked.connect(self.fit)
 
@@ -108 +114 @@
         # Set the qmin and qmax in the panel that matches the
         # transformed min and max
-        self.txtRangeMin.setText(formatNumber(self.floatInvTransform(xmin)))
-        self.txtRangeMax.setText(formatNumber(self.floatInvTransform(xmax)))
+        #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)
+        self.txtRangeMin.setText(formatNumber(value_xmin))
+        self.txtRangeMax.setText(formatNumber(value_xmax))
 
         # Store the transformed values of view x, y and dy before the fit
@@ -233 +243 @@
         return flag
 
-    #def checkFitRanges(self, usermin, usermax):
-    #    """
-    #    Ensure that fields parameter contains a min and a max value
-    #    within x min and x max range
-    #    """
-    #    self.mini = float(self.xminFit.GetValue())
-    #    self.maxi = float(self.xmaxFit.GetValue())
-    #    flag = True
-    #    try:
-    #        mini = float(usermin.GetValue())
-    #        maxi = float(usermax.GetValue())
-    #        if mini < maxi:
-    #            usermin.SetBackgroundColour(wx.WHITE)
-    #            usermin.Refresh()
-    #        else:
-    #            flag = False
-    #            usermin.SetBackgroundColour("pink")
-    #            usermin.Refresh()
-    #    except:
-    #        # Check for possible values entered
-    #        flag = False
-    #        usermin.SetBackgroundColour("pink")
-    #        usermin.Refresh()
-
-    #    return flag
     def floatInvTransform(self, x):
         """

src/sas/qtgui/Plotter.py

@@ -22 +22 @@
 
         self.parent = parent
-        self.addText = AddText(self)
 
         # Dictionary of {plot_id:Data1d}
@@ -29 +28 @@
         # Simple window for data display
         self.txt_widget = QtGui.QTextEdit(None)
-
+        # Window for text add
+        self.addText = AddText(self)
+
+        # Log-ness of the axes
         self.xLogLabel = "log10(x)"
         self.yLogLabel = "log10(y)"
@@ -39 +41 @@
 
         # Add a slot for receiving update signal from LinearFit
-        # NEW style signals - don't work!
+        # NEW style signals
         #self.updatePlot = QtCore.pyqtSignal(tuple)
-        #self.updatePlot.connect(self.updateWithData)
-        # OLD style signals - work perfectly
+        # self.updatePlot.connect(self.onFitDisplay)
+        # OLD style signals
         QtCore.QObject.connect(self, QtCore.SIGNAL('updatePlot'), self.onFitDisplay)
 
@@ -68 +70 @@
         is_fit = (self._data.id=="fit")
 
-        # Shortcut for an axis
+        # Shortcut for the current axis
         ax = self.ax
 
@@ -436 +438 @@
                 self.removePlot(id)
                 continue
+
             new_xlabel, new_ylabel, xscale, yscale =\
                 GuiUtils.xyTransform(current_plot, xLabel, yLabel)

src/sas/qtgui/ScaleProperties.py

@@ -45 +45 @@
         Return current values from comboboxes
         """
-        return self.cbX.currentText(), self.cbY.currentText()
+        return str(self.cbX.currentText()), str(self.cbY.currentText())
 
     def viewIndexChanged(self, index):