diff -r df197df887d3 -r 569925b65604 src/FingersDance.ViewModel/AnnotationViewModel.cs --- a/src/FingersDance.ViewModel/AnnotationViewModel.cs Wed Oct 14 14:06:04 2009 +0200 +++ b/src/FingersDance.ViewModel/AnnotationViewModel.cs Wed Oct 14 17:08:43 2009 +0200 @@ -12,20 +12,24 @@ private float _tcBegin; private float _dur; private String _gestureType; + private UInt32 _color; private float _marginLeft; - public AnnotationViewModel(Annotation a, float marginLeft) { + public AnnotationViewModel(Annotation a, float marginLeft) + { this._tcBegin = a.TcBegin; this._dur = a.Dur; this._gestureType = a.GestureType; + this._color = a.Color; this._marginLeft = marginLeft; } public float TcBegin { get { return _tcBegin; } - set { + set + { if (value == _tcBegin || float.IsNaN(value)) return; _tcBegin = value; @@ -54,6 +58,16 @@ base.OnPropertyChanged("GestureType"); } } + public UInt32 Color + { + get { return _color; } + set + { + if (value == _color) + return; + _color = value; + } + } public float MarginLeft { get { return _marginLeft; }