diff --git a/.directory b/.directory index 13e1ee6..7750e6b 100644 --- a/.directory +++ b/.directory @@ -1,3 +1,4 @@ [Dolphin] -Timestamp=2017,1,18,15,39,2 +PreviewsShown=true +Timestamp=2017,1,18,16,56,50 Version=3 diff --git a/Geste/out/production/Projet_IHM_Palette_dessin/Reconnaissance.class b/Geste/out/production/Projet_IHM_Palette_dessin/Reconnaissance.class index 133f365..fbc82bd 100644 Binary files a/Geste/out/production/Projet_IHM_Palette_dessin/Reconnaissance.class and b/Geste/out/production/Projet_IHM_Palette_dessin/Reconnaissance.class differ diff --git a/Geste/out/production/Projet_IHM_Palette_dessin/Stroke.class b/Geste/out/production/Projet_IHM_Palette_dessin/Stroke.class index e3c8fd9..5fab3cf 100644 Binary files a/Geste/out/production/Projet_IHM_Palette_dessin/Stroke.class and b/Geste/out/production/Projet_IHM_Palette_dessin/Stroke.class differ diff --git a/Geste/src/Reconnaissance.java b/Geste/src/Reconnaissance.java index d48b1ba..161f249 100644 --- a/Geste/src/Reconnaissance.java +++ b/Geste/src/Reconnaissance.java @@ -31,7 +31,6 @@ public class Reconnaissance { result += (int) Math.sqrt((Math.pow(x1 - x3, 2) + Math.pow(y1 - y3, 2))); cpt++; } - System.out.println(result); return result; } diff --git a/Geste/src/Stroke.java b/Geste/src/Stroke.java index 965d75b..25b1149 100644 --- a/Geste/src/Stroke.java +++ b/Geste/src/Stroke.java @@ -142,7 +142,6 @@ public class Stroke { public ArrayList scaleToSquare() { ArrayList newPoints = new ArrayList(); Rectangle2D.Double boundingBox = getBoundingBox(); - System.out.println(boundingBox); if (boundingBox.getHeight() > 10) { for (int i = 0; i < listePoint.size(); i++) { Point2D.Double p = listePoint.get(i); diff --git a/Vocal/grammar.grxml b/Vocal/grammar.grxml index e6d0279..b2781be 100755 --- a/Vocal/grammar.grxml +++ b/Vocal/grammar.grxml @@ -26,11 +26,11 @@ - créer - supprimer - déplacer + ici + ça + - out.text = "Action:" + meta.current().text; + out.text = "VOCAL action=" + meta.current().text; @@ -40,7 +40,7 @@ vert jaune - out.text = "Action:couleur:" + meta.current().text; + out.text = "VOCAL couleur=" + meta.current().text; - \ No newline at end of file + diff --git a/automate.png b/automate.png new file mode 100644 index 0000000..8439663 Binary files /dev/null and b/automate.png differ