# HG changeset patch # User ARIAS Santiago # Date 1258150920 -3600 # Node ID 70e93b0bd7787698e8060529bbf15d937951845f # Parent 37c16056c45b5b3cc3a6a8f902b1e7cadad9253b DEBUG Tag Visualisation Control diff -r 37c16056c45b -r 70e93b0bd778 src/FingersDance.Control.Player/UserControlPlayer.xaml.cs --- a/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs Fri Nov 13 22:11:50 2009 +0100 +++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs Fri Nov 13 23:22:00 2009 +0100 @@ -106,9 +106,9 @@ public void setSound(double val) { - if (((MediaElementVideo.Volume + val) < 1) && ((MediaElementVideo.Volume + val) > 0)) - MediaElementVideo.Volume += val; - else if ((MediaElementVideo.Volume + val) > 1) + if ((val < 1) && (val > 0)) + MediaElementVideo.Volume = val; + else if (val > 1) MediaElementVideo.Volume = 1; else MediaElementVideo.Volume = 0; diff -r 37c16056c45b -r 70e93b0bd778 src/FingersDance.Control.UserPanel/TagVisuSoundControl.xaml.cs --- a/src/FingersDance.Control.UserPanel/TagVisuSoundControl.xaml.cs Fri Nov 13 22:11:50 2009 +0100 +++ b/src/FingersDance.Control.UserPanel/TagVisuSoundControl.xaml.cs Fri Nov 13 23:22:00 2009 +0100 @@ -48,92 +48,104 @@ } //This Method Make the different elipses visible in accordance to the viriable "niveau" - public void TagVisuSoundLevelUpdate(int niveau) + public int TagVisuSoundLevelUpdate(int niveau) { + int nbelipsesvisible = -1; int tempsound = 0; //--DEBUG listniveau.Add(niveau); if (Math.Abs(lastlevel - niveau) == 1) { lastlevel = niveau; tempsound = sound + niveau; - if (tempsound < 0) - tempsound = 0; - if (tempsound > 10) - tempsound = 10; - //--DEBUG listsound.Add(tempsound); - for (int i = 1; i <= tempsound; i++) + if (tempsound > -1 && tempsound < 11) { - switch (i) + nbelipsesvisible = 0; + //--DEBUG listsound.Add(tempsound); + for (int i = 1; i <= tempsound; i++) { - case 1: - elipse01.Visibility = Visibility.Visible; - break; - case 2: - elipse02.Visibility = Visibility.Visible; - break; - case 3: - elipse03.Visibility = Visibility.Visible; - break; - case 4: - elipse04.Visibility = Visibility.Visible; - break; - case 5: - elipse05.Visibility = Visibility.Visible; - break; - case 6: - elipse06.Visibility = Visibility.Visible; - break; - case 7: - elipse07.Visibility = Visibility.Visible; - break; - case 8: - elipse08.Visibility = Visibility.Visible; - break; - case 9: - elipse09.Visibility = Visibility.Visible; - break; - case 10: - elipse10.Visibility = Visibility.Visible; - break; + switch (i) + { + case 1: + elipse01.Visibility = Visibility.Visible; + nbelipsesvisible++; + break; + case 2: + elipse02.Visibility = Visibility.Visible; + nbelipsesvisible++; + break; + case 3: + elipse03.Visibility = Visibility.Visible; + nbelipsesvisible++; + break; + case 4: + elipse04.Visibility = Visibility.Visible; + nbelipsesvisible++; + break; + case 5: + elipse05.Visibility = Visibility.Visible; + nbelipsesvisible++; + break; + case 6: + elipse06.Visibility = Visibility.Visible; + nbelipsesvisible++; + break; + case 7: + elipse07.Visibility = Visibility.Visible; + nbelipsesvisible++; + break; + case 8: + elipse08.Visibility = Visibility.Visible; + nbelipsesvisible++; + break; + case 9: + elipse09.Visibility = Visibility.Visible; + nbelipsesvisible++; + break; + case 10: + elipse10.Visibility = Visibility.Visible; + nbelipsesvisible++; + break; + } } - } - for (int i = tempsound + 1; i < 11; i++) - { - switch (i) + for (int i = tempsound + 1; i < 11; i++) { - case 1: - elipse01.Visibility = Visibility.Hidden; - break; - case 2: - elipse02.Visibility = Visibility.Hidden; - break; - case 3: - elipse03.Visibility = Visibility.Hidden; - break; - case 4: - elipse04.Visibility = Visibility.Hidden; - break; - case 5: - elipse05.Visibility = Visibility.Hidden; - break; - case 6: - elipse06.Visibility = Visibility.Hidden; - break; - case 7: - elipse07.Visibility = Visibility.Hidden; - break; - case 8: - elipse08.Visibility = Visibility.Hidden; - break; - case 9: - elipse09.Visibility = Visibility.Hidden; - break; - case 10: - elipse10.Visibility = Visibility.Hidden; - break; + switch (i) + { + case 1: + elipse01.Visibility = Visibility.Hidden; + break; + case 2: + elipse02.Visibility = Visibility.Hidden; + break; + case 3: + elipse03.Visibility = Visibility.Hidden; + break; + case 4: + elipse04.Visibility = Visibility.Hidden; + break; + case 5: + elipse05.Visibility = Visibility.Hidden; + break; + case 6: + elipse06.Visibility = Visibility.Hidden; + break; + case 7: + elipse07.Visibility = Visibility.Hidden; + break; + case 8: + elipse08.Visibility = Visibility.Hidden; + break; + case 9: + elipse09.Visibility = Visibility.Hidden; + break; + case 10: + elipse10.Visibility = Visibility.Hidden; + break; + } } } } + return nbelipsesvisible; } } diff -r 37c16056c45b -r 70e93b0bd778 src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs --- a/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs Fri Nov 13 22:11:50 2009 +0100 +++ b/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs Fri Nov 13 23:22:00 2009 +0100 @@ -81,7 +81,7 @@ // The orientation offset (default). tagDef.OrientationOffsetFromTag = 0.0; // The physical offset (horizontal inches, vertical inches). - tagDef.PhysicalCenterOffsetFromTag = new Vector(0.5, 0.25); + tagDef.PhysicalCenterOffsetFromTag = new Vector(0, 0); // The tag removal behavior (default). tagDef.TagRemovedBehavior = TagRemovedBehavior.Fade; // Orient UI to tag? (default). @@ -111,24 +111,20 @@ //else if (((niveau == 1) || (niveau == 2) || (niveau == 3)) && lastSoundlevel == 0) else if (((niveau == 1) || (niveau == 2)) && lastSoundlevel == 0) rise = true; - if (!rise) { niveau = (niveau - 10) % 10; } - //ToDo - //--1 Mute all other Players - - //--2 Elipse visibility - tagsoundcontrol.TagVisuSoundLevelUpdate(niveau); + //--Elipse visibility + int elipseNB = tagsoundcontrol.TagVisuSoundLevelUpdate(niveau); //Set the Sound of the Player. - if (Math.Abs(lastSoundlevel - niveau) == 1) + if(elipseNB != -1) { - UserControlSyncSource.setUserPlayerVolume((double)niveau / 10.0); + UserControlSyncSource.setUserPlayerVolume(elipseNB/10.0); } lastSoundlevel = niveau; - tagsoundcontrol.volumeModel.Content = niveau;//deltaOrientation.ToString(); + tagsoundcontrol.volumeModel.Content = elipseNB;//deltaOrientation.ToString(); } private void OnVisualizationAdded(object sender, TagVisualizerEventArgs e) diff -r 37c16056c45b -r 70e93b0bd778 src/FingersDance.sln --- a/src/FingersDance.sln Fri Nov 13 22:11:50 2009 +0100 +++ b/src/FingersDance.sln Fri Nov 13 23:22:00 2009 +0100 @@ -29,6 +29,18 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GestureControl", "FingersDance.GestureControl\GestureControl.csproj", "{99A9037F-5431-44DD-BCE9-ED60670DEBC1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance", "FingersDance\FingersDance.csproj", "{2E4DE79B-67F4-4803-8C9A-5708B4335353}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control", "FingersDance.Control\FingersDance.Control.csproj", "{4DC517DD-1601-481E-BAAC-6FE271417F46}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.Screen", "FingersDance.Control.Screen\FingersDance.Control.Screen.csproj", "{67E2CB60-529E-4AFF-8E0F-A8087EE638B1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.Player", "FingersDance.Control.Player\FingersDance.Control.Player.csproj", "{E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.Pivot", "FingersDance.Control.Pivot\FingersDance.Control.Pivot.csproj", "{0EC4C48C-132C-4926-9A09-A4135C58688C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.Base", "FingersDance.Control.Base\FingersDance.Control.Base.csproj", "{BD930B53-B52B-4CE0-931F-12E941B252C3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -137,6 +149,54 @@ {99A9037F-5431-44DD-BCE9-ED60670DEBC1}.Release|Any CPU.ActiveCfg = Release|Any CPU {99A9037F-5431-44DD-BCE9-ED60670DEBC1}.Release|Any CPU.Build.0 = Release|Any CPU {99A9037F-5431-44DD-BCE9-ED60670DEBC1}.Release|x86.ActiveCfg = Release|Any CPU + {2E4DE79B-67F4-4803-8C9A-5708B4335353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2E4DE79B-67F4-4803-8C9A-5708B4335353}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E4DE79B-67F4-4803-8C9A-5708B4335353}.Debug|x86.ActiveCfg = Debug|x86 + {2E4DE79B-67F4-4803-8C9A-5708B4335353}.Debug|x86.Build.0 = Debug|x86 + {2E4DE79B-67F4-4803-8C9A-5708B4335353}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2E4DE79B-67F4-4803-8C9A-5708B4335353}.Release|Any CPU.Build.0 = Release|Any CPU + {2E4DE79B-67F4-4803-8C9A-5708B4335353}.Release|x86.ActiveCfg = Release|x86 + {2E4DE79B-67F4-4803-8C9A-5708B4335353}.Release|x86.Build.0 = Release|x86 + {4DC517DD-1601-481E-BAAC-6FE271417F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4DC517DD-1601-481E-BAAC-6FE271417F46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4DC517DD-1601-481E-BAAC-6FE271417F46}.Debug|x86.ActiveCfg = Debug|x86 + {4DC517DD-1601-481E-BAAC-6FE271417F46}.Debug|x86.Build.0 = Debug|x86 + {4DC517DD-1601-481E-BAAC-6FE271417F46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4DC517DD-1601-481E-BAAC-6FE271417F46}.Release|Any CPU.Build.0 = Release|Any CPU + {4DC517DD-1601-481E-BAAC-6FE271417F46}.Release|x86.ActiveCfg = Release|x86 + {4DC517DD-1601-481E-BAAC-6FE271417F46}.Release|x86.Build.0 = Release|x86 + {67E2CB60-529E-4AFF-8E0F-A8087EE638B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {67E2CB60-529E-4AFF-8E0F-A8087EE638B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {67E2CB60-529E-4AFF-8E0F-A8087EE638B1}.Debug|x86.ActiveCfg = Debug|x86 + {67E2CB60-529E-4AFF-8E0F-A8087EE638B1}.Debug|x86.Build.0 = Debug|x86 + {67E2CB60-529E-4AFF-8E0F-A8087EE638B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {67E2CB60-529E-4AFF-8E0F-A8087EE638B1}.Release|Any CPU.Build.0 = Release|Any CPU + {67E2CB60-529E-4AFF-8E0F-A8087EE638B1}.Release|x86.ActiveCfg = Release|x86 + {67E2CB60-529E-4AFF-8E0F-A8087EE638B1}.Release|x86.Build.0 = Release|x86 + {E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Debug|x86.ActiveCfg = Debug|x86 + {E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Debug|x86.Build.0 = Debug|x86 + {E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Release|Any CPU.Build.0 = Release|Any CPU + {E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Release|x86.ActiveCfg = Release|x86 + {E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Release|x86.Build.0 = Release|x86 + {0EC4C48C-132C-4926-9A09-A4135C58688C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0EC4C48C-132C-4926-9A09-A4135C58688C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0EC4C48C-132C-4926-9A09-A4135C58688C}.Debug|x86.ActiveCfg = Debug|x86 + {0EC4C48C-132C-4926-9A09-A4135C58688C}.Debug|x86.Build.0 = Debug|x86 + {0EC4C48C-132C-4926-9A09-A4135C58688C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0EC4C48C-132C-4926-9A09-A4135C58688C}.Release|Any CPU.Build.0 = Release|Any CPU + {0EC4C48C-132C-4926-9A09-A4135C58688C}.Release|x86.ActiveCfg = Release|x86 + {0EC4C48C-132C-4926-9A09-A4135C58688C}.Release|x86.Build.0 = Release|x86 + {BD930B53-B52B-4CE0-931F-12E941B252C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BD930B53-B52B-4CE0-931F-12E941B252C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BD930B53-B52B-4CE0-931F-12E941B252C3}.Debug|x86.ActiveCfg = Debug|x86 + {BD930B53-B52B-4CE0-931F-12E941B252C3}.Debug|x86.Build.0 = Debug|x86 + {BD930B53-B52B-4CE0-931F-12E941B252C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BD930B53-B52B-4CE0-931F-12E941B252C3}.Release|Any CPU.Build.0 = Release|Any CPU + {BD930B53-B52B-4CE0-931F-12E941B252C3}.Release|x86.ActiveCfg = Release|x86 + {BD930B53-B52B-4CE0-931F-12E941B252C3}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE