Changeset 00f7ff1 in sasview for src/sas/sascalc/fit

Timestamp:

Jun 21, 2017 11:17:18 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

81b35396

Parents:

2a0f33f

Message:

move sim fit state to sascalc pagestate

File:

• src/sas/sascalc/fit/pagestate.py (modified) (8 diffs)

src/sas/sascalc/fit/pagestate.py

@@ -22 +22 @@
 import xml.dom.minidom
 from xml.dom.minidom import parseString
+from xml.dom.minidom import getDOMImplementation
 from lxml import etree
 
 from sasmodels import convert
 import sasmodels.weights
+
+from sas.sasview import __version__ as SASVIEW_VERSION
 
 import sas.sascalc.dataloader
@@ -141 +144 @@
     Contains information to reconstruct a page of the fitpanel.
     """
-    def __init__(self, parent=None, model=None, data=None):
+    def __init__(self, model=None, data=None):
         """
         Initialize the current state
@@ -189 +192 @@
         # fit page manager
         self.manager = None
-        # Store the parent of this panel parent
-        # For this application fitpanel is the parent
-        self.parent = parent
         # Event_owner is the owner of model event
         self.event_owner = None
@@ -286 +286 @@
             model = self.model.clone()
             model.name = self.model.name
-        obj = PageState(self.parent, model=model)
+        obj = PageState(model=model)
         obj.file = copy.deepcopy(self.file)
         obj.data = copy.deepcopy(self.data)
@@ -773 +773 @@
         :param batch_fit_state: simultaneous fit state
         """
-        from xml.dom.minidom import getDOMImplementation
-
         # Check whether we have to write a standalone XML file
         if doc is None:
@@ -802 +800 @@
 
         attr = newdoc.createAttribute("version")
-        from sas import sasview
-        attr.nodeValue = sasview.__version__
+        attr.nodeValue = SASVIEW_VERSION
         # attr.nodeValue = '1.0'
         top_element.setAttributeNode(attr)
@@ -1086 +1083 @@
                     setattr(self, varname, dic)
 
+class SimFitPageState:
+    """
+    State of the simultaneous fit page for saving purposes
+    """
+
+    def __init__(self):
+        # Sim Fit Page Number
+        self.fit_page_no = None
+        # Select all data
+        self.select_all = False
+        # Data sets sent to fit page
+        self.model_list = []
+        # Data sets to be fit
+        self.model_to_fit = []
+        # Number of constraints
+        self.no_constraint = 0
+        # Dictionary of constraints
+        self.constraint_dict = {}
+        # List of constraints
+        self.constraints_list = []
 
 class Reader(CansasReader):
@@ -1168 +1185 @@
                                          namespaces={'ns': CANSAS_NS})
             if simfitstate:
-                from simfitpage import SimFitPageState
                 sim_fit_state = SimFitPageState()
                 simfitstate_0 = simfitstate[0]