Changeset 06290c8 in sasview

Timestamp:

Jun 10, 2008 7:27:23 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:

a55fac1

Parents:

df25521

Message:

more modification on the drag

File:

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

guitools/PlotPanel.py

@@ -205 +205 @@
                 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)
-            
+            else:
+                self.dragHelper(0,0)
     def onMouseMotion(self,event): 
         if self.leftdown==True:
@@ -221 +226 @@
             newlo,newhi= lo- xdelta, hi- xdelta
             if self.xscale=='log':
-                if newlo > 0:
-                    newlo= math.log10(newlo)
-                if newhi > 0:
-                    newhi= math.log10(newhi)
+                if lo > 0:
+                    newlo= math.log10(lo)-xdelta
+                if hi > 0:
+                    newhi= math.log10(hi)-xdelta
             if self.xscale=='log':
                 ax.set_xlim(math.pow(10,newlo),math.pow(10,newhi))
@@ -235 +240 @@
             newlo,newhi= lo- ydelta, hi- ydelta
             if self.yscale=='log':
-                if newlo > 0:
-                    newlo= math.log10(newlo)
-                if newhi > 0:
-                    newhi= math.log10(newhi)
+                if lo > 0:
+                    newlo= math.log10(lo)-ydelta
+                if hi > 0:
+                    newhi= math.log10(hi)-ydelta
+                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))