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

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

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

revision 637 by jonathan, Thu Apr 10 14:35:03 2003 UTC revision 689 by jonathan, Wed Apr 16 13:47:07 2003 UTC
# Line 449  class ClassGroupProperties: Line 449  class ClassGroupProperties:
449                    
450      def GetLineColor(self):      def GetLineColor(self):
451          """Return the line color as a Color object."""          """Return the line color as a Color object."""
452          return self.stroke          return self.__stroke
453    
454      def SetLineColor(self, color):      def SetLineColor(self, color):
455          """Set the line color.          """Set the line color.
# Line 458  class ClassGroupProperties: Line 458  class ClassGroupProperties:
458          """          """
459    
460          assert isinstance(color, Color)          assert isinstance(color, Color)
461          self.stroke = color          self.__stroke = color
462    
463      def GetLineWidth(self):      def GetLineWidth(self):
464          """Return the line width."""          """Return the line width."""
465          return self.strokeWidth          return self.__strokeWidth
466    
467      def SetLineWidth(self, lineWidth):      def SetLineWidth(self, lineWidth):
468          """Set the line width.          """Set the line width.
# Line 473  class ClassGroupProperties: Line 473  class ClassGroupProperties:
473          if (lineWidth < 1):          if (lineWidth < 1):
474              raise ValueError(_("lineWidth < 1"))              raise ValueError(_("lineWidth < 1"))
475    
476          self.strokeWidth = lineWidth          self.__strokeWidth = lineWidth
477    
478      def GetFill(self):      def GetFill(self):
479          """Return the fill color as a Color object."""          """Return the fill color as a Color object."""
480          return self.fill          return self.__fill
481    
482      def SetFill(self, fill):      def SetFill(self, fill):
483          """Set the fill color.          """Set the fill color.
# Line 486  class ClassGroupProperties: Line 486  class ClassGroupProperties:
486          """          """
487    
488          assert isinstance(fill, Color)          assert isinstance(fill, Color)
489          self.fill = fill          self.__fill = fill
490    
491      def __eq__(self, other):      def __eq__(self, other):
492          """Return true if 'props' has the same attributes as this class"""          """Return true if 'props' has the same attributes as this class"""
493    
494            #
495            # using 'is' over '==' results in a huge performance gain
496            # in the renderer
497            #
498          return isinstance(other, ClassGroupProperties)   \          return isinstance(other, ClassGroupProperties)   \
499              and self.stroke      == other.GetLineColor() \              and (self.__stroke is other.__stroke or      \
500              and self.strokeWidth == other.GetLineWidth() \                   self.__stroke == other.__stroke)        \
501              and self.fill        == other.GetFill()              and (self.__fill is other.__fill or          \
502                     self.__fill == other.__fill)            \
503                and self.__strokeWidth == other.__strokeWidth
504    
505      def __ne__(self, other):      def __ne__(self, other):
506          return not self.__eq__(other)          return not self.__eq__(other)
# Line 505  class ClassGroupProperties: Line 511  class ClassGroupProperties:
511      def __deepcopy__(self):      def __deepcopy__(self):
512          return ClassGroupProperties(self)          return ClassGroupProperties(self)
513    
514        def __repr__(self):
515            return repr((self.__stroke, self.__strokeWidth, self.__fill))
516    
517  class ClassGroup:  class ClassGroup:
518      """A base class for all Groups within a Classification"""      """A base class for all Groups within a Classification"""
519    
# Line 533  class ClassGroup: Line 542  class ClassGroup:
542          label -- a string representing the Group's label. This must          label -- a string representing the Group's label. This must
543                   not be None.                   not be None.
544          """          """
545          assert isinstance(label, StringType)          assert isinstance(label, StringTypes)
546          self.label = label          self.label = label
547    
548      def GetDisplayText(self):      def GetDisplayText(self):
# Line 572  class ClassGroup: Line 581  class ClassGroup:
581    
582      def __eq__(self, other):      def __eq__(self, other):
583          return isinstance(other, ClassGroup) \          return isinstance(other, ClassGroup) \
584                and self.label == other.label \
585              and self.GetProperties() == other.GetProperties()              and self.GetProperties() == other.GetProperties()
586    
587      def __ne__(self, other):      def __ne__(self, other):
588          return not self.__eq__(other)          return not self.__eq__(other)
589    
590        def __repr__(self):
591            return repr(self.label) + ", " + repr(self.GetProperties())
592            
593  class ClassGroupSingleton(ClassGroup):  class ClassGroupSingleton(ClassGroup):
594      """A Group that is associated with a single value."""      """A Group that is associated with a single value."""
# Line 605  class ClassGroupSingleton(ClassGroup): Line 617  class ClassGroupSingleton(ClassGroup):
617    
618      def GetValue(self):      def GetValue(self):
619          """Return the associated value."""          """Return the associated value."""
620          return self.value          return self.__value
621    
622      def SetValue(self, value):      def SetValue(self, value):
623          """Associate this Group with the given value."""          """Associate this Group with the given value."""
624          self.value = value          self.__value = value
625    
626      def Matches(self, value):      def Matches(self, value):
627          """Determine if the given value matches the associated Group value."""          """Determine if the given value matches the associated Group value."""
628    
629          """Returns True if the value matches, False otherwise."""          """Returns True if the value matches, False otherwise."""
630    
631          return self.value == value          return self.__value == value
632    
633      def GetDisplayText(self):      def GetDisplayText(self):
634          label = self.GetLabel()          label = self.GetLabel()
# Line 628  class ClassGroupSingleton(ClassGroup): Line 640  class ClassGroupSingleton(ClassGroup):
640      def __eq__(self, other):      def __eq__(self, other):
641          return ClassGroup.__eq__(self, other) \          return ClassGroup.__eq__(self, other) \
642              and isinstance(other, ClassGroupSingleton) \              and isinstance(other, ClassGroupSingleton) \
643              and self.GetValue() == other.GetValue()              and self.__value == other.__value
644    
645        def __repr__(self):
646            return "(" + repr(self.__value) + ", " + ClassGroup.__repr__(self) + ")"
647    
648  class ClassGroupDefault(ClassGroup):  class ClassGroupDefault(ClassGroup):
649      """The default Group. When values do not match any other      """The default Group. When values do not match any other
# Line 667  class ClassGroupDefault(ClassGroup): Line 682  class ClassGroupDefault(ClassGroup):
682              and isinstance(other, ClassGroupDefault) \              and isinstance(other, ClassGroupDefault) \
683              and self.GetProperties() == other.GetProperties()              and self.GetProperties() == other.GetProperties()
684    
685        def __repr__(self):
686            return "(" + ClassGroup.__repr__(self) + ")"
687    
688  class ClassGroupRange(ClassGroup):  class ClassGroupRange(ClassGroup):
689      """A Group that represents a range of values that map to the same      """A Group that represents a range of values that map to the same
690         set of properties."""         set of properties."""
# Line 686  class ClassGroupRange(ClassGroup): Line 704  class ClassGroupRange(ClassGroup):
704          label -- a label for this group.          label -- a label for this group.
705          """          """
706    
707          ClassGroup.__init__(self, label, props, None)          ClassGroup.__init__(self, label, props, group)
708    
709          self.min = self.max = 0          self.__min = self.__max = 0
710    
711          self.SetRange(min, max)          self.SetRange(min, max)
712    
# Line 705  class ClassGroupRange(ClassGroup): Line 723  class ClassGroupRange(ClassGroup):
723    
724      def GetMin(self):      def GetMin(self):
725          """Return the range's minimum value."""          """Return the range's minimum value."""
726          return self.min          return self.__min
727    
728      def SetMin(self, min):      def SetMin(self, min):
729          """Set the range's minimum value.          """Set the range's minimum value.
# Line 714  class ClassGroupRange(ClassGroup): Line 732  class ClassGroupRange(ClassGroup):
732                 maximum value. Use SetRange() to change both min and max values.                 maximum value. Use SetRange() to change both min and max values.
733          """          """
734            
735          self.SetRange(min, self.max)          self.SetRange(min, self.__max)
736    
737      def GetMax(self):      def GetMax(self):
738          """Return the range's maximum value."""          """Return the range's maximum value."""
739          return self.max          return self.__max
740    
741      def SetMax(self, max):      def SetMax(self, max):
742          """Set the range's maximum value.          """Set the range's maximum value.
# Line 726  class ClassGroupRange(ClassGroup): Line 744  class ClassGroupRange(ClassGroup):
744          max -- the new maximum. Note that this must be greater than the current          max -- the new maximum. Note that this must be greater than the current
745                 minimum value. Use SetRange() to change both min and max values.                 minimum value. Use SetRange() to change both min and max values.
746          """          """
747          self.SetRange(self.min, max)          self.SetRange(self.__min, max)
748    
749      def SetRange(self, min, max):      def SetRange(self, min, max):
750          """Set a new range.          """Set a new range.
# Line 740  class ClassGroupRange(ClassGroup): Line 758  class ClassGroupRange(ClassGroup):
758          if min >= max:          if min >= max:
759              raise ValueError(_("ClassGroupRange: %i(min) >= %i(max)!") %              raise ValueError(_("ClassGroupRange: %i(min) >= %i(max)!") %
760                               (min, max))                               (min, max))
761          self.min = min          self.__min = min
762          self.max = max          self.__max = max
763    
764      def GetRange(self):      def GetRange(self):
765          """Return the range as a tuple (min, max)"""          """Return the range as a tuple (min, max)"""
766          return (self.min, self.max)          return (self.__min, self.__max)
767    
768      def Matches(self, value):      def Matches(self, value):
769          """Determine if the given value lies with the current range.          """Determine if the given value lies with the current range.
# Line 753  class ClassGroupRange(ClassGroup): Line 771  class ClassGroupRange(ClassGroup):
771          The following check is used: min <= value < max.          The following check is used: min <= value < max.
772          """          """
773    
774          return self.min <= value < self.max          return self.__min <= value < self.__max
775    
776      def GetDisplayText(self):      def GetDisplayText(self):
777          label = self.GetLabel()          label = self.GetLabel()
# Line 765  class ClassGroupRange(ClassGroup): Line 783  class ClassGroupRange(ClassGroup):
783      def __eq__(self, other):      def __eq__(self, other):
784          return ClassGroup.__eq__(self, other) \          return ClassGroup.__eq__(self, other) \
785              and isinstance(other, ClassGroupRange) \              and isinstance(other, ClassGroupRange) \
786              and self.GetRange() == other.GetRange()              and self.__min == other.__min \
787                and self.__max == other.__max
788    
789        def __repr__(self):
790            return "(" + repr(self.__min) + ", " + repr(self.__max) + ", " + \
791                   ClassGroup.__repr__(self) + ")"
792    
793  class ClassGroupMap(ClassGroup):  class ClassGroupMap(ClassGroup):
794      """Currently, this class is not used."""      """Currently, this class is not used."""
Legend:
Removed from v.637  
changed lines
  Added in v.689
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26