equal
deleted
inserted
replaced
137 //tv.Width = this.ActualWidth - 30; |
137 //tv.Width = this.ActualWidth - 30; |
138 |
138 |
139 } |
139 } |
140 |
140 |
141 #region Timer |
141 #region Timer |
142 public void initTimer(Color col, Cutting cutPar) |
142 public void initTimer(Cutting cutPar) |
143 { |
143 { |
144 timer = new DispatcherTimer(); |
144 timer = new DispatcherTimer(); |
145 timer.Interval = new TimeSpan(0, 0, 0, 0, 100); |
145 timer.Interval = new TimeSpan(0, 0, 0, 0, 100); |
146 timer.Tick += new EventHandler(timer_Tick); |
146 timer.Tick += new EventHandler(timer_Tick); |
147 |
147 |
148 CurrentColor = col; |
148 if(cutPar!=null) |
|
149 CurrentColor = cutPar.Color; |
149 |
150 |
150 // DATA BINDING from the cutting sent in parameter (initialised before by the userPanel with the global project) |
151 // DATA BINDING from the cutting sent in parameter (initialised before by the userPanel with the global project) |
151 cut = cutPar; |
152 cut = cutPar; |
152 //cut.AnnotList = new List<Annotation>(); |
153 //cut.AnnotList = new List<Annotation>(); |
153 //cut.AnnotList.Add(new Annotation("s_" + System.Guid.NewGuid(), 0, 10, "Axe Cam 1", CurrentColor)); |
154 //cut.AnnotList.Add(new Annotation("s_" + System.Guid.NewGuid(), 0, 10, "Axe Cam 1", CurrentColor)); |