← Previous Changeset
Next Changeset →

Changeset 9867860 in sasview

Timestamp:

Oct 24, 2017 10:12:28 AM (7 years ago)

Author:

wojciech

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:

4f9226c

Parents:

cca56a5 (diff), 5d1440e1 (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_magnetism_bug

Files:

: 6 deleted
: 7 edited
: 66 moved

Legend:

: Unmodified
: Added
: Removed

src/sas/_config.py

-                      rb963b20
+                      r88e1f57
     try:
         module = load_module_from_path('sas.local_config', path)
         logger.info("GuiManager loaded %s", path)
+        #logger.info("GuiManager loaded %s", path)
         return module
     except Exception as exc:
         logger.critical("Error loading %s: %s", path, exc)
+        #logger.critical("Error loading %s: %s", path, exc)
         sys.exit()

src/sas/qtgui/MainWindow/DataExplorer.py

-                      r1420066
+                      r88e1f57
         Forces display of charts for the given filename
         """
-        # Assure no multiple plots for the same ID
         plot_to_show = data_list[0]
+        if plot_to_show.id in PlotHelper.currentPlots():
             return
         # Now query the model item for available plots
+        # passed plot is used ONLY to figure out its title,
+        # so all the charts related by it can be pulled from
+        # the data explorer indices.
         filename = plot_to_show.filename
         model = self.model if plot_to_show.is_data else self.theory_model
+        # Now query the model item for available plots
         plots = GuiUtils.plotsFromFilename(filename, model)
+        item = GuiUtils.itemFromFilename(filename, model)
+        new_plots = []
         for plot in plots:
             plot_id = plot.id
 …
                 self.active_plots[plot_id].replacePlot(plot_id, plot)
             else:
+                self.plotData([(None, plot)])
+                # 'sophisticated' test to generate standalone plot for residuals
+                if 'esiduals' in plot.title:
+                    self.plotData([(item, plot)])
+                else:
+                    new_plots.append((item, plot))
+        if new_plots:
+            self.plotData(new_plots)
     def addDataPlot2D(self, plot_set, item):
 …
         plot2D.plot(plot_set)
         self.addPlot(plot2D)
+        self.active_plots[plot2D.data.id] = plot2D
         #============================================
         # Experimental hook for silx charts
 …
         # Call show on requested plots
         # All same-type charts in one plot
-        #if isinstance(plot_set, Data1D):
-        #    new_plot = Plotter(self)
         for item, plot_set in plots:
             if isinstance(plot_set, Data1D):
 …
                     new_plot = Plotter(self)
                 new_plot.plot(plot_set)
+                # active_plots may contain multiple charts
+                self.active_plots[plot_set.id] = new_plot
             elif isinstance(plot_set, Data2D):
                 self.addDataPlot2D(plot_set, item)
 …
         # Update the active chart list
         self.active_plots[new_plot.data.id] = new_plot
+        #self.active_plots[new_plot.data.id] = new_plot
     def appendPlot(self):

src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

-                      rf4a1433
+                      r88e1f57
 import sas.qtgui.Plotting.PlotHelper as PlotHelper
 #if not QApplication.instance():
 app = QApplication(sys.argv)
+if not QApplication.instance():
+    app = QApplication(sys.argv)
 class DataExplorerTest(unittest.TestCase):

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

-                      ra95c44b
+                      rd0dfcb2
 from sas.qtgui.Plotting.PlotterData import Data1D
 from sas.qtgui.Plotting.PlotterData import Data2D
+model_header_captions = ['Parameter', 'Value', 'Min', 'Max', 'Units']
+model_header_tooltips = ['Select parameter for fitting',
+                         'Enter parameter value',
+                         'Enter minimum value for parameter',
+                         'Enter maximum value for parameter',
+                         'Unit of the parameter']
+poly_header_captions = ['Parameter', 'PD[ratio]', 'Min', 'Max', 'Npts', 'Nsigs',
+                        'Function', 'Filename']
+poly_header_tooltips = ['Select parameter for fitting',
+                        'Enter polydispersity ratio (STD/mean). '
+                        'STD: standard deviation from the mean value',
+                        'Enter minimum value for parameter',
+                        'Enter maximum value for parameter',
+                        'Enter number of points for parameter',
+                        'Enter number of sigmas parameter',
+                        'Select distribution function',
+                        'Select filename with user-definable distribution']
+error_tooltip = 'Error value for fitted parameter'
+header_error_caption = 'Error'
 def replaceShellName(param_name, value):
 …
     Adds predefined headers to the model
     """
+    model.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Parameter"))
+    model.setHeaderData(1, QtCore.Qt.Horizontal, QtCore.QVariant("Value"))
+    model.setHeaderData(2, QtCore.Qt.Horizontal, QtCore.QVariant("Min"))
+    model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
+    model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Units"))
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter parameter value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Unit of the parameter']
+    for i, item in enumerate(model_header_captions):
+        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+    model.header_tooltips = model_header_tooltips
 def addErrorHeadersToModel(model):
     """
     Adds predefined headers to the model
     """
+    model.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Parameter"))
+    model.setHeaderData(1, QtCore.Qt.Horizontal, QtCore.QVariant("Value"))
+    model.setHeaderData(2, QtCore.Qt.Horizontal, QtCore.QVariant("Error"))
+    model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Min"))
+    model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
+    model.setHeaderData(5, QtCore.Qt.Horizontal, QtCore.QVariant("Units"))
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter parameter value',
+                             'Error value for fitted parameter',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Unit of the parameter']
+    model_header_error_captions = model_header_captions
+    model_header_error_captions.insert(2, header_error_caption)
+    for i, item in enumerate(model_header_error_captions):
+        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+    model_header_error_tooltips = model_header_tooltips
+    model_header_error_tooltips.insert(2, error_tooltip)
+    model.header_tooltips = model_header_error_tooltips
 def addPolyHeadersToModel(model):
 …
     Adds predefined headers to the model
     """
+    model.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Parameter"))
+    model.setHeaderData(1, QtCore.Qt.Horizontal, QtCore.QVariant("PD[ratio]"))
+    model.setHeaderData(2, QtCore.Qt.Horizontal, QtCore.QVariant("Min"))
+    model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
+    model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Npts"))
+    model.setHeaderData(5, QtCore.Qt.Horizontal, QtCore.QVariant("Nsigs"))
+    model.setHeaderData(6, QtCore.Qt.Horizontal, QtCore.QVariant("Function"))
+    model.setHeaderData(7, QtCore.Qt.Horizontal, QtCore.QVariant("Filename"))
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter polydispersity ratio (STD/mean). '
+                             'STD: standard deviation from the mean value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Enter number of points for parameter',
+                             'Enter number of sigmas parameter',
+                             'Select distribution function',
+                             'Select filename with user-definable distribution']
+    for i, item in enumerate(poly_header_captions):
+        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+    model.header_tooltips = poly_header_tooltips
 def addErrorPolyHeadersToModel(model):
 …
     Adds predefined headers to the model
     """
+    model.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Parameter"))
+    model.setHeaderData(1, QtCore.Qt.Horizontal, QtCore.QVariant("PD[ratio]"))
+    model.setHeaderData(2, QtCore.Qt.Horizontal, QtCore.QVariant("Error"))
+    model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Min"))
+    model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
+    model.setHeaderData(5, QtCore.Qt.Horizontal, QtCore.QVariant("Npts"))
+    model.setHeaderData(6, QtCore.Qt.Horizontal, QtCore.QVariant("Nsigs"))
+    model.setHeaderData(7, QtCore.Qt.Horizontal, QtCore.QVariant("Function"))
+    model.setHeaderData(8, QtCore.Qt.Horizontal, QtCore.QVariant("Filename"))
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter polydispersity ratio (STD/mean). '
+                             'STD: standard deviation from the mean value',
+                             'Error value for fitted parameter',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Enter number of points for parameter',
+                             'Enter number of sigmas parameter',
+                             'Select distribution function',
+                             'Select filename with user-definable distribution']
+    poly_header_error_captions = poly_header_captions
+    poly_header_error_captions.insert(2, header_error_caption)
+    for i, item in enumerate(poly_header_error_captions):
+        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+    poly_header_error_tooltips = poly_header_tooltips
+    poly_header_error_tooltips.insert(2, error_tooltip)
+    model.header_tooltips = poly_header_error_tooltips
 def addShellsToModel(parameters, model, index):

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

-                      rcca56a5
+                      r9867860
 from PyQt4 import QtWebKit
+from sasmodels import product
 from sasmodels import generate
 from sasmodels import modelinfo
 …
 class ToolTippedItemModel(QtGui.QStandardItemModel):
+    def __init__(self, parent = None):
+    """
+    Subclass from QStandardItemModel to allow displaying tooltips in
+    QTableView model.
+    """
+    def __init__(self, parent=None):
         QtGui.QStandardItemModel.__init__(self,parent)
     def headerData(self, section, orientation, role):
+        """
+        Displays tooltip for each column's header
+        :param section:
+        :param orientation:
+        :param role:
+        :return:
+        """
         if role == QtCore.Qt.ToolTipRole:
             if orientation == QtCore.Qt.Horizontal:
 …
         # Regardless of previous state, this should now be `plot show` functionality only
         self.cmdPlot.setText("Show Plot")
         if not self.data_is_loaded:
             self.recalculatePlotData()
+        # Force data recalculation so existing charts are updated
+        self.recalculatePlotData()
         self.showPlot()
 …
         structure_module = generate.load_kernel_module(structure_factor)
         structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
+        structure_kernel = self.models[structure_factor]()
+        self.kernel_module._model_info = product.make_product_info(self.kernel_module._model_info, structure_kernel._model_info)
         new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D)

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

r16afe01	r7ffa5ee9
128	128
129	129	def editableParameters(self):
130		return [self.poly_min, self.poly_max, self.poly_npts, self.poly_nsigs]
	130	return [self.poly_pd, self.poly_min, self.poly_max, self.poly_npts, self.poly_nsigs]
131	131
132	132	def columnDict(self):

src/sas/qtgui/Utilities/GuiUtils.py

-                      rf0bb711
+                      r88e1f57
     # Append the new row to the main item
     item.appendRow(object_item)
+def itemFromFilename(filename, model_item):
+    """
+    Returns the model item text=filename in the model
+    """
+    assert isinstance(model_item, QtGui.QStandardItemModel)
+    assert isinstance(filename, basestring)
+    # Iterate over model looking for named items
+    item = list(filter(lambda i: str(i.text()) == filename,
+                  [model_item.item(index) for index in range(model_item.rowCount())]))
+    return item[0] if len(item)>0 else None
 def plotsFromFilename(filename, model_item):

Note: See TracChangeset for help on using the changeset viewer.

Changeset 9867860 in sasview

Legend:

Download in other formats: