debug visual bug for "too far" annotation and simplify gesture handler in player.
authorcavaliet
Tue, 24 Nov 2009 12:57:18 +0100
changeset 226 c0661ecf943e
parent 225 b60e13ed75c8
child 227 89f9e7e3ff54
child 229 05aba5def1fc
debug visual bug for "too far" annotation and simplify gesture handler in player.
src/FingersDance.Control.Player/UserControlPlayer.xaml.cs
src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs
src/FingersDance.Views/TimelineAnnotationView.xaml
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs	Tue Nov 24 11:35:07 2009 +0100
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs	Tue Nov 24 12:57:18 2009 +0100
@@ -142,68 +142,11 @@
                  *  e.Gesture.End = Valeur de la timeline à la fin de l'annotation
                  * 
                  */
-                switch (e.Gesture.Name)
-                {
-                    case "TRIGGER":
-
-                        usercontrolInfoUser.LabelSession.Content = "TRIGGER!";
-                        break;
-                    case "CONTRE POINTS":
-
-                        usercontrolInfoUser.LabelSession.Content = "CONTRE POINTS!";
-                        break;
-                    case "CONTRE PESANTEUR":
-
-                        usercontrolInfoUser.LabelSession.Content = "CONTRE PESANTEUR!";
-                        break;
-                    case "AVEC PESANTEUR":
-
-                        usercontrolInfoUser.LabelSession.Content = "AVEC PESANTEUR!";
-                        break;
-                    case "ALIGNEMENT":
-
-                        usercontrolInfoUser.LabelSession.Content = "ALIGNEMENT!";
-                        break;
-                    case "CONTACT VISUEL":
-
-                        usercontrolInfoUser.LabelSession.Content = "CONTACT VISUEL!";
-                        break;
-                    case "MOUVEMENT CONTRAINTE":
-
-                        usercontrolInfoUser.LabelSession.Content = "MOUVEMENT CONTRAINTE!";
-                        break;
-                    case "UN DANSEUR":
-
-                        usercontrolInfoUser.LabelSession.Content = "UN DANSEUR!";
-                        break;
-                    case "DEUX DANSEURS":
-
-                        usercontrolInfoUser.LabelSession.Content = "DEUX DANSEURS!";
-                        break;
-                    case "TROIS DANSEURS":
-
-                        usercontrolInfoUser.LabelSession.Content = "TROIS DANSEURS!";
-                        break;
-                    case "QUATRE DANSEURS":
-
-                        usercontrolInfoUser.LabelSession.Content = "QUATRE DANSEURS!";
-                        break;
-                    case "TOUS LES DANSEURS":
-
-                        usercontrolInfoUser.LabelSession.Content = "TOUS LES DANSEURS!";
-                        break;
-                    case "CONTACT TABLE/DANSEUR":
-
-                        usercontrolInfoUser.LabelSession.Content = "CONTACT TABLE/DANSEUR!";
-                        break;
-                    case "PLAY-PAUSE":
-                        usercontrolInfoUser.LabelSession.Content = "PLAY-PAUSE!";
-                        ButtonPlayPause_ContactDown(null, null);
-                        break;
-                    default:
-                        return;
+                usercontrolInfoUser.LabelSession.Content = e.Gesture.Name + " !";
+                if(e.Gesture.Name.Equals("PLAY-PAUSE")){
+                    ButtonPlayPause_ContactDown(null, null);
                 }
-                if (!e.Gesture.Name.Equals("PLAY-PAUSE"))
+                else
                     _Gestures.Add(e.Gesture);
             }
             catch { }
--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs	Tue Nov 24 11:35:07 2009 +0100
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs	Tue Nov 24 12:57:18 2009 +0100
@@ -43,7 +43,7 @@
 
         private double totalmilliseconds;
         
-        private float AnnotWidth = 850 + 15; // The surfaceListBox adds 15 pixels between each item
+        private float AnnotWidth = 1600 + 15; // The surfaceListBox adds 15 pixels between each item
         private Cutting cut;
         private Boolean AnnotWaiting = false;
         private float AnnotTcBegin;
--- a/src/FingersDance.Views/TimelineAnnotationView.xaml	Tue Nov 24 11:35:07 2009 +0100
+++ b/src/FingersDance.Views/TimelineAnnotationView.xaml	Tue Nov 24 12:57:18 2009 +0100
@@ -8,7 +8,7 @@
 	x:Class="FingersDance.Views.TimelineAnnotationView"
     xmlns:vw="clr-namespace:FingersDance.Views"
 	x:Name="myTAV"
-	d:DesignWidth="640" d:DesignHeight="480" Width="850" Height="40">
+	d:DesignWidth="640" d:DesignHeight="480" Width="1600" Height="40">
     <UserControl.Resources>
         <vw:ThicknessSingleValueConverter x:Name="myThicknessSingleValueConverter" x:Key="myThicknessSingleValueConverter"/>
         <vw:VisibilityConverter x:Name="myVisibilityConverter" x:Key="myVisibilityConverter"/>