Changeset 1ce365f8 in sasview

Timestamp:

Feb 18, 2009 3:13:06 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:

b5c537f

Parents:

d466625

Message:

print preview added back

Location:

guiframe/local_perspectives/plotting

Files:

• AnnulusSlicer.py (modified) (2 diffs)
• Plotter2D.py (modified) (2 diffs)
• SectorSlicer.py (modified) (2 diffs)
• boxSum.py (modified) (2 diffs)

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -52 +52 @@
         
         # Bind to slice parameter events
-        self.base.parent.Bind(EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
+        self.base.Bind(EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
         
         
 
     def _onEVT_SLICER_PARS(self, event):
-        wx.PostEvent(self.base.parent, StatusEvent(status="AnnulusSlicer._onEVT_SLICER_PARS"))
+        wx.PostEvent(self.base, StatusEvent(status="AnnulusSlicer._onEVT_SLICER_PARS"))
         event.Skip()
         if event.type == self.__class__.__name__:
@@ -123 +123 @@
                    math.fabs(self.outer_circle.get_radius()))
         print "rmin, rmax", rmin, rmax
-       
-        sect = SectorPhi(r_min=rmin , r_max= rmax, phi_min=0, phi_max=2*math.pi)
-        if nbins!=None:
-            sect.nbins = nbins
+        if nbins==None:
+            nbins = 20
+        sect = SectorPhi(r_min=rmin , r_max= rmax,
+                          phi_min=0, phi_max=2*math.pi , nbins=nbins)
+        
         
         sector = sect(self.base.data2D)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -190 +190 @@
         wx.EVT_MENU(self, id, self.onPrint)
         
+        id = wx.NewId()
+        slicerpop.Append(id,'&Image Preview', 'image preview for print')
+        wx.EVT_MENU(self, id, self.onPrinterPreview)
+        
         slicerpop.AppendSeparator()
         item_list = self.parent.get_context_menu(self.graph)
@@ -248 +252 @@
         wx.EVT_MENU(self, id, self.onPrinterSetup)
         
-        id = wx.NewId()
-        slicerpop.Append(id,'&Printer Preview', 'Set image size')
-        wx.EVT_MENU(self, id, self.onPrinterPreview)
+       
         """
         id = wx.NewId()

guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -63 +63 @@
         
         # Bind to slice parameter events
-        self.base.parent.Bind(EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
-
+        #self.base.parent.Bind(EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
+        self.base.Bind(EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
 
     def _onEVT_SLICER_PARS(self, event):
-        wx.PostEvent(self.base.parent, StatusEvent(status="SectorSlicer._onEVT_SLICER_PARS"))
+        #wx.PostEvent(self.base.parent, StatusEvent(status="SectorSlicer._onEVT_SLICER_PARS"))
+        wx.PostEvent(self.base, StatusEvent(status="SectorSlicer._onEVT_SLICER_PARS"))
         event.Skip()
         if event.type == self.__class__.__name__:
@@ -162 +163 @@
         #print "sector Q angles=",phimin*180/math.pi,phimax*180/math.pi,self.main_line.theta*180/math.pi
         #phi must be 0 to 2pi with cut-off line sts on the left.
-        sect = SectorQ(r_min=0.0, r_max= radius , phi_min=phimin+math.pi, phi_max=phimax+math.pi)
+        if nbins==None:
+            nbins = 20
+        sect = SectorQ(r_min=0.0, r_max= radius , phi_min=phimin+math.pi, phi_max=phimax+math.pi, nbins=nbins)
         #sect = SectorQ(r_min=-1*radius , r_max= radius , phi_min=phimin, phi_max=phimax)
-        if nbins!=None:
-            sect.nbins = nbins
+        
         
         sector = sect(self.base.data2D)

guiframe/local_perspectives/plotting/boxSum.py

@@ -77 +77 @@
         self.panel_name= name
     def _onEVT_SLICER_PARS(self, event):
-        #printEVT("AnnulusSlicer._onEVT_SLICER_PARS")
+        wx.PostEvent(self.base, StatusEvent(status="Boxsum._onEVT_SLICER_PARS"))
         event.Skip()
         if event.type == self.__class__.__name__:
@@ -108 +108 @@
         
         #self.base.connect.disconnect()
-        self.base.parent.Unbind(SlicerParameters.EVT_SLICER_PARS)
+        #self.base.parent.Unbind(SlicerParameters.EVT_SLICER_PARS)
         
     def update(self):