Changeset 1ac202f in sasview

Timestamp:

Mar 28, 2012 12:45:22 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

07dfdb8

Parents:

cdc2ee2

Message:

remove useless parameters displaying

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitting.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -3005 +3005 @@
         # go through the str params
         for item in param: 
+            # copy only the params shown
+            if not item[2].IsShown():
+                continue
             disfunc = ''
             try:

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1475 +1475 @@
         wx.PostEvent(self.parent, StatusEvent(status=msg, error="error",
                                                               type="stop"))
-        wx.CallAfter(self.parent.on_set_batch_result,batch_outputs, 
+        # Remove parameters that are not shown
+        cpage = self.fit_panel.get_page_by_id(uid)
+        tbatch_outputs = {}
+        shownkeystr = cpage.get_copy_params()
+        for key in batch_outputs.keys():
+            if key in ["Chi2", "Data"] or shownkeystr.count(key)>0:
+                tbatch_outputs[key] = batch_outputs[key]
+                
+        wx.CallAfter(self.parent.on_set_batch_result,tbatch_outputs, 
                                             batch_inputs,
                                            self.sub_menu)