Changeset 814a253 in sasview

Timestamp:

Oct 24, 2017 8:23:48 AM (7 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:

def64a0

Parents:

88e1f57 (diff), 7ffa5ee9 (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

Files:

• qtgui/Perspectives/Fitting/ViewDelegate.py (modified) (1 diff)
• _config.py (modified) (1 diff)
• qtgui/MainWindow/DataExplorer.py (modified) (6 diffs)
• qtgui/MainWindow/UnitTesting/DataExplorerTest.py (modified) (1 diff)
• qtgui/Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• qtgui/Utilities/GuiUtils.py (modified) (1 diff)

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

@@ -128 +128 @@
 
     def editableParameters(self):
-        return [self.poly_min, self.poly_max, self.poly_npts, self.poly_nsigs]
+        return [self.poly_pd, self.poly_min, self.poly_max, self.poly_npts, self.poly_nsigs]
 
     def columnDict(self):

src/sas/_config.py

@@ -65 +65 @@
     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

@@ -463 +463 @@
         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
@@ -477 +481 @@
                 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):
@@ -487 +498 @@
         plot2D.plot(plot_set)
         self.addPlot(plot2D)
+        self.active_plots[plot2D.data.id] = plot2D
         #============================================
         # Experimental hook for silx charts
@@ -507 +519 @@
         # 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):
@@ -515 +524 @@
                     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)
@@ -556 +567 @@
 
         # 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

@@ -25 +25 @@
 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/FittingWidget.py

@@ -1038 +1038 @@
         # 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()
 

src/sas/qtgui/Utilities/GuiUtils.py

@@ -313 +313 @@
     # 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):