/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/UI/renderer.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/Thuban/UI/renderer.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2537 by jonathan, Fri Jan 21 14:01:25 2005 UTC revision 2551 by jonathan, Thu Jan 27 14:19:41 2005 UTC
# Line 23  from wxPython.wx import wxPoint, wxRect, Line 23  from wxPython.wx import wxPoint, wxRect,
23      wxBLACK_PEN, wxBLACK, wxSOLID, wxCROSS_HATCH, wxSWISS, wxNORMAL, \      wxBLACK_PEN, wxBLACK, wxSOLID, wxCROSS_HATCH, wxSWISS, wxNORMAL, \
24      wxBitmapFromImage, wxImageFromStream, wxBITMAP_TYPE_BMP, \      wxBitmapFromImage, wxImageFromStream, wxBITMAP_TYPE_BMP, \
25      wxBITMAP_TYPE_JPEG, wxBITMAP_TYPE_PNG, wxBITMAP_TYPE_TIF, \      wxBITMAP_TYPE_JPEG, wxBITMAP_TYPE_PNG, wxBITMAP_TYPE_TIF, \
26      wxBITMAP_TYPE_GIF, wxEmptyImage      wxBITMAP_TYPE_GIF, wxEmptyImage, wxMask
27    
28  from wxproj import draw_polygon_shape, draw_polygon_init  from wxproj import draw_polygon_shape, draw_polygon_init
29    
# Line 104  class MapRenderer(BaseRenderer): Line 104  class MapRenderer(BaseRenderer):
104          return wxFont(int(round(self.resolution * 10)), wxSWISS, wxNORMAL,          return wxFont(int(round(self.resolution * 10)), wxSWISS, wxNORMAL,
105                        wxNORMAL)                        wxNORMAL)
106    
107      def draw_raster_data(self, x,y, data, format = 'BMP', mask = None):      def draw_raster_data(self, x,y, data, format = 'BMP'):
108    
109            mask = None
110          if format == 'RAW':          if format == 'RAW':
111              image = wxEmptyImage(data[0], data[1])              image = wxEmptyImage(data[0], data[1])
112              image.SetData(data[2])              image.SetData(data[2][0])
113                if data[2][1] is not None:
114                    mask = wxEmptyImage(data[0], data[1])
115                    mask.SetData(data[2][1])
116          else:          else:
117              stream = cStringIO.StringIO(data[2])              stream = cStringIO.StringIO(data[2][0])
118              image = wxImageFromStream(stream, raster_format_map[format])              image = wxImageFromStream(stream, raster_format_map[format])
119                if data[2][1] is not None:
120                    stream = cStringIO.StringIO(data[2][1])
121                    mask = wxImageFromStream(stream, raster_format_map[format])
122    
123          bitmap = wxBitmapFromImage(image)          bitmap = wxBitmapFromImage(image)
124    
# Line 120  class MapRenderer(BaseRenderer): Line 128  class MapRenderer(BaseRenderer):
128              # if we are given a mask object, try to pass it to SetMaskColour,              # if we are given a mask object, try to pass it to SetMaskColour,
129              # otherwise assume it's a mask image              # otherwise assume it's a mask image
130              try:              try:
131                  bitmap.SetMaskColour(mask);                  bitmap.SetMask(wxMask(wxBitmapFromImage(mask, 1)))
132                  self.dc.DrawBitmap(bitmap, int(round(x)), int(round(y)), True)                  self.dc.DrawBitmap(bitmap, int(round(x)), int(round(y)), True)
133              except (TypeError):              except (TypeError):
134                  # implement using a mask image                  # implement using a mask image

Legend:
Removed from v.2537  
changed lines
  Added in v.2551

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26