fingersdance: comparison src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs

equal deleted inserted replaced

-:0fd2b41ab402
+:e940ca798fe3
 public event EventHandler DragStarted;
 public event EventHandler DragCompleted;
 public event EventHandler TimerTick;
 private double totalmilliseconds;
 private List<Annotation> AnnotList = new List<Annotation>();
 private float AnnotWidth = 300 + 15; // The surfaceListBox adds 15 pixels between each item
 private CuttingViewModel CuttingVM;
 private Boolean AnnotWaiting = false;
 private float AnnotTcBegin;
-private UInt32 IntColor;
+private Color CurrentColor;
 private AnnotationViewModel canceledAnnotationVM;
 #region Properties
 totalmilliseconds = totalmillisecondsPar;
 slider.Maximum = totalmilliseconds;
 // When the timeline is resized, we catch the resize event to define TimelineView's good scale
 this.SizeChanged += new SizeChangedEventHandler(UserControlTimeLine_SizeChanged);
-// TEMP FOR DATA BINDING
+tv.listview.PreviewContactDown += listview_PreviewContactDown;
+SurfaceDragDrop.AddDragCanceledHandler(tv.listview, onDragCanceled);
+UserControlTimeLine_SizeChanged(null, null);
+slider_ContactTapGesture(this, null);
+}
+void UserControlTimeLine_SizeChanged(object sender, SizeChangedEventArgs e)
+{
+// When scaleX = 1, 1 second = 1 pixel. To calculate the new scale, we take the real width in account.
+Double futurScale = (this.ActualWidth-30) / (totalmilliseconds / 1000);
+//Double futurScale = this.ActualWidth / ((totalmilliseconds<30000) ? (totalmilliseconds/10) : (totalmilliseconds / 1000)); // TEMP FOR SHORT CONTENTS
+tv.RenderTransform = new ScaleTransform(futurScale,1);
+//tv.Width = this.ActualWidth - 30;
+}
+#region Timer
+public void initTimer(Color col, Cutting cutPar)
+{
+timer = new DispatcherTimer();
+timer.Interval = new TimeSpan(0, 0, 0, 0, 100);
+timer.Tick += new EventHandler(timer_Tick);
+CurrentColor = col;
+// DATA BINDING from the cutting sent in parameter (initialised before by the userPanel with the global project)
 AnnotList = new List<Annotation>();
-AnnotList.Add(new Annotation(0, 10, "Axe Cam 1", IntColor));
+AnnotList.Add(new Annotation(0, 10, "Axe Cam 1", CurrentColor));
 //AnnotList.Add(new Annotation(100 - (1 * AnnotWidth), 70, "Mvt Cam 2"));
 //AnnotList.Add(new Annotation(200 - (2 * AnnotWidth), 50, "Saut 3"));
 //AnnotList.Add(new Annotation(100 - (3 * AnnotWidth), 20, "Saut 4"));
 //AnnotList.Add(new Annotation(120 - (4 * AnnotWidth), 50, "Saut 5"));
-Cutting cut = new Cutting("titre de cutting", AnnotList);
+cutPar = new Cutting("titre de cutting", AnnotList);
-CuttingVM = new CuttingViewModel(cut, AnnotWidth);
+CuttingVM = new CuttingViewModel(cutPar, AnnotWidth);
 tv.DataContext = CuttingVM;
-tv.listview.PreviewContactDown += listview_PreviewContactDown;
-SurfaceDragDrop.AddDragCanceledHandler(tv.listview, onDragCanceled);
-UserControlTimeLine_SizeChanged(null, null);
-slider_ContactTapGesture(this, null);
-}
-void UserControlTimeLine_SizeChanged(object sender, SizeChangedEventArgs e)
-{
-// When scaleX = 1, 1 second = 1 pixel. To calculate the new scale, we take the real width in account.
-Double futurScale = (this.ActualWidth-30) / (totalmilliseconds / 1000);
-//Double futurScale = this.ActualWidth / ((totalmilliseconds<30000) ? (totalmilliseconds/10) : (totalmilliseconds / 1000)); // TEMP FOR SHORT CONTENTS
-tv.RenderTransform = new ScaleTransform(futurScale,1);
-//Console.WriteLine("futurScale = " + futurScale);
-}
-#region Timer
-public void initTimer(UInt32 intColorPar)
-{
-timer = new DispatcherTimer();
-timer.Interval = new TimeSpan(0, 0, 0, 0, 100);
-timer.Tick += new EventHandler(timer_Tick);
-IntColor = intColorPar;
 }
 public void timerStart()
 {
 if (timer != null)
 TimerTick(this, new EventArgs());
 }
 #endregion
+#region SliderDrag
 private void sliderPosition_DragStarted(object sender, DragStartedEventArgs e)
 {
 isDragging = true;
 OnDragStarted();
 // media.Pause();
 private void slider_ContactTapGesture(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
 {
 //startOrEndAnnotation();
 }
+#endregion
 public Boolean isAnnotationAccepted(AnnotationViewModel avm)
 {
 Boolean annotOk = true;
 // We check if the annotation's begin and end timecodes allow a new annotation creation
 }
 }
 // if not, we mark the beginning
 if (annotOk == true)
 {
-AnnotList.Add(new Annotation(AnnotTcBegin, 0, AnnotList.Count.ToString(), IntColor));
+AnnotList.Add(new Annotation(AnnotTcBegin, 0, AnnotList.Count.ToString(), CurrentColor));
 CuttingVM.setListFromAnnotations(AnnotList, AnnotWidth);
-//Console.WriteLine("BEGIN currentTimecode = " + AnnotTcBegin + ", nb = " + AnnotList.Count + ", res = " + (AnnotTcBegin - (AnnotList.Count * AnnotWidth)));
 tv.DataContext = null;
 tv.DataContext = CuttingVM;
 AnnotWaiting = true;
 }
 }
 }
 if (annotOk == true)
 {
 AnnotList.RemoveAt(AnnotList.Count - 1);
-AnnotList.Add(new Annotation(AnnotTcBegin, currentDuration, AnnotList.Count.ToString(), IntColor));
+AnnotList.Add(new Annotation(AnnotTcBegin, currentDuration, AnnotList.Count.ToString(), CurrentColor));
 CuttingVM.setListFromAnnotations(AnnotList, AnnotWidth);
 //Console.WriteLine("currentTimecode = " + AnnotTcBegin + ", curDur = " + currentDuration + ", nb = " + AnnotList.Count + ", res = " + (AnnotTcBegin - (AnnotList.Count * AnnotWidth)));
 tv.DataContext = null;
 tv.DataContext = CuttingVM;
 AnnotWaiting = false;
 }
 }
 }
 private void listview_PreviewContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
 {
 FrameworkElement findSource = e.OriginalSource as FrameworkElement;
 SurfaceListBoxItem draggedElement = null;
 e.Handled = startDragOkay;
 }
 private void onDragCanceled(Object sender, SurfaceDragDropEventArgs e)
 {
-Console.WriteLine("onDragCanceled = " + sender + ", ((ContentControl)e.Cursor.Visual).Content = " + ((ContentControl)e.Cursor.Visual).Content);
 // We check if the annotation is well one of the current annotations
 if (CuttingVM != null)
 {
 // e.Cursor.Visual is the ContentControl, so its Content is the dragged TimelineAnnotationView
 canceledAnnotationVM = (AnnotationViewModel)((TimelineAnnotationView)((ContentControl)e.Cursor.Visual).Content).DataContext;
 }
 }
 private void confirmCancelPopup_ConfirmYesOrNo(object sender, ConfirmEventArgs e)
 {
-//Consolenfirm = " + e.Confirmed);
 // We check if the annotation is well one of the current annotations
 if (CuttingVM != null && canceledAnnotationVM != null && e.Confirmed == true)
 {
 foreach (Annotation a in AnnotList)
 {

changeset 160	e940ca798fe3
parent 150	569925b65604
child 162	0b9f989bcb37