Changes in / [9b17efd:551f2bc] in sasview

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (9 diffs)
• MainWindow/DataManager.py (modified) (1 diff)
• MainWindow/UI/DataExplorerUI.ui (modified) (1 diff)
• MainWindow/UI/MainWindowUI.ui (modified) (2 diffs)
• Perspectives/Fitting/FittingLogic.py (modified) (1 diff)
• Perspectives/Fitting/FittingUtilities.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (8 diffs)
• Plotting/Plotter2D.py (modified) (1 diff)
• Plotting/PlotterData.py (modified) (3 diffs)
• Utilities/GuiUtils.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -574 +574 @@
         new_plots = []
         for item, plot in plots.items():
-            if self.updatePlot(plot) and filename != plot.name:
+            if self.updatePlot(plot) or filename not in plot.name:
                 continue
             # Don't plot intermediate results, e.g. P(Q), S(Q)
@@ -583 +583 @@
             # Don't include plots from different fitpages, but always include the original data
             if fitpage_name in plot.name or filename == plot.name:
-                # 'sophisticated' test to generate standalone plot for residuals
-                if 'esiduals' in plot.title:
+                # Residuals get their own plot
+                if plot.plot_role == Data1D.ROLE_RESIDUAL:
                     plot.yscale='linear'
                     self.plotData([(item, plot)])
@@ -686 +686 @@
 
         # Update the active chart list
-        #self.active_plots[new_plot.data.id] = new_plot
+        self.active_plots[new_plot.data.name] = new_plot
 
     def appendPlot(self):
@@ -729 +729 @@
         data_id = data.name
         if data_id in ids_keys:
-            self.active_plots[data_id].replacePlot(data_id, data)
+            # We have data, let's replace data that needs replacing
+            if data.plot_role != Data1D.ROLE_DATA:
+                self.active_plots[data_id].replacePlot(data_id, data)
             return True
         elif data_id in ids_vals:
-            list(self.active_plots.values())[ids_vals.index(data_id)].replacePlot(data_id, data)
+            if data.plot_role != Data1D.ROLE_DATA:
+                list(self.active_plots.values())[ids_vals.index(data_id)].replacePlot(data_id, data)
             return True
         return False
@@ -946 +949 @@
         self.context_menu.addAction(self.actionQuick3DPlot)
         self.context_menu.addAction(self.actionEditMask)
+        #self.context_menu.addSeparator()
+        #self.context_menu.addAction(self.actionFreezeResults)
         self.context_menu.addSeparator()
         self.context_menu.addAction(self.actionDelete)
@@ -957 +962 @@
         self.actionEditMask.triggered.connect(self.showEditDataMask)
         self.actionDelete.triggered.connect(self.deleteItem)
+        self.actionFreezeResults.triggered.connect(self.freezeSelectedItems)
 
     def onCustomContextMenu(self, position):
@@ -977 +983 @@
         self.actionQuick3DPlot.setEnabled(is_2D)
         self.actionEditMask.setEnabled(is_2D)
+
+        # Freezing
+        # check that the selection has inner items
+        freeze_enabled = False
+        if model_item.parent() is not None:
+            freeze_enabled = True
+        self.actionFreezeResults.setEnabled(freeze_enabled)
+
         # Fire up the menu
         self.context_menu.exec_(self.current_view.mapToGlobal(position))
@@ -1112 +1126 @@
         mask_editor.exec_()
 
+    def freezeItem(self, item=None):
+        """
+        Freeze given item
+        """
+        if item is None:
+            return
+        self.model.beginResetModel()
+        new_item = self.cloneTheory(item)
+        self.model.appendRow(new_item)
+        self.model.endResetModel()
+
+    def freezeSelectedItems(self):
+        """
+        Freeze selected items
+        """
+        indices = self.treeView.selectedIndexes()
+
+        proxy = self.treeView.model()
+        model = proxy.sourceModel()
+
+        for index in indices:
+            row_index = proxy.mapToSource(index)
+            item_to_copy = model.itemFromIndex(row_index)
+            if item_to_copy and item_to_copy.isCheckable():
+                self.freezeItem(item_to_copy)
+
     def deleteItem(self):
         """
@@ -1272 +1312 @@
 
         # Caption for the theories
-        checkbox_item.setChild(2, QtGui.QStandardItem("THEORIES"))
+        checkbox_item.setChild(2, QtGui.QStandardItem("FIT RESULTS"))
 
         # New row in the model

src/sas/qtgui/MainWindow/DataManager.py

@@ -118 +118 @@
         new_plot.path = path
         new_plot.list_group_id = []
+        # Assign the plot role to data
+        new_plot.plot_role = Data1D.ROLE_DATA
         ##post data to plot
         # plot data

src/sas/qtgui/MainWindow/UI/DataExplorerUI.ui

@@ -508 +508 @@
    </property>
   </action>
+  <action name="actionFreezeResults">
+   <property name="text">
+    <string>Freeze Results</string>
+   </property>
+  </action>
  </widget>
  <resources/>

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -415 +415 @@
    </property>
   </action>
-    <action name="actionEditMask">
+  <action name="actionEditMask">
    <property name="text">
     <string>Edit Mask</string>
@@ -549 +549 @@
   <action name="actionFreeze_Theory">
    <property name="text">
-    <string>Freeze Theory</string>
+    <string>Freeze Fit Results</string>
    </property>
   </action>

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

@@ -154 +154 @@
         new_plot.xaxis(_xaxis, _xunit)
         new_plot.yaxis(_yaxis, _yunit)
+
+        if component is not None:
+            new_plot.plot_role = Data1D.ROLE_DELETABLE #deletable
 
         return new_plot

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

@@ -128 +128 @@
 
             # Find param in volume_params
-            poly_pars = parameters.form_volume_parameters
+            poly_pars = copy.deepcopy(parameters.form_volume_parameters)
             if is2D:
                 poly_pars += parameters.orientation_parameters

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

@@ -273 +273 @@
         self.theory_item = None
 
+        # list column widths
+        self.lstParamHeaderSizes = {}
+
         # signal communicator
         self.communicate = self.parent.communicate
@@ -361 +364 @@
         self.lstParams.customContextMenuRequested.connect(self.showModelContextMenu)
         self.lstParams.setAttribute(QtCore.Qt.WA_MacShowFocusRect, False)
+        # Column resize signals
+        self.lstParams.header().sectionResized.connect(self.onColumnWidthUpdate)
+
         # Poly model displayed in poly list
         self.lstPoly.setModel(self._poly_model)
@@ -1108 +1114 @@
         self.SASModelToQModel(model, structure_factor)
 
+        for column, width in self.lstParamHeaderSizes.items():
+            self.lstParams.setColumnWidth(column, width)
+
         # Update plot
         self.updateData()
@@ -1669 +1678 @@
         self._model_model.itemChanged.connect(self.onMainParamsChange)
 
-        # Adjust the table cells width.
-        # TODO: find a way to dynamically adjust column width while resized expanding
-        self.lstParams.resizeColumnToContents(0)
-        self.lstParams.resizeColumnToContents(4)
-        self.lstParams.resizeColumnToContents(5)
-        self.lstParams.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Expanding)
-
     def iterateOverPolyModel(self, func):
         """
@@ -2014 +2016 @@
             self.magnet_params = {}
             self.setMagneticModel()
-
-        # Adjust the table cells width
-        self.lstParams.resizeColumnToContents(0)
-        self.lstParams.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Expanding)
 
         # Now we claim the model has been loaded
@@ -2342 +2340 @@
 
         # add polydisperse parameters if asked
-        if self.chkPolydispersity.isChecked():
+        if self.chkPolydispersity.isChecked() and self._poly_model.rowCount() > 0:
             for key, value in self.poly_params.items():
                 model.setParam(key, value)
         # add magnetic params if asked
         if self.chkMagnetism.isChecked():
-            for key, value in self.magnet_params.items():
+            for key, value in self.magnet_params.items() and self._magnet_model.rowCount() > 0:
                 model.setParam(key, value)
 
@@ -2481 +2479 @@
         residuals_plot = FittingUtilities.plotResiduals(self.data, weighted_data)
         residuals_plot.id = "Residual " + residuals_plot.id
+        residuals_plot.plot_role = Data1D.ROLE_RESIDUAL
         self.createNewIndex(residuals_plot)
         return residuals_plot
@@ -2726 +2725 @@
         fname_index = self._poly_model.index(row_index, self.lstPoly.itemDelegate().poly_filename)
         self._poly_model.setData(fname_index, fname)
+
+    def onColumnWidthUpdate(self, index, old_size, new_size):
+        """
+        Simple state update of the current column widths in the  param list
+        """
+        self.lstParamHeaderSizes[index] = new_size
 
     def setMagneticModel(self):

src/sas/qtgui/Plotting/Plotter2D.py

@@ -445 +445 @@
                                         self.ymin, self.ymax))
 
-            cbax = self.figure.add_axes([0.84, 0.2, 0.02, 0.7])
+            cbax = self.figure.add_axes([0.88, 0.2, 0.02, 0.7])
 
             # Current labels for axes

src/sas/qtgui/Plotting/PlotterData.py

@@ -17 +17 @@
     """
     """
+    ROLE_DATA=0
+    ROLE_DEFAULT=1
+    ROLE_DELETABLE=2
+    ROLE_RESIDUAL=3
     def __init__(self, x=None, y=None, dx=None, dy=None):
         """
@@ -35 +39 @@
         self.title = ""
         self.scale = None
+        # plot_role:
+        # 0: data - no reload on param change
+        # 1: normal lifecycle (fit)
+        # 2: deletable on model change (Q(I), S(I)...)
+        # 3: separate chart on Show Plot (residuals)
+        self.plot_role = Data1D.ROLE_DEFAULT
         
     def copy_from_datainfo(self, data1d):
@@ -184 +194 @@
         self.title = ""
         self.scale = None
+        # Always default
+        self.plot_role = Data1D.ROLE_DEFAULT
         
     def copy_from_datainfo(self, data2d):

src/sas/qtgui/Utilities/GuiUtils.py

@@ -322 +322 @@
     assert isinstance(item, QtGui.QStandardItem)
 
+    # lists of plots names/ids for all deletable plots on item
     names = [p.name for p in new_plots if p.name is not None]
     ids = [p.id for p in new_plots if p.id is not None]
@@ -329 +330 @@
     for index in range(item.rowCount()):
         plot_item = item.child(index)
-        if plot_item.isCheckable():
-            plot_data = plot_item.child(0).data()
-            if (plot_data.id is not None) and (plot_data.id not in ids) and (plot_data.name not in names):
-                items_to_delete.append(plot_item)
+        if not plot_item.isCheckable():
+            continue
+        plot_data = plot_item.child(0).data()
+        if (plot_data.id is not None) and \
+            (plot_data.id not in ids) and \
+            (plot_data.name not in names) and \
+            (plot_data.plot_role == Data1D.ROLE_DELETABLE):
+            items_to_delete.append(plot_item)
 
     for plot_item in items_to_delete: