/[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 678 by jonathan,
Tue Apr 15 19:21:26 2003 UTC
+revision 681 by jonathan,
Tue Apr 15 21:54:32 2003 UTC
 Line 511 
 class ClassGroupProperties:
      def __deepcopy__(self):
          return ClassGroupProperties(self)
+     def __repr__(self):
+         return repr((self.__stroke, self.__strokeWidth, self.__fill))
  class ClassGroup:
      """A base class for all Groups within a Classification"""
-Line 539 
 class ClassGroup:
+Line 542 
 class ClassGroup:
          label -- a string representing the Group's label. This must
                   not be None.
          """
-         assert isinstance(label, StringType)
+         assert isinstance(label, StringTypes)
          self.label = label
      def GetDisplayText(self):
-Line 578 
 class ClassGroup:
+Line 581 
 class ClassGroup:
      def __eq__(self, other):
          return isinstance(other, ClassGroup) \
+             and self.label == other.label \
              and self.GetProperties() == other.GetProperties()
      def __ne__(self, other):
          return not self.__eq__(other)
+     def __repr__(self):
+         return "'" + self.label + "', " + repr(self.GetProperties())
  class ClassGroupSingleton(ClassGroup):
      """A Group that is associated with a single value."""
-Line 636 
 class ClassGroupSingleton(ClassGroup):
+Line 642 
 class ClassGroupSingleton(ClassGroup):
              and isinstance(other, ClassGroupSingleton) \
              and self.__value == other.__value
+     def __repr__(self):
+         return "(" + self.__value + ", " + ClassGroup.__repr__(self) + ")"
  class ClassGroupDefault(ClassGroup):
      """The default Group. When values do not match any other
         Group within a Classification, the properties from this
-Line 673 
 class ClassGroupDefault(ClassGroup):
+Line 682 
 class ClassGroupDefault(ClassGroup):
              and isinstance(other, ClassGroupDefault) \
              and self.GetProperties() == other.GetProperties()
+     def __repr__(self):
+         return "(" + ClassGroup.__repr__(self) + ")"
  class ClassGroupRange(ClassGroup):
      """A Group that represents a range of values that map to the same
         set of properties."""
-Line 724 
 class ClassGroupRange(ClassGroup):
+Line 736 
 class ClassGroupRange(ClassGroup):
      def GetMax(self):
          """Return the range's maximum value."""
-         return self.max
+         return self.__max
      def SetMax(self, max):
          """Set the range's maximum value.
-Line 774 
 class ClassGroupRange(ClassGroup):
+Line 786 
 class ClassGroupRange(ClassGroup):
              and self.__min == other.__min \
              and self.__max == other.__max
+     def __repr__(self):
+         return "(" + str(self.__min) + ", " + str(self.__max) + ", " + \
+                ClassGroup.__repr__(self) + ")"
  class ClassGroupMap(ClassGroup):
      """Currently, this class is not used."""

 Legend:



Removed from v.678
 


changed lines


 
Added in v.681
 Legend:



Removed from v.678
 


changed lines


 
Added in v.681
-Removed from v.678
+Added in v.681

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26