--- a/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs Tue Nov 24 07:50:17 2009 +0100
+++ b/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs Tue Nov 24 11:35:07 2009 +0100
@@ -183,8 +183,11 @@
// If the stroke has been drawed very fast, end and start can be the same, so we add a little length.
float dur = (float)(grea.End - grea.Start);
if (dur == 0) dur = (float)0.5;
+ // We build the list of string
+ List<String> gestList = new List<String>();
foreach (Gesture elt in grea.Gestures)
- UCTimeLine.addAnnotation((float)grea.Start, dur, elt.Name);
+ gestList.Add(elt.Name);
+ UCTimeLine.addAnnotation((float)grea.Start, dur, gestList);
}
else
{
@@ -195,12 +198,13 @@
foreach (Annotation annot in cut.AnnotList)
{
foreach(Gesture gest in grea.Gestures)
- if (annot.GestureType == gest.Name)
- {
- // One of the gesture is enough for the annotation to be added
- searchedAnnot.Add(annot);
- break;
- }
+ foreach(String annotGest in annot.GestureType)
+ if (annotGest == gest.Name)
+ {
+ // One of the gesture is enough for the annotation to be added
+ searchedAnnot.Add(annot);
+ break;
+ }
}
}
// The list was built. If the number of found annotations is >0, we send the list to the timeline
@@ -218,11 +222,12 @@
{
foreach (Annotation annot in cut.AnnotList)
{
- if (annot.GestureType == gestureName)
- {
- // One of the gesture is enough for the annotation to be added
- searchedAnnot.Add(annot);
- }
+ foreach (String annotGest in annot.GestureType)
+ if (annotGest == gestureName)
+ {
+ // One of the gesture is enough for the annotation to be added
+ searchedAnnot.Add(annot);
+ }
}
}
// The list was built. If the number of found annotations is >0, we send the list to the timeline