Changeset 68a921f in sasview for fittingview/src/sans

Timestamp:

Oct 3, 2011 3:28:36 PM (13 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:

f64a4b7

Parents:

3fb5e68

Message:

working on the poly function with copy/paste

File:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (3 diffs)

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

@@ -2881 +2881 @@
         # go through the str params
         for item in param: 
+            disfunc = ''
+            try:
+                if item[7].__class__.__name__ == 'ComboBox':
+                    disfunc = item[7].GetLabel()
+            except:
+                disfunc = ''
+                pass
             # 2D
             if self.data.__class__.__name__== "Data2D":
@@ -2891 +2898 @@
                     name = item[1]
                     value = item[2].GetValue()
+                else:
+                    disfunc = ''
             # add to the content
-            content += name + ',' + value + ':'
-            
+            if disfunc != '':
+                disfunc = ',' + disfunc
+            content += name + ',' + value + disfunc + ':'
+
         return content
    
@@ -2940 +2951 @@
                 # Transfer the text to content[dictionary]
                 context[name] = value
-        
+            # ToDo: PlugIn this poly disp function for pasting
+            if len(line) == 3:
+                poly_func = item[2]
+            else:
+                poly_func = None
         # Do it if params exist        
         if  self.parameters != []: