Changeset 0145a25 in sasview

Timestamp:

Jun 29, 2011 5:10:42 PM (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:

6694604

Parents:

d5c2f4d

Message:

minor changes for plot labeling

Files:

• guiframe/local_perspectives/plotting/plotting.py (modified) (1 diff)
• sansmodels/src/sans/models/BaseComponent.py (modified) (1 diff)
• sansmodels/src/sans/models/ReflectivityIIModel.py (modified) (1 diff)
• sansmodels/src/sans/models/ReflectivityModel.py (modified) (1 diff)
• sansview/perspectives/fitting/fitpage.py (modified) (2 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (3 diffs)

guiframe/local_perspectives/plotting/plotting.py

@@ -216 +216 @@
         flag_y = (panel.graph.prop["yunit"] is not None) and \
                     (panel.graph.prop["yunit"].strip() != "") and\
-                    (x_unit != panel.graph.prop["yunit"])
+                    (y_unit != panel.graph.prop["yunit"])
         if (flag_x and flag_y):
             msg = "Cannot add %s" % str(data.name)

sansmodels/src/sans/models/BaseComponent.py

@@ -41 +41 @@
         ## store dispersity reference
         self._persistency_dict = {}
-           
+        ## independent parameter name and unit [string]
+        self.input_name = "Q"
+        self.input_unit = "A^{-1}"
+        ## output name and unit  [string]
+        self.output_name = "Intensity"
+        self.output_unit = "cm^{-1}"
+        
     def __str__(self):
         """ 

sansmodels/src/sans/models/ReflectivityIIModel.py

@@ -55 +55 @@
         # [str(name of function0),...], [str(x-asix name of sld),...]]
         self.multiplicity_info = [max_nshells,"No. of Layers:",[],['Depth']]
-        
+        ## independent parameter name and unit [string]
+        self.input_name = "Q"
+        self.input_unit = "A^{-1}"
+        ## output name and unit  [string]
+        self.output_name = "Reflectivity"
+        self.output_unit = ""
+   
     
     def _clone(self, obj):

sansmodels/src/sans/models/ReflectivityModel.py

@@ -53 +53 @@
         # [str(name of function0),...], [str(x-asix name of sld),...]]
         self.multiplicity_info = [max_nshells,"No. of Layers:",[],['Depth']]
-
+        ## independent parameter name and unit [string]
+        self.input_name = "Q"
+        self.input_unit = "A^{-1}"
+        ## output name and unit  [string]
+        self.output_name = "Reflectivity"
+        self.output_unit = ""
     
     def _clone(self, obj):

sansview/perspectives/fitting/fitpage.py

@@ -1114 +1114 @@
             self.state.model.name = self.model.name
 
-            self._draw_model()
+            
         if event != None:
             ## post state to fit panel
@@ -1130 +1130 @@
                     self.formfactorbox.SetValue(current_val)
             self._onDraw(event=None)
+        else:
+            self._draw_model()
         self.SetupScrolling()
     

sansview/perspectives/fitting/fitting.py

@@ -1305 +1305 @@
             new_plot.symbol = GUIFRAME_ID.CURVE_SYMBOL_NUM
             if data != None:
+                #if model.output_name.lower().count("reflectivity") > 0:
+                #    _yaxis, _yunit = "\\rm{%s}"% model.output_name, \
+                #                                "%s"% model.output_unit
+                #else:
+                _yaxis, _yunit = data.get_yaxis() 
                 _xaxis, _xunit = data.get_xaxis() 
-                _yaxis, _yunit = data.get_yaxis() 
                 new_plot.title = data.name
                 #if the theory is already plotted use the same group id 
@@ -1319 +1323 @@
                
             else:
-                _xaxis, _xunit = "\\rm{Q}", 'A^{-1}'
-                _yaxis, _yunit = "\\rm{Intensity} ", "cm^{-1}"
+                _xaxis, _xunit = "\\rm{%s}"% model.input_name, \
+                                                "%s"% model.input_unit
+                _yaxis, _yunit = "\\rm{%s}"% model.output_name, \
+                                                "%s"% model.output_unit
                 new_plot.title = "Analytical model 1D "
                 #find a group id to plot theory without data
@@ -1354 +1360 @@
             current_pg = self.fit_panel.get_page_by_id(page_id)
             title = new_plot.title
-            
+
             wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
                                             title= str(title)))