Changeset 38fc601 in sasview

Timestamp:

Jun 10, 2008 1:34:46 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:

660b1e6

Parents:

a55fac1

Message:

more changes on the dragging .the user can see the picture move more slowly

File:

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

guitools/PlotPanel.py

@@ -152 +152 @@
         self.canvas.mpl_connect('button_press_event',self.onLeftDown)
         self.canvas.mpl_connect('button_release_event',self.onLeftUp)
-        #self.canvas.mpl_connect('key_press_event',self.onKeyPress)
+        
        
         self.leftdown=False
@@ -180 +180 @@
         self.xFinal=None
         self.yFinal=None
-   
+  
     def onLeftDown(self,event): 
         """ left button down and ready to drag"""
         self.leftdown=True
+        #self.mousemotion=False
         ax = event.inaxes
         if ax !=None:
             x,y = event.x,event.y
+            #print "these are x %f and y %f"%(x,y)
             self.xInit,self.yInit=ax.transAxes.inverse_xy_tup((x,y))
-        
+            #print "this is xInit %f this is yInit %f"%(self.xInit, self.yInit)
     def onLeftUp(self,event): 
         """ Dragging is done """
-        
+        self.leftdown=False
+        self.mousemotion=False 
         self.leftup=True
-        
+        """
         if self.mousemotion==True:
             ax = event.inaxes
@@ -200 +203 @@
                 self.xFinal,self.yFinal=ax.transAxes.inverse_xy_tup((x,y))
                 
-                #print "this is xFinal %f this is yFinal %f"%(self.xFinal, self.yFinal)
-                #print "this is xInit %f this is yInit %f"%(self.xInit, self.yInit)
-                #print "this is xdelta %f and ydelta %f"%(xdelta,ydelta)
                 xdelta = self.xFinal -self.xInit
                 ydelta = self.yFinal -self.yInit
+                
                 if self.xscale=='log':
-                    #xdelta = math.log10(self.xFinal - self.xInit)
                     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 onMouseMotion(self,event): 
-        if self.leftdown==True:
-            self.mousemotion=True 
+        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))
+                
+                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"""
@@ -234 +257 @@
             else:
                 ax.set_xlim(newlo,newhi)
-            print "new lo %f and new hi %f"%(newlo,newhi)
+            #print "new lo %f and new hi %f"%(newlo,newhi)
             
             lo,hi= ax.get_ylim()
-            print "y lo %f and y hi %f"%(lo,hi)
+            #print "y lo %f and y hi %f"%(lo,hi)
             newlo,newhi= lo- ydelta, hi- ydelta
             if self.yscale=='log':
@@ -244 +267 @@
                 if hi > 0:
                     newhi= math.log10(hi)-ydelta
-                print "new lo %f and new hi %f"%(newlo,newhi)
+                #print "new lo %f and new hi %f"%(newlo,newhi)
             if  self.yscale=='log':
                 ax.set_ylim(math.pow(10,newlo),math.pow(10,newhi))