Changeset a48842a2 in sasview for calculatorview/src/sans

Timestamp:

Jun 13, 2012 4:40:41 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:

1a98ded

Parents:

9a14138

Message:

added data operation tool

File:

• calculatorview/src/sans/perspectives/calculator/calculator.py (modified) (9 diffs)

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

@@ -14 +14 @@
 
 from sans.guiframe.plugin_base import PluginBase
+from sans.perspectives.calculator.data_operator import DataOperatorWindow
 import logging
 
@@ -26 +27 @@
         logging.info("Calculator plug-in started")   
         self.sub_menu = "Tool" 
-  
+        # data operator use one frame all the time
+        self.data_operator_frame = None
+        
     def help(self, evt):
         """
@@ -61 +64 @@
         pyconsole_help = "Python Console."
         #data_editor_help = "Meta Data Editor"
-        return [("SLD Calculator", sld_help, self.on_calculate_sld),
+        return [("Data Operation", 
+                        'Data operation', self.on_data_operation),
+                ("SLD Calculator", sld_help, self.on_calculate_sld),
                 ("Density/Volume Calculator", mass_volume_help, 
                                             self.on_calculate_dv),
@@ -76 +81 @@
         Edit meta data 
         """
-        from data_editor import DataEditorWindow
+        from sans.perspectives.calculator.data_editor import DataEditorWindow
         frame = DataEditorWindow(parent=self.parent, data=[],
                                   title="Data Editor")
         self.put_icon(frame)
         frame.Show(True)
-
+              
+    def on_data_operation(self, event):
+        """
+        Data operation
+        """
+        if self.data_operator_frame == None:
+            # Use one frame all the time
+            self.data_operator_frame = DataOperatorWindow(parent=self.parent, 
+                                                title="Data Operation")
+            self.put_icon(self.data_operator_frame)
+        self.data_operator_frame.Show(False)
+        self.data_operator_frame.Show(True)
+        
     def on_calculate_kiessig(self, event):
         """
         Compute the Kiessig thickness
         """
-        from kiessig_calculator_panel import KiessigWindow
+        from sans.perspectives.calculator.kiessig_calculator_panel \
+        import KiessigWindow
         frame = KiessigWindow()
         self.put_icon(frame)
@@ -95 +113 @@
         Compute the scattering length density of molecula
         """
-        from sld_panel import SldWindow
+        from sans.perspectives.calculator.sld_panel import SldWindow
         frame = SldWindow(base=self.parent)
         self.put_icon(frame)
@@ -104 +122 @@
         Compute the mass density or molar voulme
         """
-        from density_panel import DensityWindow
+        from sans.perspectives.calculator.density_panel import DensityWindow
         frame = DensityWindow(base=self.parent)
         self.put_icon(frame)
@@ -113 +131 @@
         Compute the slit size a given data
         """
-        from slit_length_calculator_panel import SlitLengthCalculatorWindow
+        from sans.perspectives.calculator.slit_length_calculator_panel \
+        import SlitLengthCalculatorWindow
         frame = SlitLengthCalculatorWindow(parent=self.parent)  
         self.put_icon(frame)  
@@ -122 +141 @@
         Estimate the instrumental resolution
         """
-        from resolution_calculator_panel import ResolutionWindow
+        from sans.perspectives.calculator.resolution_calculator_panel \
+        import ResolutionWindow
         frame = ResolutionWindow(parent=self.parent)
         self.put_icon(frame)
@@ -153 +173 @@
         :param filename: file name to open in editor
         """
-        from pyconsole import PyConsole
+        from sans.perspectives.calculator.pyconsole import PyConsole
         frame = PyConsole(parent=self.parent, filename=filename)
         self.put_icon(frame)