# HG changeset patch # User sarias # Date 1253462557 -7200 # Node ID e95e916eb018702de009955f3810a81a7965cda7 # Parent 5af0f0a8706d55fd239e7db227685e168e8315e4 Travail sur le Pivot et le control Session Input diff -r 5af0f0a8706d -r e95e916eb018 src/FingersDance.Control.ListVideo/UserControlListVideo.xaml --- a/src/FingersDance.Control.ListVideo/UserControlListVideo.xaml Thu Sep 17 18:44:33 2009 +0200 +++ b/src/FingersDance.Control.ListVideo/UserControlListVideo.xaml Sun Sep 20 18:02:37 2009 +0200 @@ -11,10 +11,10 @@ - + - + diff -r 5af0f0a8706d -r e95e916eb018 src/FingersDance.Control.ListVideo/UserControlListVideo.xaml.cs --- a/src/FingersDance.Control.ListVideo/UserControlListVideo.xaml.cs Thu Sep 17 18:44:33 2009 +0200 +++ b/src/FingersDance.Control.ListVideo/UserControlListVideo.xaml.cs Sun Sep 20 18:02:37 2009 +0200 @@ -12,7 +12,7 @@ { public partial class UserControlListVideo { - + //Creation d'un Event pour Chaque Item Video public event EventHandler EH_ItemVideo1_ContactDown; public event EventHandler EH_ItemVideo2_ContactDown; @@ -35,11 +35,7 @@ EH_ItemVideo2_ContactDown(this, new EventArgs()); } - private void ItemVideo1_Selected(object sender, RoutedEventArgs e) - { - - } - + //Event appelÃ© lors de la selection d'un Item dans la Video List private void ItemVideo1_ContactTapGesture(object sender, Microsoft.Surface.Presentation.ContactEventArgs e) { if (EH_ItemVideo1_ContactDown != null) diff -r 5af0f0a8706d -r e95e916eb018 src/FingersDance.Control.Pivot/UserControlPivot.xaml --- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml Thu Sep 17 18:44:33 2009 +0200 +++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml Sun Sep 20 18:02:37 2009 +0200 @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="FingersDance.Control.Pivot.UserControlPivot" - x:Name="UserControl" Width="70" Height="70" xmlns:Custom="http://schemas.microsoft.com/surface/2008"> + x:Name="UserControl" Width="90" Height="90" xmlns:Custom="http://schemas.microsoft.com/surface/2008"> @@ -22,24 +22,9 @@ - - - - - - - - - - - - - - - - - - + + + @@ -49,7 +34,7 @@ - + @@ -59,7 +44,7 @@ - + @@ -69,7 +54,13 @@ - + + + + + + + diff -r 5af0f0a8706d -r e95e916eb018 src/FingersDance.Control.Pivot/UserControlPivot.xaml.cs --- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml.cs Thu Sep 17 18:44:33 2009 +0200 +++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml.cs Sun Sep 20 18:02:37 2009 +0200 @@ -12,6 +12,7 @@ { public partial class UserControlPivot { + //Events pour chaque Boutton du Pivot public event EventHandler EH_SurfaceButtonPlayer1_ContactDown; public event EventHandler EH_SurfaceButtonPlayer2_ContactDown; public event EventHandler EH_SurfaceButtonPlayer3_ContactDown; diff -r 5af0f0a8706d -r e95e916eb018 src/FingersDance.Control.Player/UserControlPlayer.xaml.cs --- a/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs Thu Sep 17 18:44:33 2009 +0200 +++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs Sun Sep 20 18:02:37 2009 +0200 @@ -59,7 +59,7 @@ //DirectoryInfo info = Directory.GetParent(@"."); FileInfo assemblyPath = new FileInfo(Assembly.GetExecutingAssembly().Location); DirectoryInfo info = assemblyPath.Directory; - MediaElementVideo.Source = new Uri(@"" + info.FullName.ToString() + "\\Resources\\oneflat.wmv", UriKind.Relative); + MediaElementVideo.Source = new Uri(@"" + info.FullName.ToString() + "\\Resources\\Lake.wmv", UriKind.Relative); MediaElementVideo.LoadedBehavior = MediaState.Manual; MediaElementVideo.UnloadedBehavior = MediaState.Manual; MediaElementVideo.ScrubbingEnabled= true; diff -r 5af0f0a8706d -r e95e916eb018 src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml --- a/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml Thu Sep 17 18:44:33 2009 +0200 +++ b/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml Sun Sep 20 18:02:37 2009 +0200 @@ -10,11 +10,16 @@ - - - - - + + + + + + + + + + diff -r 5af0f0a8706d -r e95e916eb018 src/FingersDance/FingersDance.csproj --- a/src/FingersDance/FingersDance.csproj Thu Sep 17 18:44:33 2009 +0200 +++ b/src/FingersDance/FingersDance.csproj Sun Sep 20 18:02:37 2009 +0200 @@ -129,7 +129,6 @@ Always - Always diff -r 5af0f0a8706d -r e95e916eb018 src/FingersDance/MainSurfaceWindow.xaml --- a/src/FingersDance/MainSurfaceWindow.xaml Thu Sep 17 18:44:33 2009 +0200 +++ b/src/FingersDance/MainSurfaceWindow.xaml Sun Sep 20 18:02:37 2009 +0200 @@ -68,8 +68,8 @@ - - + + diff -r 5af0f0a8706d -r e95e916eb018 src/FingersDance/MainSurfaceWindow.xaml.cs --- a/src/FingersDance/MainSurfaceWindow.xaml.cs Thu Sep 17 18:44:33 2009 +0200 +++ b/src/FingersDance/MainSurfaceWindow.xaml.cs Sun Sep 20 18:02:37 2009 +0200 @@ -55,7 +55,7 @@ { try { - ScatterViewItem item = (ScatterViewItem)ScaterView.Items.GetItemAt(0); + ScatterViewItem item = (ScatterViewItem)scaterview.Items.GetItemAt(0); item.DecelerationRate = double.NaN; } catch (Exception ex) { } @@ -66,7 +66,7 @@ //Initialise les 4 Grids à la positions initiale du Pivot. try { - ScatterViewItem item = (ScatterViewItem)ScaterView.Items.GetItemAt(0); + ScatterViewItem item = (ScatterViewItem)scaterview.Items.GetItemAt(0); Grid1.Width =item.Center.X; Grid1.Height = item.Center.Y; @@ -149,7 +149,27 @@ //TODO: disable audio, animations here } - private void ScaterView_ContactChanged(object sender, ContactEventArgs e) + private void scaterview_ContactChanged(object sender, ContactEventArgs e) + { + //Permet la MAJ des 4 Grids à la position du pivot + /*try + { + Grid1.Width = e.GetPosition(mainSurfaceWindow).X; + Grid1.Height = e.GetPosition(mainSurfaceWindow).Y; + + Grid3.Width = e.GetPosition(mainSurfaceWindow).X; + Grid3.Height = 768 - e.GetPosition(mainSurfaceWindow).Y; + + Grid4.Width = 1024 - e.GetPosition(mainSurfaceWindow).X; + Grid4.Height = 768 - e.GetPosition(mainSurfaceWindow).Y; + + Grid2.Width = 1024 - e.GetPosition(mainSurfaceWindow).X; + Grid2.Height = e.GetPosition(mainSurfaceWindow).Y; + } + catch (Exception ex) { }*/ + } + + private void ScatterViewItemPivot_ContactChanged(object sender, ContactEventArgs e) { //Permet la MAJ des 4 Grids à la position du pivot try @@ -176,7 +196,10 @@ { UserControlListVideo ListVideo1 = new UserControlListVideo(); ListVideo1.Name = "ListVideo1"; + Grid1.Children.Add(ListVideo1); + + //Creation des Events pour chaque item de la video ListVideo1.EH_ItemVideo1_ContactDown += new System.EventHandler(this.ListVideo1_EH_ItemVideo1_ContactDown); ListVideo1.EH_ItemVideo2_ContactDown += new System.EventHandler(this.ListVideo1_EH_ItemVideo2_ContactDown); /* @@ -222,6 +245,12 @@ private void ListVideo1_EH_ItemVideo1_ContactDown(object sender, EventArgs e) { + + //Creation d'un ScatterView Item + //ScatterViewItem scatterViewItemSessionInput = new ScatterViewItem(); + //scatterViewItemSessionInput.Name = "ScatterViewItemSessionInput"; + + //Creation d'une nouvelle seance. UserControlSessionInput SessionInput = new UserControlSessionInput(); @@ -233,6 +262,14 @@ SessionInput.EH_SurfaceButtonSubmit_ContactDown += new System.EventHandler(this.SessionInput_EH_SurfaceButtonSubmit_ContactDown); actualGrid.Children.Remove((UserControlListVideo)sender); + + //Init Scatter View Properties and Add it to the scatter view. + /*scatterViewItemSessionInput.Content = SessionInput; + scatterViewItemSessionInput.CanMove = true; + scatterViewItemSessionInput.CanScale = false; + scatterViewItemSessionInput.CanRotate = true; + scatterViewItemSessionInput.Center = new Point((double)actualGrid.ActualWidth,(double)actualGrid.ActualHeight); + scaterview.Items.Add(scatterViewItemSessionInput);*/ } catch (Exception ex) { } isCreatedP1 = true; @@ -259,5 +296,7 @@ catch (Exception ex) { } } + + } } \ No newline at end of file