Changeset 9520702 in sasview

Timestamp:

Jan 11, 2012 12:19:54 PM (12 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:

cda697a

Parents:

5c3aafa

Message:

molar mass/ mass density calculator added

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• calculator.py (modified) (3 diffs)
• density_panel.py (added)

calculatorview/src/sans/perspectives/calculator/calculator.py

@@ -57 +57 @@
         resolution_help += "resolution of Q in 2D based on the SANS "
         resolution_help += "instrumental parameter values."
+        mass_volume_help = "Based on the chemical formular, "
+        mass_volume_help += "compute the mass density or the molar volume."
         pyconsole_help = "Python Console."
         #data_editor_help = "Meta Data Editor"
         return [("SLD Calculator", sld_help, self.on_calculate_sld),
+                ("Density/Volume Calculator", mass_volume_help, 
+                                            self.on_calculate_dv),
                 ("Slit Size Calculator", slit_length_help,
                         self.on_calculate_slit_size),
@@ -77 +81 @@
         self.put_icon(frame)
         frame.Show(True)
-        event.Skip()
 
     def on_calculate_kiessig(self, event):
@@ -96 +99 @@
         self.put_icon(frame)
         frame.Show(True) 
-       
+    
+    def on_calculate_dv(self, event):
+        """
+        Compute the mass density or molar voulme
+        """
+        from density_panel import DensityWindow
+        frame = DensityWindow(base=self.parent)
+        self.put_icon(frame)
+        frame.Show(True) 
+              
     def on_calculate_slit_size(self, event):
         """