Changeset 5704 for qesdi


Ignore:
Timestamp:
09/09/09 15:15:32 (10 years ago)
Author:
pnorton
Message:

Added a module to fix the import Image / from PIL import Image problem.

Location:
qesdi/geoplot/trunk
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed
  • qesdi/geoplot/trunk

    • Property svn:ignore
      •  

        old new  
        11.project 
        22.pydevproject 
         3data 
         4.settings 
         5dist 
         6build 
  • qesdi/geoplot/trunk/lib/geoplot/layer_drawer.py

    r5699 r5704  
    66 
    77import logging 
    8 import Image 
    98import StringIO 
    109import thread 
     
    1312from matplotlib.figure import Figure 
    1413 
     14from geoplot.image_import import Image 
    1515from geoplot.grid_builder_lat_lon import GridBuilderLatLon 
    1616from geoplot.grid_builder_national import GridBuilderNational 
  • qesdi/geoplot/trunk/lib/geoplot/layer_drawer_coastline.py

    r5636 r5704  
    66 
    77import logging 
    8 import Image 
    98import StringIO 
    109import thread 
     
    1716from matplotlib.lines import Line2D 
    1817 
     18from geoplot.image_import import Image 
    1919from geoplot.grid_builder_lat_lon import GridBuilderLatLon 
    2020from geoplot.grid_builder_national import GridBuilderNational 
  • qesdi/geoplot/trunk/lib/geoplot/layer_drawer_contour.py

    r5699 r5704  
    66 
    77import logging 
    8 import Image 
    98import StringIO 
    109import thread 
    1110 
     11from geoplot.image_import import Image 
    1212from geoplot.contour_drawer import ContourDrawer 
    1313import geoplot.utils as geoplot_utils 
  • qesdi/geoplot/trunk/lib/geoplot/layer_drawer_grid.py

    r5699 r5704  
    66 
    77import logging 
    8 import Image 
    98import StringIO 
    109import thread 
     
    1615from matplotlib.backends.backend_agg import FigureCanvasAgg 
    1716from matplotlib.lines import Line2D 
     17 
     18from geoplot.image_import import Image 
    1819 
    1920from geoplot.grid_builder_lat_lon import GridBuilderLatLon 
  • qesdi/geoplot/trunk/lib/geoplot/plot_writer.py

    r5646 r5704  
    2424 
    2525#import resources 
    26 import Image 
     26from geoplot.image_import import Image 
    2727 
    2828import geoplot.config as geoplot_config 
  • qesdi/geoplot/trunk/lib/geoplot/plotarea.py

    r5605 r5704  
    1717from matplotlib import rcParams 
    1818import matplotlib.ticker 
    19 import Image 
     19from geoplot.image_import import Image 
    2020 
    2121from geoplot.plot_font import PlotFont 
  • qesdi/geoplot/trunk/lib/geoplot/tests/integration/test_output_layer_drawer_all.py

    r5412 r5704  
    11import logging 
    22import os 
    3 import Image 
    43 
    54from geoplot.layer_drawer_grid import LayerDrawerGrid 
     
    98from geoplot.tests import outputsDir 
    109 
     10from geoplot.image_import import Image 
    1111from geoplot.tests.make_ll_grid_data import makeLLVar 
    1212from geoplot.tests.make_rotated_grid_data import makeRotatedGridVar 
  • qesdi/geoplot/trunk/lib/geoplot/tests/integration/test_output_layer_drawer_coastlines.py

    r5412 r5704  
    11import logging 
    22import os 
    3 import Image 
    43 
     4from geoplot.image_import import Image 
    55from geoplot.layer_drawer_coastline import LayerDrawerCoastlines 
    66from geoplot.tests import outputsDir 
  • qesdi/geoplot/trunk/lib/geoplot/tests/unit/test_layer_drawer.py

    r5636 r5704  
    44import nose.tools as nt 
    55import logging 
    6 import Image 
    76import StringIO 
    87import time 
     
    1918from geoplot.layer_drawer import LayerDrawerBase 
    2019 
     20from geoplot.image_import import Image 
    2121import geoplot.layer_drawer as layer_drawer 
    2222import geoplot.layer_drawer_grid as layer_drawer_grid 
    2323import geoplot.utils as geoplot_utils 
    24  
    25  
    2624 
    2725log = logging.getLogger(__name__) 
  • qesdi/geoplot/trunk/lib/geoplot/utils.py

    r5699 r5704  
    77""" 
    88import time 
    9 import Image 
     9 
    1010import StringIO 
    1111import logging 
     
    1616import matplotlib.backends.backend_agg 
    1717 
    18  
    1918# was having problems with alpha belnding so swapped the backend 
    2019#from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas 
    2120from matplotlib.backends.backend_cairo import FigureCanvasCairo as FigureCanvas 
     21 
     22from geoplot.image_import import Image 
    2223 
    2324log = logging.getLogger(__name__)  
Note: See TracChangeset for help on using the changeset viewer.