Changeset ac9c465 in sasview

Timestamp:

Jun 12, 2008 9:47:15 AM (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:

96f13a9

Parents:

4101eea

Message:

plotpanel clean up

File:

• guitools/PlotPanel.py (modified) (4 diffs)

guitools/PlotPanel.py

@@ -92 +92 @@
                 lo=loprev
                 hi=hiprev
-                print "Not possible to scale"
+                #print "Not possible to scale"
            
             else:
                 lo,hi = math.pow(10.,lo),math.pow(10.,hi)
                 #assert lo >0,"lo = %g"%lo
-                print "possible to scale"
+                #print "possible to scale"
            
-            print "these are low and high",lo,hi
+            #print "these are low and high",lo,hi
 
         return (lo,hi)
@@ -184 +184 @@
         """ left button down and ready to drag"""
         self.leftdown=True
-        #self.mousemotion=False
         ax = event.inaxes
         if ax !=None:
+            self.xInit,self.yInit=event.xdata,event.ydata
             
-            #print "these are x %f and y %f"%(x,y)
-            self.xInit,self.yInit=event.xdata,event.ydata
-            print "this is xInit %f this is yInit %f"%(self.xInit, self.yInit)
+            
     def onLeftUp(self,event): 
         """ Dragging is done """
@@ -196 +194 @@
         self.mousemotion=False 
         self.leftup=True
-        """
-        if self.mousemotion==True:
+      
+    def onMouseMotion(self,event): 
+        """
+            check if the left button is press and the mouse in moving.
+            computer delta for x and y coordinates and then calls draghelper 
+            to perform the drag
+        """
+        self.mousemotion=True 
+        if self.leftdown==True and self.mousemotion==True:
+            
             ax = event.inaxes
-            if ax !=None:
-                x,y = event.x,event.y
-                self.xFinal,self.yFinal=ax.transAxes.inverse_xy_tup((x,y))
+            if ax !=None:#the dragging is perform inside the figure
+                self.xFinal,self.yFinal=event.xdata,event.ydata
                 
                 xdelta = self.xFinal -self.xInit
@@ -211 +216 @@
                     ydelta = math.log10(self.yFinal) -math.log10(self.yInit)
                 self.dragHelper(xdelta,ydelta)
-                print "this is xInit %f this is xFinal %f \n"%(self.xInit, self.xFinal)
-                print "this is yInit %f this is yFinal %f \n"%(self.yInit, self.yFinal)
-                print "this is xdelta %f and ydelta %f \n"%(xdelta,ydelta)
-            else:
+              
+            else:# no dragging is perform elsewhere
                 self.dragHelper(0,0)
                 
-               """
-    def onMouseMotion(self,event): 
-        self.mousemotion=True 
-        if self.leftdown==True and self.mousemotion==True:
-            
-            ax = event.inaxes
-            if ax !=None:
-                self.xFinal,self.yFinal=event.xdata,event.ydata
-                
-                xdelta = self.xFinal -self.xInit
-                ydelta = self.yFinal -self.yInit
-                
-                if self.xscale=='log':
-                    xdelta = math.log10(self.xFinal) -math.log10(self.xInit)
-                if self.yscale=='log':
-                    ydelta = math.log10(self.yFinal) -math.log10(self.yInit)
-                self.dragHelper(xdelta,ydelta)
-                print "this is xInit %f this is xFinal %f \n"%(self.xInit, self.xFinal)
-                print "this is yInit %f this is yFinal %f \n"%(self.yInit, self.yFinal)
-                print "this is xdelta %f and ydelta %f \n"%(xdelta,ydelta)
-            else:
-                self.dragHelper(0,0)
     def dragHelper(self,xdelta,ydelta):
         """ dragging occurs here"""