Merge pull request #42 (Maven Gauthier) from vykio/develop

Develop -> main

Author: vykio

pom.xml

@@ -7,7 +7,6 @@
     <groupId>vykio</groupId>
     <artifactId>java-rdp</artifactId>
     <version>${shownVersion</version>
-
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
@@ -205,5 +204,4 @@
             <version>4.1.0</version>
         </dependency>
     </dependencies>
-    
 </project>

src/main/java/com/tech/app/models/Arc.java

@@ -30,7 +30,7 @@ public Arc(Place place, int poids, double xOrigin, double yOrigin, boolean place
         this.placeToTransition = placeToTransition;
         this.transition = transition;
         this.forme = new Line2D.Double(xOrigin, yOrigin, this.place.getX(), this.place.getY());
-        this.pointCtr1 = new PointControle();
+        this.pointCtr1 = new PointControle(0,0,this);
     }
 
     /**
@@ -54,6 +54,10 @@ public Arc(Place place, int poids){
      */
     public Place getPlace() { return this.place; }
 
+    public Transition getTransition() { return transition; }
+
+    public boolean isPlaceToTransition() { return placeToTransition; }
+
     /**
      * Méthode qui permet de récupérer le poids de l'arc.
      * @return poids.
@@ -70,7 +74,12 @@ public Arc(Place place, int poids){
      * Méthode qui permet de donner/modifier le poids d'un arc.
      * @param poids Poids de l'arc
      */
-    public void setPoids(int poids) { this.poids = poids; }
+    public void setPoids(int poids) {
+        if(poids >= 1) {
+            this.poids = poids;
+        }
+    }
+
 
     /**
      * Méthode qui permet d'afficher les caractéristiques de l'arc : {place,poids}.
@@ -81,13 +90,20 @@ public String toString() {
         return "Arc{" +
                 "place=" + place +
                 ", poids=" + poids +
+                ", placetoTransition=" + placeToTransition +
+                ", ptctrl= "+ pointCtr1+
                 '}';
     }
 
     /* Partie Graphique */
 
     public Line2D.Double forme;
+    public QuadCurve2D.Double courbe;
     public AffineTransform at;
+    public AffineTransform reverse;
+    public Path2D.Double hitbox;
+    public Path2D arrowHead;
+
 
     /**
      * Méthode qui permet de dessiner un arc.
@@ -116,30 +132,63 @@ private void drawArrow(Graphics2D g2, double oX, double oY, double dX, double dY
         at.concatenate(AffineTransform.getRotateInstance(angle));
         g2.transform(at);
 
+        reverse = getReverseAt();
+
         /* Ligne */
         if (!this.pointCtr1.getMoved()) {
             this.pointCtr1.setX((start + len-ARR_SIZE)/2);
             this.pointCtr1.setY(0);
         }
 
         /*point de controle*/
-        pointCtr1.draw(g2);
-
-        QuadCurve2D.Double courbe = new QuadCurve2D.Double(start, 0, this.pointCtr1.getX(), this.pointCtr1.getY(), len, 0);
-        /* Référentiel */
+        //pointCtr1.draw(g2);
 
+        courbe = new QuadCurve2D.Double(start, 0, this.pointCtr1.getX(), this.pointCtr1.getY(), len, 0);
         g2.draw(courbe);
 
+
+        hitbox = new Path2D.Double(arcHitbox(len));
+        //g2.draw(hitbox);
+
+        // Line between control Point and ArrowHead Point
+        Line2D.Double line1 = new Line2D.Double(0,0,len,0);
+        Line2D.Double line2 = new Line2D.Double(pointCtr1.getX(),pointCtr1.getY(),len,0);
+        //g2.draw(line1);
+        //g2.draw(line2);
+
         /* Fléche */
-        Path2D path = new Path2D.Double();
-        double[] xval = {len, len-ARR_SIZE, len-ARR_SIZE, len};
-        double[] yval = {0, -ARR_SIZE, ARR_SIZE, 0};
-        path.moveTo(xval[0], yval[0]);
+        arrowHead = new Path2D.Double();
+        double[] xval = {line2.getX2(), line2.getX2()-ARR_SIZE, line2.getX2()-ARR_SIZE, line2.getX2()};
+        double[] yval = {line2.getY2(), -ARR_SIZE, ARR_SIZE, line2.getY2()};
+        arrowHead.moveTo(xval[0], yval[0]);
         for(int i = 1; i < xval.length; ++i) {
-            path.lineTo(xval[i], yval[i]);
+            arrowHead.lineTo(xval[i], yval[i]);
         }
-        path.closePath();
-        g2.fill(path);
+        arrowHead.closePath();
+
+        AffineTransform rotate = new AffineTransform(AffineTransform.getRotateInstance(Math.toRadians(angleBetween2Lines(line1,line2)),line2.getX2(), line2.getY2()));
+        arrowHead.transform(rotate);
+
+        g2.fill(arrowHead);
+
+        /* Affichage du poids */
+        if(this.poids > 1 ) {
+            g2.setFont(new Font("Console", Font.PLAIN, 15));
+            if(this.placeToTransition && this.transition.getX() < this.place.getX() || !this.placeToTransition && this.place.getX() < this.transition.getX()){
+                g2.scale(-1,-1);
+                g2.drawString(Integer.toString(poids), (int) -courbe.getCtrlX(), (int) -(courbe.getCtrlY() - 15));
+                g2.scale(1,1);
+            }else {
+                g2.drawString(Integer.toString(poids), (int) courbe.getCtrlX(), (int) courbe.getCtrlY() + 15);
+            }
+        }
+    }
+
+    public static double angleBetween2Lines(Line2D.Double line1, Line2D.Double line2)
+    {
+        double angle1 = Math.atan2(line1.getY1() - line1.getY2(), line1.getX1() - line1.getX2());
+        double angle2 = Math.atan2(line2.getY1() - line2.getY2(), line2.getX1() - line2.getX2());
+        return -(Math.toDegrees(Math.abs(angle1-angle2))+360)%360;
     }
 
     /**
@@ -173,6 +222,18 @@ public void draw(Graphics g) {
 
     }
 
+    public Path2D.Double arcHitbox(double len){
+        int ecart = 7;
+        Path2D.Double hitbox = new Path2D.Double();
+        hitbox.moveTo(this.place.forme.width/2,-ecart);
+        hitbox.quadTo(this.pointCtr1.getX(),this.pointCtr1.getY() -ecart,len,-ecart);
+        hitbox.lineTo(len,+ecart);
+        hitbox.quadTo(this.pointCtr1.getX(),this.pointCtr1.getY()+ecart, this.place.forme.width/2,+ecart);
+        hitbox.lineTo(this.place.forme.width/2,-ecart);
+        hitbox.closePath();
+        return hitbox;
+    }
+
     /**
      * Retourne true lorsque la différence absolue entre les coordonnées du point
      * d'origine et du point à comparer (toCompare) est inférieur à la valeur size
@@ -201,13 +262,16 @@ public boolean containsControlPoint1(double x, double y) {
         Point.Double point = new Point.Double(pointCtr1.getX(),pointCtr1.getY());
         Point2D.Double pointDest = new Point.Double();
 
-        at.transform(point, pointDest);
+        getAt().transform(point, pointDest);
 
         System.out.println("PtCtrlTRANSFORM:(" + pointDest.getX() + ":" + pointDest.getY() + ") PtCtrl:(" + pointCtr1.getX() + ":" + pointCtr1.getY()+ ")");
 
-        boolean res = containing(pointDest, pointCtr1.getSize(), new Point.Double(x,y));
-        System.out.println(res);
-        return res;
+        boolean res = containing(pointDest, pointCtr1.getSize()+ pointCtr1.getSize()/2, new Point.Double(x,y));
+
+        boolean result = pointCtr1.contains(x,y);
+        System.out.println(result);
+        return result;
+
     }
 
     /**
@@ -218,6 +282,17 @@ public PointControle getPointCtr1() {
         return pointCtr1;
     }
 
+    public AffineTransform getAt() { return at; }
+
+    public AffineTransform getReverseAt() {
+        try{
+            return at.createInverse();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     /**
      * Méthode qui permet de mettre à jour les coordonnées de l'arc.
      * @param x : x.