Changeset 93f0a862 in sasview for fittingview

Timestamp:

Apr 3, 2012 4:07:35 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:

213b445

Parents:

c3c050e

Message:

fixed model_name on report for customized models

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (4 diffs)
• fitpage.py (modified) (2 diffs)
• pagestate.py (modified) (2 diffs)

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

@@ -644 +644 @@
         name = menu.GetLabel(event.GetId())
         self._on_select_model_helper()
+        if self.model != None:
+            self.m_name = self.model.name
         if name in self.saved_states.keys():
             previous_state = self.saved_states[name]
@@ -649 +651 @@
             
             self.reset_page(previous_state)   
+        self.state.m_name = self.m_name
         self.Show(True)
                
@@ -1259 +1262 @@
         #draw the pnael according to the new model parameter 
         self._on_select_model(event=None)
+            
         # take care of 2D button
         if data == None and self.model_view.IsEnabled():
@@ -1328 +1332 @@
         ## set the value of the current state to the state given as parameter
         self.state = state.clone() 
+        self.state.m_name = self.m_name
     
     def _reset_page_disp_helper(self, state):

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

@@ -47 +47 @@
         self.fit_started = False
         self.weightbt_string = None
+        self.m_name = None
         # get smear info from data
         self._get_smear_info()
@@ -1255 +1256 @@
         self.enable_fit_button()
         if self.model != None:
+            self.m_name = self.model.name
+            self.state.m_name = self.m_name
             self.rename_model()
             self._set_copy_flag(True)

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

@@ -172 +172 @@
         # model on which the fit would be performed
         self.model = model
+        self.m_name = None
         #list of process done to model
         self.process = []
@@ -370 +371 @@
         rep += "data's id : %s\n"%self.data_id
         if self.model != None:
-            rep += "model name : %s\n"% self.model.__class__.__name__
+            m_name = self.model.__class__.__name__
+            if m_name == 'Model':
+                m_name = self.m_name
+            rep += "model name : %s\n"% m_name
         else:
             rep += "model name : None\n"