/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/Model/layer.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/Thuban/Model/layer.py

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

revision 2552 by jonathan, Fri Jan 28 15:54:00 2005 UTC revision 2644 by bh, Tue Jul 5 16:30:51 2005 UTC
# Line 1  Line 1 
1  # Copyright (c) 2001, 2002, 2003, 2004 by Intevation GmbH  # Copyright (c) 2001, 2002, 2003, 2004, 2005 by Intevation GmbH
2  # Authors:  # Authors:
3  # Bernhard Herzog <[email protected]>  # Bernhard Herzog <[email protected]>
4  # Jonathan Coles <[email protected]>  # Jonathan Coles <[email protected]>
# Line 237  class Layer(BaseLayer): Line 237  class Layer(BaseLayer):
237              # Ensure that region lies within the layer's bounding box              # Ensure that region lies within the layer's bounding box
238              # Otherwise projection of the region would lead to incorrect              # Otherwise projection of the region would lead to incorrect
239              # values.              # values.
240              clipbbox = self.ClipBoundingBox(bbox)              clipbbox = self.__mangle_bounding_box(bbox)
241              bbox = self.projection.ForwardBBox(clipbbox)              bbox = self.projection.ForwardBBox(clipbbox)
242          return self.store.ShapesInRegion(bbox)          return self.store.ShapesInRegion(bbox)
243    
# Line 314  class Layer(BaseLayer): Line 314  class Layer(BaseLayer):
314    
315          return (_("Layer '%s'") % self.Title(), items)          return (_("Layer '%s'") % self.Title(), items)
316    
317      def ClipBoundingBox(self, bbox):      def __mangle_bounding_box(self, bbox):
318          """ Clip bbox to layer's bounding box.          # FIXME: This method doesn't make much sense.
319            # See RT #2845 which effectively says:
320          Returns that part of bbox that lies within the layers bounding box.          #
321          If bbox is completely outside of the layers bounding box, bbox is          # If this method, which was originally called ClipBoundingBox,
322          returned.  It is assumed that bbox has sensible values, i.e. bminx          # is supposed to do clipping it shouldn't return the parameter
323          < bmaxx and bminy < bmaxy.          # unchanged when it lies completely outside of the bounding box.
324          """          # It would be better to return None and return an empty list in
325            # ShapesInRegion (the only caller) in that case.
326            #
327            # This method was introduced to fix a bug that IIRC had
328            # something todo with projections and bounding boxes containing
329            # NaN or INF when the parameter to ShapesInRegion covered the
330            # entire earth or something similarly large).
331          bminx, bminy, bmaxx, bmaxy = bbox          bminx, bminy, bmaxx, bmaxy = bbox
332          lminx, lminy, lmaxx, lmaxy = self.LatLongBoundingBox()          lminx, lminy, lmaxx, lmaxy = self.LatLongBoundingBox()
333          if bminx > lmaxx or bmaxx < lminx:          if bminx > lmaxx or bmaxx < lminx:
# Line 334  class Layer(BaseLayer): Line 340  class Layer(BaseLayer):
340          else:          else:
341              bottom = max(lminy, bminy)              bottom = max(lminy, bminy)
342              top = min(lmaxy, bmaxy)              top = min(lmaxy, bmaxy)
343            
344          return (left, bottom, right, top)          return (left, bottom, right, top)
345    
346    
# Line 344  if resource.has_gdal_support(): Line 350  if resource.has_gdal_support():
350    
351  class RasterLayer(BaseLayer):  class RasterLayer(BaseLayer):
352    
353      def __init__(self, title, filename, projection = None, visible = True):      MASK_NONE  = 0
354        MASK_BIT   = 1
355        MASK_ALPHA = 2
356    
357        def __init__(self, title, filename, projection = None,
358                     visible = True, opacity = 1, masktype = MASK_BIT):
359          """Initialize the Raster Layer.          """Initialize the Raster Layer.
360    
361          title -- title for the layer.          title -- title for the layer.
# Line 367  class RasterLayer(BaseLayer): Line 378  class RasterLayer(BaseLayer):
378    
379          self.bbox = -1          self.bbox = -1
380    
381          self.use_mask = True          self.mask_type = masktype
382            self.opacity = opacity
383    
384          self.image_info = None          self.image_info = None
385    
# Line 458  class RasterLayer(BaseLayer): Line 470  class RasterLayer(BaseLayer):
470      def GetImageFilename(self):      def GetImageFilename(self):
471          return self.filename          return self.filename
472    
473      def UseMask(self):      def MaskType(self):
474          """Return True if the mask should be used when rendering the layer."""          """Return True if the mask should be used when rendering the layer."""
475          return self.use_mask          return self.mask_type
476    
477      def SetUseMask(self, use):      def SetMaskType(self, type):
478          """Set whether to use a mask when render the image.          """Set the type of mask to use.
479    
480            type can be one of MASK_NONE, MASK_BIT, MASK_ALPHA
481    
482          If the state changes, a LAYER_CHANGED message is sent.          If the state changes, a LAYER_CHANGED message is sent.
483          """          """
484          if use != self.use_mask:          if type not in (self.MASK_NONE, self.MASK_BIT, self.MASK_ALPHA):
485              self.use_mask = use              raise ValueError("type is invalid")
486    
487            if type != self.mask_type:
488                self.mask_type = type
489                self.changed(LAYER_CHANGED, self)
490    
491        def Opacity(self):
492            """Return the level of opacity used in alpha blending.
493            """
494            return self.opacity
495    
496        def SetOpacity(self, op):
497            """Set the level of alpha opacity.
498    
499            0 <= op <= 1.
500    
501            The layer is fully opaque when op = 1.
502            """
503            if not (0 <= op <= 1):
504                raise ValueError("op out of range")
505    
506            if op != self.opacity:
507                self.opacity = op
508              self.changed(LAYER_CHANGED, self)              self.changed(LAYER_CHANGED, self)
509    
510      def ImageInfo(self):      def ImageInfo(self):
Legend:
Removed from v.2552  
changed lines
  Added in v.2644
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26