Changeset e5ae812 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Nov 13, 2018 5:25:48 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

baeac95

Parents:

133812c7

Message:

Added C&S tab serialization.

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (5 diffs)
• GuiManager.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -457 +457 @@
                 self.chkBatch.setChecked(True if value=='True' else False)
                 continue
+            if 'cs_tab' in key:
+                continue
             # send newly created items to the perspective
             self.updatePerspectiveWithProperties(key, value)
@@ -462 +464 @@
         # See if there are any batch pages defined and create them, if so
         self.updateWithBatchPages(all_data)
+
+        # Only now can we create/assign C&S pages.
+        for key, value in all_data.items():
+            if 'cs_tab' in key:
+                self.updatePerspectiveWithProperties(key, value)
 
     def updateWithBatchPages(self, all_data):
@@ -488 +495 @@
                 self._perspective().setData(data_item=items, is_batch=True)
                 self._perspective().updateFromParameters(page)
-
         pass
 
@@ -494 +500 @@
         """
         """
-        data_dict = {key:value['fit_data']}
-        # Create new model items in the data explorer
-        items = self.updateModelFromData(data_dict)
+        if 'fit_data' in value:
+            data_dict = {key:value['fit_data']}
+            # Create new model items in the data explorer
+            items = self.updateModelFromData(data_dict)
 
         if 'fit_params' in value:
@@ -512 +519 @@
                 # Assign parameters to the most recent (current) page.
                 self._perspective().updateFromParameters(page)
+        if 'cs_tab' in key and 'is_constraint' in value:
+            # Create a C&S page
+            self._perspective().addConstraintTab()
+            # Modify the tab
+            self._perspective().updateFromParameters(value)
+
         pass # debugger
 

src/sas/qtgui/MainWindow/GuiManager.py

@@ -594 +594 @@
             analysis[id] = data_content
 
+        # standalone constraint pages
+        for keys, values in params.items():
+            if not 'is_constraint' in values[0]:
+                continue
+            analysis[keys] = values[0]
+
         with open(filename, 'w') as outfile:
             GuiUtils.saveData(outfile, analysis)
@@ -1177 +1183 @@
             out_f.write("#Application appearance custom configuration\n")
             for key, item in config.__dict__.items():
-                if key[:2] != "__":
-                    if isinstance(item, str):
-                        item = '"' + item + '"'
-                    out_f.write("%s = %s\n" % (key, str(item)))
+                if key[:2] == "__":
+                    continue
+                if isinstance(item, str):
+                    item = '"' + item + '"'
+                out_f.write("%s = %s\n" % (key, str(item)))
         pass # debugger anchor