Changeset 6999659 in sasview

Timestamp:

Apr 8, 2009 3:19:50 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

7c845cb

Parents:

3b605bb

Message:

restore mode for model page

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpanel.py (modified) (4 diffs)

sansview/perspectives/fitting/basepage.py

@@ -581 +581 @@
             Reset the parameters at the given state
         """
-        if len(self.state.parameters)!=  len(listtorestore) :
+        if len(statelist)==0 or  len(listtorestore)==0 :
+            return
+        if len(statelist)!=  len(listtorestore) :
             return
         for j in range(len(listtorestore)):

sansview/perspectives/fitting/fitpanel.py

@@ -76 +76 @@
         ## list of existing fit page
         self.list_fitpage_name=[]
-        self.draw_model_name=None
+    
         #model page info
         self.model_page_number=None
@@ -118 +118 @@
             if selected_page.window_name== "Model":
                 fitproblem = self.get_current_page().model.clone()
-                self.draw_model_name=None
                 self.model_page=None
                 
             if  page_number == 1:
                 self.model_page=None
-                self.draw_model_name=None
+                
             
         elif selected_page==self.about_page:
@@ -213 +212 @@
         
    
-    def add_model_page(self,model, qmin=0, qmax=0.1,
+    def add_model_page(self,model,page_title="Model", qmin=0, qmax=0.1,
                         npts=50, topmenu=False, reset=False):
         """
@@ -227 +226 @@
         """
         if topmenu==True:
-            if  self.draw_model_name ==None:
-                self._help_add_model_page(model=model,
+            if not page_title in self.fit_page_name.keys()or reset==True:
+                self._help_add_model_page(model=model, page_title=page_title,
                                 qmin=qmin, qmax=qmax, npts=npts, reset=reset)
             else:
-                self.model_page.select_model(model, "Model")
-       
+                self.model_page.select_model(model, page_title)
+                self.fit_page_name[page_title].insert(0,self.model_page.createMemento())