Changeset 6011788 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

May 15, 2017 5:21:45 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:

2241130

Parents:

ad6b4e2

Message:

Towards the FitPage? stack.
Improvements to view delegates.

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (9 diffs)

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

@@ -34 +34 @@
 from sas.qtgui.Perspectives.Fitting.FitPage import FitPage
 from sas.qtgui.Perspectives.Fitting.ViewDelegate import ModelViewDelegate
+from sas.qtgui.Perspectives.Fitting.ViewDelegate import PolyViewDelegate
 
 TAB_MAGNETISM = 4
@@ -77 +78 @@
         self.chi2 = None
 
+        # Does the control support UNDO/REDO
+        # temporarily off
+        self.support_undo = False
+
         # Data for chosen model
         self.model_data = None
@@ -146 +151 @@
         self.setPolyModel()
         self.setTableProperties(self.lstPoly)
+        # Delegates for custom editing and display
+        self.lstPoly.setItemDelegate(PolyViewDelegate(self))
 
         # Magnetism model displayed in magnetism list
@@ -361 +368 @@
             self.createDefaultDataset()
 
-        # TODO: update state stack
-        #state = self.currentState()
+        # Update state stack
+        if self.support_undo:
+            state = self.currentState()
+            self.pushFitPage(state)
 
     def onSelectStructureFactor(self):
@@ -850 +859 @@
 
         # Extract changed value. Assumes proper validation by QValidator/Delegate
-        # TODO: disable model update for uneditable cells/columns
         try:
             value = float(item.text())
@@ -1068 +1076 @@
             checked_list = ["Distribution of "+param.name, str(param.default),
                             str(param.limits[0]), str(param.limits[1]),
-                            "35", "3", ""]
+                            "35", "3", "gaussian"]
             FittingUtilities.addCheckedListToModel(self._poly_model, checked_list)
 
             #TODO: Need to find cleaner way to input functions
-            func = QtGui.QComboBox()
-            func.addItems(['rectangle', 'array', 'lognormal', 'gaussian', 'schulz',])
-            func_index = self.lstPoly.model().index(row, 6)
-            self.lstPoly.setIndexWidget(func_index, func)
+            #func = QtGui.QComboBox()
+            #func.addItems(['rectangle', 'array', 'lognormal', 'gaussian', 'schulz',])
+            #func_index = self.lstPoly.model().index(row, 6)
+            #self.lstPoly.setIndexWidget(func_index, func)
 
         FittingUtilities.addPolyHeadersToModel(self._poly_model)
@@ -1179 +1187 @@
         self.q_range_max = fp.fit_options[fp.MAX_RANGE]
         self.npts = fp.fit_options[fp.NPTS]
-        #fp.fit_options[fp.NPTS_FIT] = self.npts_fit
         self.log_points = fp.fit_options[fp.LOG_POINTS]
         self.weighting = fp.fit_options[fp.WEIGHTING]
@@ -1258 +1265 @@
         Add a new fit page object with current state
         """
-        #page_stack.append(new_page)
+        self.page_stack.append(new_page)
         pass
 
@@ -1265 +1272 @@
         Remove top fit page from stack
         """
-        #if page_stack:
-        #    page_stack.pop()
+        if self.page_stack:
+            self.page_stack.pop()
         pass