Changeset ad6f597 in sasview for calculatorview/perspectives/calculator/aperture_editor.py

Timestamp:

May 4, 2010 12:51:49 PM (14 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:

85e665e

Parents:

90b23e1

Message:

working on data editor

File:

• calculatorview/perspectives/calculator/aperture_editor.py (modified) (3 diffs)

calculatorview/perspectives/calculator/aperture_editor.py

@@ -20 +20 @@
 class ApertureDialog(wx.Dialog):
     def __init__(self, parent=None, manager=None,aperture=None, *args, **kwds):
-        try:
-            kwds['size'] =(PANEL_WIDTH, PANEL_HEIGHT)
-            kwds['title'] = "Aperture Editor"
-            wx.Dialog.__init__(self, parent=parent, *args, **kwds)
-            self.parent = parent
-            self.manager = manager
-            self._aperture = aperture
-            self._reset_aperture = deepcopy(aperture)
-            self._notes = ""
-            self_description = "Edit aperture"
-            self._do_layout()
-            self.set_values()
-        except:
-            print "error", sys.exc_value
-        
+        """
+            Dialog allows to enter values for aperture
+        """
+        kwds['size'] =(PANEL_WIDTH, PANEL_HEIGHT)
+        kwds['title'] = "Aperture Editor"
+        wx.Dialog.__init__(self, parent=parent, *args, **kwds)
+        self.parent = parent
+        self.manager = manager
+        self._aperture = aperture
+        self._reset_aperture = deepcopy(aperture)
+        self._notes = ""
+        self_description = "Edit aperture"
+        self._do_layout()
+        self.set_values()
+      
     def _define_structure(self):
         """
@@ -316 +316 @@
                     self._notes += "%s to %s \n"%(self._aperture.size.z,
                                                    z_aperture_size)
-                    self._aperture.aperture_size.z  = float(z_aperture_size)
+                    self._aperture.size.z  = float(z_aperture_size)
             else:
                 self._notes += "Error: Expected a float for the offset 's x "
@@ -356 +356 @@
     loader = Loader()
     # Load data 
-    data = loader.load("MAR07232_rest.ASC")
-   
-    if len(data.collimation) == 0:
-        from DataLoader.data_info import Collimation
-        collimation = Collimation()
-        from DataLoader.data_info import Aperture
-        aperture = Aperture()
-        dlg = ApertureDialog(aperture=aperture)
-        dlg.ShowModal()
-    else:
-        for collimation in data.collimation:
-            for aperture in collimation:
-                dlg = ApertureDialog(aperture=aperture)
-                dlg.ShowModal()
-                break
+    from DataLoader.data_info import Aperture
+    aperture = Aperture()
+    dlg = ApertureDialog(aperture=aperture)
+    dlg.ShowModal()
     app.MainLoop()