Changeset 7ab9241 in sasview for guiframe/local_perspectives
- Timestamp:
- Jan 6, 2009 12:22:33 PM (16 years ago)
- 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:
- 78ed1ad
- Parents:
- cd68f8c
- Location:
- guiframe/local_perspectives/plotting
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
guiframe/local_perspectives/plotting/AnnulusSlicer.py
r5554566 r7ab9241 41 41 42 42 self.update() 43 #self._post_data()43 self._post_data() 44 44 45 45 # Bind to slice parameter events -
guiframe/local_perspectives/plotting/Plotter2D.py
r3426077 r7ab9241 202 202 slicerpop.Append(id, '&Annulus [Phi view ]') 203 203 wx.EVT_MENU(self, id, self.onSectorPhi) 204 204 205 id = wx.NewId() 206 slicerpop.Append(id, '&Box Sum') 207 wx.EVT_MENU(self, id, self.onBoxSum) 208 205 209 id = wx.NewId() 206 210 slicerpop.Append(id, '&Box averaging') … … 370 374 wx.PostEvent(self.parent, InternalEvent(slicer= AnnulusInteractor)) 371 375 372 def onBox avg(self,event):373 from boxS licer import BoxInteractor374 self.onClearSlicer(event) 375 wx.PostEvent(self.parent, InternalEvent(slicer= Box Interactor))376 def onBoxSum(self,event): 377 from boxSum import BoxSum 378 self.onClearSlicer(event) 379 wx.PostEvent(self.parent, InternalEvent(slicer= BoxSum)) 376 380 """ 377 381 self.onClearSlicer(event) … … 386 390 wx.PostEvent(self.parent, InternalEvent(slicer= BoxInteractor)) 387 391 print "onboxavg",self.slicer 392 """ 393 def onBoxavg(self,event): 394 from boxSlicer import BoxInteractor 395 self.onClearSlicer(event) 396 wx.PostEvent(self.parent, InternalEvent(slicer= BoxInteractor)) 397 """ 398 self.onClearSlicer(event) 399 self.slicer=BoxInteractor 400 from SlicerParameters import SlicerParameterPanel 401 402 dialog = SlicerParameterPanel(self.parent, -1, "Slicer Parameters") 403 dialog.set_slicer(self.slicer.__name__, 404 self.slicer.get_params()) 405 if dialog.ShowModal() == wx.ID_OK: 406 dialog.Destroy() 407 wx.PostEvent(self.parent, InternalEvent(slicer= BoxInteractor)) 408 print "onboxavg",self.slicer 388 409 """ 389 410 -
guiframe/local_perspectives/plotting/boxSlicer.py
rcd68f8c r7ab9241 264 264 self.axes = axes 265 265 266 self.y =y267 self.save_y =y268 269 self.xmin =xmin270 self.save_xmin =xmin271 self.xmax =xmax272 self.save_xmax =xmax273 self.theta2 = theta2274 self.radius1 = math.sqrt(math.pow(self.xmin, 2)+ math.pow(self.y, 2))275 self.radius2 = math.sqrt(math.pow(self.xmax, 2)+ math.pow(self.y, 2))266 self.y = y 267 self.save_y = y 268 269 self.xmin = xmin 270 self.save_xmin = xmin 271 self.xmax = xmax 272 self.save_xmax = xmax 273 self.theta2 = theta2 274 self.radius1 = math.sqrt(math.pow(self.xmin, 2)+ math.pow(self.y, 2)) 275 self.radius2 = math.sqrt(math.pow(self.xmax, 2)+ math.pow(self.y, 2)) 276 276 277 277 … … 373 373 """ 374 374 self.y=y 375 self.radius1= math.sqrt(math.pow(self.xmin, 2)+ math.pow(self.y, 2))376 self.radius2= math.sqrt(math.pow(self.xmax, 2)+ math.pow(self.y, 2))377 378 self.theta_right= math.atan2(self.y,self.xmin)379 self.theta_left= math.atan2(self.y,self.xmax)380 381 self.phi_left= self.theta_left - self.theta2382 self.phi_right= self.theta_right - self.theta2375 #self.radius1= math.sqrt(math.pow(self.xmin, 2)+ math.pow(self.y, 2)) 376 #self.radius2= math.sqrt(math.pow(self.xmax, 2)+ math.pow(self.y, 2)) 377 378 #self.theta_right= math.atan2(self.y,self.xmin) 379 #self.theta_left= math.atan2(self.y,self.xmax) 380 381 #self.phi_left= self.theta_left - self.theta2 382 #self.phi_right= self.theta_right - self.theta2 383 383 384 384 self.has_move=True
Note: See TracChangeset
for help on using the changeset viewer.