Changeset ef16f59 in sasview for sansview/perspectives/fitting/pagestate.py

Timestamp:

Aug 9, 2010 11:38:42 AM (14 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:

e683abb

Parents:

4da35bc

Message:

Now it saves and opens all states of fitv taps.

File:

• sansview/perspectives/fitting/pagestate.py (modified) (3 diffs)

sansview/perspectives/fitting/pagestate.py

@@ -1139 +1139 @@
                     if max_char < 0:
                         max_char = len(state.file)
-                    state.file = state.file[0:max_char] +' [' + time_str + ']'
+                    original_fname = state.file[0:max_char]
+                    state.file = original_fname +' [' + time_str + ']'
                    
                         
@@ -1149 +1150 @@
                     state.data.name = output[ind].filename #state.data_name
                     state.data.id = state.data_id
-                    state.data.id = state.data_id
                     if state.is_data is not None:
                         state.data.is_data = state.is_data
-                    state.data.group_id = output[ind].filename
-                  
-                    # make sure to put run name if none
-                    #if output[ind].run == None or output[ind].run ==[]:
-                    #    exec 'output[%d].run = [output[%d].filename]'% (ind,ind)
+                    if output[ind].run_name is not None and len(output[ind].run_name) != 0 :
+                        name = output[ind].run_name
+                    else: 
+                        name=original_fname
+                    state.data.group_id = name
+                    #store state in fitting
                     self.call_back(state=state, datainfo=output[ind])
-                return output[ind]
+                    
+                return output
               
         except:
@@ -1176 +1178 @@
             
             # Add fitting information to the XML document
-            self.write_toXML(datainfo, fitstate)
+            doc = self.write_toXML(datainfo, fitstate)
             # Write the XML document
             fd = open(filename, 'w')