Changeset 4bee68d in sasview for sansview/perspectives/fitting

Timestamp:

Apr 26, 2011 11:46:00 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:

34b9813

Parents:

5901bb9

Message:

partly fixed saving opening project/analysis file

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (2 diffs)
• fitting.py (modified) (2 diffs)
• pagestate.py (modified) (1 diff)

sansview/perspectives/fitting/fitpanel.py

@@ -198 +198 @@
             for uid, panel in self.opened_pages.iteritems():
                 #Don't return any panel is the exact same page is created
-                if uid == panel.uid:
+                if uid == panel.uid and panel.data == state.data:
                     # the page is still opened
                     panel.reset_page(state=state)
@@ -207 +207 @@
                 # add data associated to the page created
                 if panel is not None:  
-                    self._manager.store_page(page=panel.uid, data=state.data)
+                    self._manager.store_data(uid=panel.uid, 
+                                             data=state.data,
+                                             caption=panel.window_caption)
                     panel.reset_page(state=state)
                     panel.save_current_state()

sansview/perspectives/fitting/fitting.py

@@ -316 +316 @@
         #state = self.state_reader.get_state()
         if state != None:
+            state = state.clone()
             # store fitting state in temp_state
             self.temp_state.append(state) 
@@ -347 +348 @@
                 #set state
                 data = self.parent.create_gui_data(state.data)
-                
                 data.group_id = state.data.group_id
                 self.parent.add_data(data_list={data.id:data})

sansview/perspectives/fitting/pagestate.py

@@ -1454 +1454 @@
               
         except:
-            #self.call_back(format=ext)
-            self.state= state
+            self.call_back(format=ext)
+            #self.state= state
             raise