Changeset edb3a5d0 in sasview

Timestamp:

Jun 11, 2010 10:54:30 AM (15 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:

d0d7704

Parents:

9afd369

Message:

hiding button

Files:

• calculator/docs/sphinx/_build/doctrees/api/index.doctree (modified) (previous)
• calculator/docs/sphinx/_build/doctrees/environment.pickle (modified) (previous)
• calculator/docs/sphinx/_build/doctrees/index.doctree (modified) (previous)
• calculator/docs/sphinx/_build/html/.buildinfo (modified) (1 diff)
• calculator/docs/sphinx/_build/html/_sources/index.txt (modified) (1 diff)
• calculator/docs/sphinx/_build/html/_static/dansestyle.css (added)
• calculator/docs/sphinx/_build/html/api/index.html (modified) (1 diff)
• calculator/docs/sphinx/_build/html/index.html (modified) (2 diffs)
• calculator/docs/sphinx/_build/html/objects.inv (modified) (previous)
• calculator/docs/sphinx/_build/html/searchindex.js (modified) (1 diff)
• calculator/sld_calculator.py (modified) (3 diffs)
• calculatorview/perspectives/calculator/sld_panel.py (modified) (3 diffs)

calculator/docs/sphinx/_build/html/.buildinfo

@@ -1 +1 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 4f7756b2d2ae5275cfc0e136e19e466e
+config: d2bf7106d66273c92c93b0556c91a2e6
 tags: fbb0d17656682115ca4d033fb2f83ba1

calculator/docs/sphinx/_build/html/_sources/index.txt

@@ -7 +7 @@
 ======================================
 Calculator is a package that contains other sub-modules necessary for small computations. These sub-modules
-may be independant of each other, but there are used as tools for sansview application. The calculator package
+may be independant of each other, but there are used as ``tools`` for sansview application. The calculator package
 currently contains the following sub-modules:
 
+* :ref:`sans.invariant.invariant.index`
 
 .. htmlonly::

calculator/docs/sphinx/_build/html/api/index.html

@@ -60 +60 @@
 <tr class="field"><th class="field-name">Release:</th><td class="field-body">0.1</td>
 </tr>
-<tr class="field"><th class="field-name">Date:</th><td class="field-body">May 28, 2010</td>
+<tr class="field"><th class="field-name">Date:</th><td class="field-body">June 08, 2010</td>
 </tr>
 </tbody>

calculator/docs/sphinx/_build/html/index.html

@@ -51 +51 @@
 <h1>Calculator<a class="headerlink" href="#calculator" title="Permalink to this headline">¶</a></h1>
 <p>Calculator is a package that contains other sub-modules necessary for small computations. These sub-modules
-may be independant of each other, but there are used as tools for sansview application. The calculator package
+may be independant of each other, but there are used as <tt class="docutils literal"><span class="pre">tools</span></tt> for sansview application. The calculator package
 currently contains the following sub-modules:</p>
+<ul class="simple">
+<li><em class="xref std std-ref">sans.invariant.invariant.index</em></li>
+</ul>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
@@ -59 +62 @@
 <tr class="field"><th class="field-name">Release:</th><td class="field-body">0.1</td>
 </tr>
-<tr class="field"><th class="field-name">Date:</th><td class="field-body">May 27, 2010</td>
+<tr class="field"><th class="field-name">Date:</th><td class="field-body">June 08, 2010</td>
 </tr>
 </tbody>

calculator/docs/sphinx/_build/html/searchindex.js

@@ -1 @@
-Search.setIndex({objects:{"sans.calculator.sld_calculator":{SldCalculator:[2,1,1]},"sans.calculator":{sld_calculator:[2,0,0],slit_length_calculator:[3,0,0]},"sans.calculator.slit_length_calculator.SlitlengthCalculator":{get_slit_length_unit:[3,2,1],calculate_slit_length:[3,2,1],set_data:[3,2,1]},"sans.calculator.sld_calculator.SldCalculator":{set_value:[2,2,1],calculate_xray_sld:[2,2,1],calculate_length:[2,2,1],calculate_neutron_sld:[2,2,1]},"sans.calculator.slit_length_calculator":{SlitlengthCalculator:[3,1,1]}},terms:{follow:[1,2],paramet:3,get_slit_length_unit:3,easi:2,param:2,should:[],better:[],densiti:2,determin:[3,2],modul:[1,2,3],real:2,applic:[1,2],"return":[3,2],string:2,get:2,molecul:2,beam:3,calculate_sld_im:[],volum:2,vector:3,necessari:1,calculate_xray_sld:2,user_formula:[],contain:1,small:[1,3],page:1,set:[],sld_calcul:[0,2],sldcalcul:2,result:2,proper:2,wavelength:2,todo:[],index:1,absorpt:[],sub:1,"3rd":3,imaginari:2,section:2,slit_length_calcul:[0,3],content:[],formula:2,method:2,slitlengthcalcul:3,refer:[0,1],alina:[],sansview:1,each:1,calculate_slit_length:3,calculate_length:2,set_data:3,releas:[0,1],valu:[3,2],search:1,current:1,prior:2,length:[0,1,2,3],base:[3,2],calculate_neutron_sld:2,coh:[],col:3,point:[],arrai:3,independ:1,"2nd":3,saxsess:3,"1st":3,unit:3,given:2,from:3,two:3,call:2,sld_real:2,interfac:2,store:2,quickli:3,tool:[1,3],factor:[],part:2,atom:2,set_valu:2,must:2,none:3,provid:2,prepar:3,calcul:[0,1,2,3],sld:[0,1,2],scatter:2,comput:[1,2,3],san:[0,3,2],indic:1,packag:[1,2],slit:[0,1,3],exist:2,coher:[],tabl:1,need:[3,2],gervais:[],inc:2,mai:[0,1],welcom:[],author:[],receiv:3,titl:[],cross:2,note:2,other:1,futur:[],document:[],neutron:2,incoher:2,sld_im:2,relat:[],intend:2,allow:3,max:[],object:[3,2],periodict:2,user:[3,2],date:[0,1],elementi:2,absorp:[],data:3,"class":[3,2],don:3,calculate_coherence_im:[],later:2,correspond:2,element:2,h2o:2,exampl:2,thi:[3,2],profil:3,order:2},objtypes:{"0":"py:module","1":"py:class","2":"py:method"},titles:["Reference","Calculator","Sld Calculator","Slit Length Calculator"],objnames:{"0":"Python module","1":"Python class","2":"Python method"},filenames:["api/index","index","api/sld_calculator","api/slit_length_calculator"]})
+Search.setIndex({objects:{"sans.calculator.sld_calculator":{SldCalculator:[3,1,1]},"sans.calculator":{sld_calculator:[3,0,0],slit_length_calculator:[2,0,0]},"sans.calculator.slit_length_calculator.SlitlengthCalculator":{get_slit_length_unit:[2,2,1],calculate_slit_length:[2,2,1],set_data:[2,2,1]},"sans.calculator.sld_calculator.SldCalculator":{set_value:[3,2,1],calculate_length:[3,2,1],calculate_xray_sld:[3,2,1],calculate_neutron_sld:[3,2,1]},"sans.calculator.slit_length_calculator":{SlitlengthCalculator:[2,1,1]}},terms:{thi:[2,3],follow:[1,3],paramet:2,get_slit_length_unit:2,easi:3,param:3,should:[],better:[],densiti:3,arrai:2,real:3,applic:[1,3],"return":[2,3],string:3,get:3,molecul:3,beam:2,calculate_sld_im:[],volum:3,method:3,vector:2,necessari:1,user_formula:[],each:1,small:[1,2],page:1,set:[],sld_calcul:[0,3],sldcalcul:3,result:3,proper:3,wavelength:3,todo:[],index:1,absorpt:[],sub:1,"3rd":2,section:3,slit_length_calcul:[0,2],content:[],version:[],formula:3,imaginari:3,slitlengthcalcul:2,refer:[0,1],alina:[],periodict:3,sansview:1,contain:1,calculate_slit_length:2,calculate_length:3,htmlonli:[],set_data:2,releas:[0,1],valu:[2,3],search:1,current:1,prior:3,length:[0,1,2,3],base:[2,3],calculate_neutron_sld:3,coh:[],col:2,point:[],modul:[2,1,3],independ:1,"2nd":2,saxsess:2,"1st":2,unit:2,given:3,from:2,two:2,todai:[],call:3,sld_real:3,interfac:3,store:3,quickli:2,tool:[1,2],factor:[],part:3,atom:3,set_valu:3,must:3,none:2,provid:3,prepar:2,calcul:[0,1,2,3],sld:[0,1,3],scatter:3,later:3,comput:[2,1,3],san:[0,1,2,3],indic:1,packag:[1,3],slit:[0,1,2],exist:3,coher:[],tabl:1,need:[2,3],gervais:[],inc:3,date:[0,1],welcom:[],calculate_xray_sld:3,receiv:2,titl:[],cross:3,note:3,other:1,futur:[],document:[],neutron:3,incoher:3,sld_im:3,relat:[],intend:3,allow:2,max:[],object:[2,3],june:[0,1],user:[2,3],mai:1,elementi:3,absorp:[],data:2,"class":[2,3],invari:1,don:2,calculate_coherence_im:[],author:[],correspond:3,element:3,h2o:3,exampl:3,determin:[2,3],profil:2,order:3},objtypes:{"0":"py:module","1":"py:class","2":"py:method"},titles:["Reference","Calculator","Slit Length Calculator","Sld Calculator"],objnames:{"0":"Python module","1":"Python class","2":"Python method"},filenames:["api/index","index","api/slit_length_calculator","api/sld_calculator"]})

calculator/sld_calculator.py

@@ -36 +36 @@
         #Inputs
         self.wavelength  = 6.0
-        self.sld_formula = None
+        self.sld_formula = ""
         self.density = None
         #Outputs
@@ -46 +46 @@
         self.length = 0.0
         
-    def set_value(self, formula, density, wavelength=6.0):
+    def set_value(self, user_formula, density, wavelength=6.0):
         """
         Store values into the sld calculator and compute the corresponding
@@ -53 +53 @@
         self.wavelength = wavelength
         self.density    = float(density)
-        self.sld_formula = formula(str(formula), density=self.density)
+        self.sld_formula = formula(str(user_formula), density=self.density)
        
         if self.density == 0:

calculatorview/perspectives/calculator/sld_panel.py

@@ -146 +146 @@
         self.neutron_inc_ctl.SetToolTipString("Neutron Inc. Xs")
         neutron_inc_units_txt = wx.StaticText(self, -1,  unit_cm1)
-       
+        neutron_inc_txt.Hide()
+        self.neutron_inc_ctl.Hide()
+        neutron_inc_units_txt.Hide()
         neutron_abs_txt = wx.StaticText(self, -1, 'Neutron Abs. Xs')     
         self.neutron_abs_ctl = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,-1))
@@ -152 +154 @@
         self.neutron_abs_ctl.SetToolTipString("Neutron Abs. Xs")
         neutron_abs_units_txt = wx.StaticText(self, -1,  unit_cm1)
-        
+        neutron_abs_txt.Hide()
+        self.neutron_abs_ctl.Hide()
+        neutron_abs_units_txt.Hide()
         neutron_length_txt = wx.StaticText(self, -1, 'Neutron 1/e length')
         self.neutron_length_ctl = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,-1))
@@ -158 +162 @@
         self.neutron_length_ctl.SetToolTipString("Neutron 1/e length")
         neutron_length_units_txt = wx.StaticText(self, -1,  unit_cm)
-      
+        neutron_length_txt.Hide()
+        self.neutron_length_ctl.Hide()
+        neutron_length_units_txt.Hide()
         iy = 0
         ix = 0