QRouland/M2IHMPalette
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Quentin Rouland
2017-01-19 15:15:21 +01:00
parent 6f45a93913 d3147a8325
commit 5eba2c4dd9
7 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.directory
View File

@@ -1,3 +1,4 @@
[Dolphin] [Dolphin]
Timestamp=2017,1,18,15,39,2 PreviewsShown=true
Timestamp=2017,1,18,16,56,50
Version=3 Version=3

BIN
Geste/out/production/Projet_IHM_Palette_dessin/Reconnaissance.class
View File

Binary file not shown.

BIN
Geste/out/production/Projet_IHM_Palette_dessin/Stroke.class
View File

Binary file not shown.

1
Geste/src/Reconnaissance.java
View File

@@ -31,7 +31,6 @@ public class Reconnaissance {
result += (int) Math.sqrt((Math.pow(x1 - x3, 2) + Math.pow(y1 - y3, 2))); result += (int) Math.sqrt((Math.pow(x1 - x3, 2) + Math.pow(y1 - y3, 2)));
cpt++; cpt++;
} }
System.out.println(result);
return result; return result;
} }

1
Geste/src/Stroke.java
View File

@@ -142,7 +142,6 @@ public class Stroke {
public ArrayList<Point2D.Double> scaleToSquare() { public ArrayList<Point2D.Double> scaleToSquare() {
ArrayList<Point2D.Double> newPoints = new ArrayList<Point2D.Double>(); ArrayList<Point2D.Double> newPoints = new ArrayList<Point2D.Double>();
Rectangle2D.Double boundingBox = getBoundingBox(); Rectangle2D.Double boundingBox = getBoundingBox();
System.out.println(boundingBox);
if (boundingBox.getHeight() > 10) { if (boundingBox.getHeight() > 10) {
for (int i = 0; i < listePoint.size(); i++) { for (int i = 0; i < listePoint.size(); i++) {
Point2D.Double p = listePoint.get(i); Point2D.Double p = listePoint.get(i);

10
Vocal/grammar.grxml
View File

@@ -26,11 +26,11 @@
<rule id="action"> <rule id="action">
<one-of> <one-of>
<item>cr<EFBFBD>er</item> <item>ici</item>
<item>supprimer</item> <item><EFBFBD>a</item>
<item>d<EFBFBD>placer</item> <item>l<EFBFBD></item>
</one-of> </one-of>
<tag>out.text = "Action:" + meta.current().text;</tag> <tag>out.text = "VOCAL action=" + meta.current().text;</tag>
</rule> </rule>
<rule id="couleur_nom"> <rule id="couleur_nom">
@@ -40,7 +40,7 @@
<item>vert</item> <item>vert</item>
<item>jaune</item> <item>jaune</item>
</one-of> </one-of>
<tag>out.text = "Action:couleur:" + meta.current().text;</tag> <tag>out.text = "VOCAL couleur=" + meta.current().text;</tag>
</rule> </rule>
</grammar> </grammar>

BIN
automate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB