Changeset 69f9084 in sasview

Timestamp:

Apr 18, 2011 8:14:07 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:

c0ff8cc

Parents:

06aa2eeb

Message:

fixed model details (help)

Files:

• sansmodels/src/media/model_functions.html (modified) (2 diffs)
• sansview/perspectives/fitting/basepage.py (modified) (3 diffs)

sansmodels/src/media/model_functions.html

@@ -504 +504 @@
      <a href="#TwoPowerLaw">TwoPowerLaw</a>, <a href="#UnifiedPowerRg">UnifiedPowerRg</a>,
      <a href="#LineModel">LineModel</a>.</li>
- <li class=MsoNormal style='line-height:115%'><a href="#Customized_Models"><b>Customized
+ <li class=MsoNormal style='line-height:115%'><a href="#Model"><b>Customized
      Models</b></a>: <a href="#A+Bcos(2x)+Csin(2x)">A+Bcos(2x)+Csin(2x)</a>, <a
      href="#sinpoly_poly">sin(poly)/(poly)</a>, <a href="#ReflectivityModel">ReflectivityModel</a>,
@@ -13718 +13718 @@
 <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in'><b><span
 style='font-size:16.0pt'>4.</span></b><b><span style='font-size:7.0pt'>&nbsp;&nbsp;&nbsp;
-</span></b><a name="Customized_Models"><b><span style='font-size:16.0pt'>Customized
+</span></b><a name="Model"><b><span style='font-size:16.0pt'>Customized
 Models </span></b></a></p>
 
 <p class=MsoNormal style='margin-left:.25in'><b><span style='font-size:14.0pt'>&nbsp;</span></b></p>
 
-<p class=MsoBodyText style='margin-left:.25in'>These model functions can be
-redefined by users (See SansView tutorial for details). </p>
+<p class=MsoBodyText style='margin-left:.25in'>Customized model functions can be
+redefined or added by users (See SansView tutorial for details). </p>
 
 <p class=MsoBodyText style='margin-left:.25in'>&nbsp;</p>

sansview/perspectives/fitting/basepage.py

@@ -101 +101 @@
         ## smearer object
         self.smearer = None
+        self.enable2D = False
         
         ##list of model parameters. each item must have same length
@@ -2470 +2471 @@
         for item1, item2 in gui_manager.panels.iteritems():
              data_title = self.data.group_id
-             data_name = self.data.name
+             data_name = str(self.data.name).split(" [")[0]
             # try to get all plots belonging to this control panel
              try:
@@ -2501 +2502 @@
             name = 'FuncHelp'
         else:
-            name = self.model.origin_name
+            name = self.model.__class__.__name__
+            print "name",name
 
         frame = HelpWindow(None, -1,  pageToOpen=model_path)