Changeset ea290ee in sasview

Timestamp:

Feb 13, 2009 1:14:13 PM (16 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:

9a585d0

Parents:

14d3495

Message:

edit color for detector

Location:

guiframe/local_perspectives/plotting

Files:

• Plotter2D.py (modified) (4 diffs)
• boxSum.py (modified) (1 diff)
• detector_dialog.py (added)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -11 +11 @@
 
 import wx
-import sys
+import sys, math
 import pylab
 
@@ -195 +195 @@
         
         slicerpop.AppendSeparator()
+        id = wx.NewId()
+        slicerpop.Append(id, '&Edit Detector Parameters')
+        wx.EVT_MENU(self, id, self._onEditDetector) 
         
         id = wx.NewId()
@@ -255 +258 @@
         self.PopupMenu(slicerpop, pos)
         
-    
-        
+    def _onEditDetector(self, event):
+        print "edit detortor param",self.zmin_2D, self.zmax_2D
+        import detector_dialog
+        dialog = detector_dialog.DetectorDialog(None, -1, "")
+        xnpts = len(self.data2D.x_bins)
+        ynpts = len(self.data2D.y_bins)
+        xmax = max(self.data2D.xmin, self.data2D.xmax)
+        ymax = max(self.data2D.ymin, self.data2D.ymax)
+        qmax = math.sqrt(math.pow(xmax,2)+math.pow(ymax,2))
+        beam = self.data2D.xmin
+        zmin = self.zmin_2D
+        zmax = self.zmax_2D
+        dialog.setContent(xnpts=xnpts,ynpts=ynpts,qmax=qmax,
+                           beam=self.data2D.xmin,
+                           zmin = self.zmin_2D,
+                          zmax = self.zmax_2D)
+        if dialog.ShowModal() == wx.ID_OK:
+            evt = dialog.getContent()
+            self.zmin_2D = evt.zmin
+            self.zmax_2D = evt.zmax
+       
+        dialog.Destroy()
+        print "zmn ,zmax", self.zmin_2D, self.zmax_2D
+        self.image(data= self.data2D.data,
+                   xmin= self.data2D.xmin,
+                   xmax= self.data2D.xmax,
+                   ymin= self.data2D.ymin,
+                   ymax= self.data2D.ymax,
+                   zmin= self.zmin_2D,
+                   zmax= self.zmax_2D,
+                   color=0,symbol=0,label='data2D')
+        #self.graph.render(self)
+        self.subplot.figure.canvas.draw_idle()
         
     def get_corrected_data(self):
@@ -461 +495 @@
             wx.PostEvent(self, event)
           
-    def _onEditDetector(self, event):
-        print "on parameter"
-        
+  
         
     def _onToggleScale(self, event):

guiframe/local_perspectives/plotting/boxSum.py

@@ -73 +73 @@
         # Bind to slice parameter events
         #print "box sum  self.base.parent",self.base.parent
-        self.base.parent.Bind(SlicerParameters.EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
+        #self.base.parent.Bind(SlicerParameters.EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
     def set_panel_name(self, name):
         self.panel_name= name