Middleware :
Personnalized images for gesture showing in debug.
Forced images names + default image gesture.
Name convention : name of the gesture in lowercase, underscores replacing spaces or -.
--- a/middleware/Debug/Debug.csproj Thu Apr 05 15:54:44 2012 +0200
+++ b/middleware/Debug/Debug.csproj Thu Apr 05 16:24:40 2012 +0200
@@ -144,43 +144,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <None Include="Resources\wave.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\cross.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\bend.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\push_right.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\swipe_left.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\swipe_right.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\jump.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\pull_both.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\pull_left.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\pull_right.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\push_both.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\push_left.jpg" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\knee_up.jpg" />
+ <None Include="Resources\404.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--- a/middleware/Debug/DebugWindow.xaml.cs Thu Apr 05 15:54:44 2012 +0200
+++ b/middleware/Debug/DebugWindow.xaml.cs Thu Apr 05 16:24:40 2012 +0200
@@ -56,6 +56,8 @@
private int takenPoints;
private int directionChangeTresholdXY;
private float directionChangeTresholdZ;
+ //Images
+ private String imgLocation;
//Timer.
private System.Timers.Timer _timer;
@@ -80,6 +82,9 @@
public DebugWindow()//KinectMain main)
{
InitializeComponent();
+
+ imgLocation = "Imgs";
+
//On fait appel au gestionnaire de ressources.
rm = new ResourceManager("Trakers.Debug.Properties.Resources", Assembly.GetExecutingAssembly());
//On tente de charger les paramètres du fichier params.ini.
@@ -610,6 +615,21 @@
}
/*
+ * Permet d'obtenir l'image associée à l'emplacement des images si celle-ci existe.
+ */
+ public Bitmap getImage(String location)
+ {
+ try
+ {
+ return new Bitmap(location);
+ }
+ catch (Exception)
+ {
+ return (Bitmap)rm.GetObject("_404");
+ }
+ }
+
+ /*
* Méthode d'affichage des gestures.
*/
public void showGesture(String gesture)
@@ -623,29 +643,29 @@
//on la convertit et on l'affiche.
switch (gesture)
{
- case "SWIPE-LEFT": bitmap = (Bitmap)rm.GetObject("swipe_left");
+ case "SWIPE-LEFT": bitmap = getImage(imgLocation + "\\swipe_left.png");
break;
- case "SWIPE-RIGHT": bitmap = (Bitmap)rm.GetObject("swipe_right");
+ case "SWIPE-RIGHT": bitmap = getImage(imgLocation + "\\swipe_right.png");
break;
- case "PUSH-RIGHT": bitmap = (Bitmap)rm.GetObject("push_right");
+ case "PUSH-RIGHT": bitmap = getImage(imgLocation + "\\push_right.png");
break;
- case "PUSH-LEFT": bitmap = (Bitmap)rm.GetObject("push_left");
+ case "PUSH-LEFT": bitmap = getImage(imgLocation + "\\push_left.png");
break;
- case "PUSH-BOTH": bitmap = (Bitmap)rm.GetObject("push_both");
+ case "PUSH-BOTH": bitmap = getImage(imgLocation + "\\push_both.png");
break;
- case "PULL-RIGHT": bitmap = (Bitmap)rm.GetObject("pull_right");
+ case "PULL-RIGHT": bitmap = getImage(imgLocation + "\\pull_right.png");
break;
- case "PULL-LEFT": bitmap = (Bitmap)rm.GetObject("pull_left");
+ case "PULL-LEFT": bitmap = getImage(imgLocation + "\\pull_left.png");
break;
- case "PULL-BOTH": bitmap = (Bitmap)rm.GetObject("pull_both");
+ case "PULL-BOTH": bitmap = getImage(imgLocation + "\\pull_both.png");
break;
- case "WAVE": bitmap = (Bitmap)rm.GetObject("wave");
+ case "WAVE": bitmap = getImage(imgLocation + "\\wave.png");
break;
- case "BEND": bitmap = (Bitmap)rm.GetObject("bend");
+ case "BEND": bitmap = getImage(imgLocation + "\\bend.png");
break;
- case "CROSS": bitmap = (Bitmap)rm.GetObject("cross");
+ case "CROSS": bitmap = getImage(imgLocation + "\\cross.png");
break;
- case "KNEE-UP": bitmap = (Bitmap)rm.GetObject("knee_up");
+ case "KNEE-UP": bitmap = getImage(imgLocation + "\\knee_up.png");
break;
}
Gestures.Source = CreateBitmapSourceFromBitmap(bitmap);
--- a/middleware/Debug/Properties/Resources.Designer.cs Thu Apr 05 15:54:44 2012 +0200
+++ b/middleware/Debug/Properties/Resources.Designer.cs Thu Apr 05 16:24:40 2012 +0200
@@ -60,23 +60,9 @@
}
}
- internal static System.Drawing.Bitmap bend {
- get {
- object obj = ResourceManager.GetObject("bend", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap cross {
+ internal static System.Drawing.Bitmap _404 {
get {
- object obj = ResourceManager.GetObject("cross", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap jump {
- get {
- object obj = ResourceManager.GetObject("jump", resourceCulture);
+ object obj = ResourceManager.GetObject("_404", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -90,13 +76,6 @@
}
}
- internal static System.Drawing.Bitmap knee_up {
- get {
- object obj = ResourceManager.GetObject("knee_up", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
/// <summary>
/// Looks up a localized string similar to Impossible de charger les paramètres. Paramètres par défaut..
/// </summary>
@@ -124,48 +103,6 @@
}
}
- internal static System.Drawing.Bitmap pull_both {
- get {
- object obj = ResourceManager.GetObject("pull_both", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap pull_left {
- get {
- object obj = ResourceManager.GetObject("pull_left", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap pull_right {
- get {
- object obj = ResourceManager.GetObject("pull_right", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap push_both {
- get {
- object obj = ResourceManager.GetObject("push_both", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap push_left {
- get {
- object obj = ResourceManager.GetObject("push_left", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap push_right {
- get {
- object obj = ResourceManager.GetObject("push_right", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
/// <summary>
/// Looks up a localized string similar to Impossible de démarrer le serveur TUIO (peut-être host ou port invalide ?)..
/// </summary>
@@ -174,26 +111,5 @@
return ResourceManager.GetString("serverCantStart", resourceCulture);
}
}
-
- internal static System.Drawing.Bitmap swipe_left {
- get {
- object obj = ResourceManager.GetObject("swipe_left", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap swipe_right {
- get {
- object obj = ResourceManager.GetObject("swipe_right", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap wave {
- get {
- object obj = ResourceManager.GetObject("wave", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
}
}
--- a/middleware/Debug/Properties/Resources.resx Thu Apr 05 15:54:44 2012 +0200
+++ b/middleware/Debug/Properties/Resources.resx Thu Apr 05 16:24:40 2012 +0200
@@ -138,43 +138,7 @@
<comment>S'affiche si le serveur ne peut pas démarrer.</comment>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="wave" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\wave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="bend" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bend.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\cross.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="jump" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\jump.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="pull_both" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\pull_both.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="pull_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\pull_left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="pull_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\pull_right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="push_both" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\push_both.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="push_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\push_left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="push_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\push_right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="swipe_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\swipe_left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="swipe_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\swipe_right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="knee_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\knee_up.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="_404" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\404.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
Binary file middleware/Debug/Resources/404.png has changed
Binary file middleware/Debug/Resources/bend.jpg has changed
Binary file middleware/Debug/Resources/cross.jpg has changed
Binary file middleware/Debug/Resources/jump.jpg has changed
Binary file middleware/Debug/Resources/knee_up.jpg has changed
Binary file middleware/Debug/Resources/pull_both.jpg has changed
Binary file middleware/Debug/Resources/pull_left.jpg has changed
Binary file middleware/Debug/Resources/pull_right.jpg has changed
Binary file middleware/Debug/Resources/push_both.jpg has changed
Binary file middleware/Debug/Resources/push_left.jpg has changed
Binary file middleware/Debug/Resources/push_right.jpg has changed
Binary file middleware/Debug/Resources/swipe_left.jpg has changed
Binary file middleware/Debug/Resources/swipe_right.jpg has changed
Binary file middleware/Debug/Resources/wave.png has changed
Binary file middleware/src/Imgs/bend.jpg has changed
Binary file middleware/src/Imgs/cross.jpg has changed
Binary file middleware/src/Imgs/jump.jpg has changed
Binary file middleware/src/Imgs/knee_up.jpg has changed
Binary file middleware/src/Imgs/pull_both.jpg has changed
Binary file middleware/src/Imgs/pull_left.jpg has changed
Binary file middleware/src/Imgs/pull_right.jpg has changed
Binary file middleware/src/Imgs/push_both.jpg has changed
Binary file middleware/src/Imgs/push_left.jpg has changed
Binary file middleware/src/Imgs/push_right.jpg has changed
Binary file middleware/src/Imgs/swipe_left.jpg has changed
Binary file middleware/src/Imgs/swipe_right.jpg has changed
Binary file middleware/src/Imgs/wave.png has changed