Changeset eddb6ec in sasview for src/sans/plottools

Timestamp:

Apr 2, 2014 7:25:09 AM (11 years ago)

Author:

Tobias Richter <tobias.richter@…>

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:

6771d94

Parents:

8817d07

Message:

refs #57 Clean up warnings in Python code

File:

• src/sans/plottools/PlotPanel.py (modified) (5 diffs)

src/sans/plottools/PlotPanel.py

@@ -3 +3 @@
 import logging
 import wx
+import os
 # Try a normal import first
 # If it fails, try specifying a version
@@ -11 +12 @@
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg
 from matplotlib.figure import Figure
-import os
-import transform
-from plottables import Data1D
-#TODO: make the plottables interactive
-from binder import BindArtist
+from sans.plottools import transform
+from sans.plottools.plottables import Data1D
+from sans.plottools.binder import BindArtist
 from matplotlib.font_manager import FontProperties
 DEBUG = False
 
-from plottables import Graph
-from plottables import Text
-from TextDialog import TextDialog
-from LabelDialog import LabelDialog
+from sans.plottools.plottables import Graph
+from sans.plottools.TextDialog import TextDialog
+from sans.plottools.LabelDialog import LabelDialog
 import operator
 
@@ -38 +36 @@
         for a in obj.get_children(): show_tree(a, d+1)
      
-from unitConverter import UnitConvertion as convertUnit
+from sans.plottools.unitConverter import UnitConvertion as convertUnit
 
 
 def _rescale(lo, hi, step, pt=None, bal=None, scale='linear'):
-        """
-        Rescale (lo,hi) by step, returning the new (lo,hi)
-        The scaling is centered on pt, with positive values of step
-        driving lo/hi away from pt and negative values pulling them in.
-        If bal is given instead of point, it is already in [0,1] coordinates.
+    """
+    Rescale (lo,hi) by step, returning the new (lo,hi)
+    The scaling is centered on pt, with positive values of step
+    driving lo/hi away from pt and negative values pulling them in.
+    If bal is given instead of point, it is already in [0,1] coordinates.
     
-        This is a helper function for step-based zooming.
-        
-        """
-        # Convert values into the correct scale for a linear transformation
-        # TODO: use proper scale transformers
-        loprev = lo
-        hiprev = hi
-        if scale == 'log':
-            assert lo > 0
-            if lo > 0:
-                lo = math.log10(lo)
-            if hi > 0:
-                hi = math.log10(hi)
-            if pt is not None:
-                pt = math.log10(pt)
-        
-        # Compute delta from axis range * %, or 1-% if persent is negative
-        if step > 0:
-            delta = float(hi - lo) * step / 100
+    This is a helper function for step-based zooming.
+    """
+    # Convert values into the correct scale for a linear transformation
+    # TODO: use proper scale transformers
+    loprev = lo
+    hiprev = hi
+    if scale == 'log':
+        assert lo > 0
+        if lo > 0:
+            lo = math.log10(lo)
+        if hi > 0:
+            hi = math.log10(hi)
+        if pt is not None:
+            pt = math.log10(pt)
+    
+    # Compute delta from axis range * %, or 1-% if present is negative
+    if step > 0:
+        delta = float(hi - lo) * step / 100
+    else:
+        delta = float(hi - lo) * step / (100 - step)
+
+    # Add scale factor proportionally to the lo and hi values,
+    # preserving the
+    # point under the mouse
+    if bal is None:
+        bal = float(pt - lo) / (hi - lo)
+    lo = lo - (bal * delta)
+    hi = hi + (1 - bal) * delta
+
+    # Convert transformed values back to the original scale
+    if scale == 'log':
+        if (lo <= -250) or (hi >= 250):
+            lo = loprev
+            hi = hiprev
         else:
-            delta = float(hi - lo) * step / (100 - step)
-    
-        # Add scale factor proportionally to the lo and hi values,
-        # preserving the
-        # point under the mouse
-        if bal is None:
-            bal = float(pt - lo) / (hi - lo)
-        lo = lo - (bal * delta)
-        hi = hi + (1 - bal) * delta
-    
-        # Convert transformed values back to the original scale
-        if scale == 'log':
-            if (lo <= -250) or (hi >= 250):
-                lo = loprev
-                hi = hiprev
-            else:
-                lo, hi = math.pow(10., lo), math.pow(10., hi)
-        return (lo, hi)
+            lo, hi = math.pow(10., lo), math.pow(10., hi)
+    return (lo, hi)
 
 
@@ -125 +122 @@
         self.figure = Figure(None, dpi, linewidth=2.0)
         self.color = '#b3b3b3'
-        from canvas import FigureCanvas
+        from sans.plottools.canvas import FigureCanvas
         self.canvas = FigureCanvas(self, -1, self.figure)
         self.SetColor(color)
@@ -158 +155 @@
         
         # Define some constants
-        self.colorlist = ['b','g','r','c','m','y','k']
-        self.symbollist = ['o','x','^','v','<','>','+',
-                           's','d','D','h','H','p', '-']
+        self.colorlist = ['b', 'g', 'r', 'c', 'm', 'y', 'k']
+        self.symbollist = ['o', 'x', '^', 'v', '<', '>', '+',
+                           's', 'd', 'D', 'h', 'H', 'p', '-']
         
         #List of texts currently on the plot