/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/Model/classification.py

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

Parent Directory | Revision Log | View Patch Patch

-revision 1912 by bh,
Mon Nov  3 13:55:41 2003 UTC
+revision 2657 by jan,
Wed Jul 27 21:49:25 2005 UTC
 Line 1
- # Copyright (c) 2001, 2003 by Intevation GmbH
+ # Copyright (c) 2001, 2003, 2005 by Intevation GmbH
  # Authors:
  # Jonathan Coles <[email protected]>
+ # Jan-Oliver Wagner <[email protected]> (2005)
  #
  # This program is free software under the GPL (>=v2)
  # Read the file COPYING coming with Thuban for details.
-Line 307 
 class Classification(Publisher):
+Line 308 
 class Classification(Publisher):
              i.append(build_color_item(_("Line Color"), v))
              v = props.GetLineWidth()
              i.append(_("Line Width: %s") % v)
+             # Note: Size is owned by all properties, so
+             # a size will also appear where it does not
+             # make sense like for lines and polygons.
+             v = props.GetSize()
+             i.append(_("Size: %s") % v)
              v = props.GetFill()
              i.append(build_color_item(_("Fill"), v))
              return (label, i)
-Line 315 
 class Classification(Publisher):
+Line 323 
 class Classification(Publisher):
              items.append(build_item(p, p.GetDisplayText()))
          return (_("Classification"), items)
  class ClassIterator:
      """Allows the Groups in a Classifcation to be interated over.
-Line 327 
 class ClassIterator:
+Line 335 
 class ClassIterator:
          """Constructor.
          default -- the default group
          points -- a list of singleton groups
          ranges -- a list of range groups
          maps -- a list of map groups
          """
-Line 350 
 class ClassIterator:
+Line 358 
 class ClassIterator:
              d = self.data[self.data_index]
              self.data_index += 1
              return d
  class ClassGroupProperties:
      """Represents the properties of a single Classification Group.
      These are used when rendering a layer."""
+     # TODO: Actually, size is only relevant for point objects.
+     # Eventually it should be spearated, e.g. when introducing symbols.
      def __init__(self, props = None):
          """Constructor.
          props -- a ClassGroupProperties object. The class is copied if
                   prop is not None. Otherwise, a default set of properties
                   is created such that: line color = Black, line width = 1,
-                  and fill color = Transparent
+                  size = 5 and fill color = Transparent
          """
          if props is not None:
-Line 370 
 class ClassGroupProperties:
+Line 381 
 class ClassGroupProperties:
          else:
              self.SetLineColor(Black)
              self.SetLineWidth(1)
+             self.SetSize(5)
              self.SetFill(Transparent)
      def SetProperties(self, props):
-Line 378 
 class ClassGroupProperties:
+Line 390 
 class ClassGroupProperties:
          assert isinstance(props, ClassGroupProperties)
          self.SetLineColor(props.GetLineColor())
          self.SetLineWidth(props.GetLineWidth())
+         self.SetSize(props.GetSize())
          self.SetFill(props.GetFill())
      def GetLineColor(self):
          """Return the line color as a Color object."""
          return self.__stroke
-Line 407 
 class ClassGroupProperties:
+Line 420 
 class ClassGroupProperties:
          self.__strokeWidth = lineWidth
+     def GetSize(self):
+         """Return the size."""
+         return self.__size
+     def SetSize(self, size):
+         """Set the size.
+         size -- the new size. This must be > 0.
+         """
+         assert isinstance(size, types.IntType)
+         if (size < 1):
+             raise ValueError(_("size < 1"))
+         self.__size = size
      def GetFill(self):
          """Return the fill color as a Color object."""
          return self.__fill
      def SetFill(self, fill):
          """Set the fill color.
-Line 431 
 class ClassGroupProperties:
+Line 459 
 class ClassGroupProperties:
                   self.__stroke == other.__stroke)        \
              and (self.__fill is other.__fill or          \
                   self.__fill == other.__fill)            \
-             and self.__strokeWidth == other.__strokeWidth
+             and self.__strokeWidth == other.__strokeWidth\
+             and self.__size == other.__size
      def __ne__(self, other):
          return not self.__eq__(other)
-Line 443 
 class ClassGroupProperties:
+Line 472 
 class ClassGroupProperties:
          return ClassGroupProperties(self)
      def __repr__(self):
-         return repr((self.__stroke, self.__strokeWidth, self.__fill))
+         return repr((self.__stroke, self.__strokeWidth, self.__size,
+                     self.__fill))
  class ClassGroup:
      """A base class for all Groups within a Classification"""
-Line 466 
 class ClassGroup:
+Line 496 
 class ClassGroup:
      def GetLabel(self):
          """Return the Group's label."""
          return self.label
      def SetLabel(self, label):
          """Set the Group's label.

 Legend:



Removed from v.1912
 


changed lines


 
Added in v.2657
 Legend:



Removed from v.1912
 


changed lines


 
Added in v.2657
-Removed from v.1912
+Added in v.2657

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26