Merge pull request #10 from vykio/macos-bug-2

Macos bug 2 -> drawing-zone

Author: vykio

.idea/vcs.xml

@@ -0,0 +1,21 @@
+package com.tech.app.functions;
+
+import java.util.Locale;
+
+public final class FUtils {
+
+    public static class OS {
+
+        public static String getOs() {
+            return System.getProperty("os.name");
+        }
+
+        public static boolean isMacOs() {
+            return (getOs().toLowerCase(Locale.ROOT).contains("max"));
+        }
+
+    }
+
+
+
+}

src/com/tech/app/functions/FUtils.java

@@ -1,5 +1,6 @@
 package com.tech.app.windows;
 
+import com.tech.app.functions.FUtils;
 import com.tech.app.models.Model;
 import com.tech.app.windows.handlers.DrawMouse;
 import com.tech.app.windows.handlers.MainWindowHandler;
@@ -17,8 +18,7 @@
 public class MainWindow extends Window {
 
     public MainWindow(int width, int height) throws UnsupportedLookAndFeelException {
-
-        super("Fenetre principale - RDP", width, height, true, true);
+        super("Fenetre principale - RDP - " + FUtils.OS.getOs(), width, height, true, true);
         UIManager.setLookAndFeel(new MetalLookAndFeel());
         setWindowHandler(new MainWindowHandler(this));
         build();

src/com/tech/app/windows/MainWindow.java

@@ -78,8 +78,8 @@ public void mouseClicked(java.awt.event.MouseEvent mouseEvent) {
     @Override
     public void mousePressed(java.awt.event.MouseEvent mouseEvent) {
         //System.out.println("Mouse pressed");
-        x = mouseEvent.getX();
-        y = mouseEvent.getY();
+        x = mouseEvent.getX() * (int)drawPanel.scaleFactor;
+        y = mouseEvent.getY() * (int)drawPanel.scaleFactor;
 
         drawPanel.mouseX = x;
         drawPanel.mouseY = y;
@@ -89,19 +89,19 @@ public void mousePressed(java.awt.event.MouseEvent mouseEvent) {
             if (SwingUtilities.isLeftMouseButton(mouseEvent)){
                 switch(mode){
                     case PLACE:
-                        drawPanel.addPlace(mouseEvent.getX() /drawPanel.scaleX,mouseEvent.getY() / drawPanel.scaleY);
+                        drawPanel.addPlace(x/drawPanel.scaleX,y/ drawPanel.scaleY);
                         System.out.println("Place mise");
                         break;
                     case ARC:
-                        drawPanel.loadCoordinatesArc(mouseEvent.getX() /drawPanel.scaleX, mouseEvent.getY() /drawPanel.scaleY);
+                        drawPanel.loadCoordinatesArc(x /drawPanel.scaleX, y /drawPanel.scaleY);
                         System.out.println("Arc test");
                         break;
                     case TRANSITION:
-                        drawPanel.addTransition(mouseEvent.getX() / drawPanel.scaleX,mouseEvent.getY()/ drawPanel.scaleY);
+                        drawPanel.addTransition(x / drawPanel.scaleX,y/ drawPanel.scaleY);
                         System.out.println("Transition mise");
                         break;
                     case ATTRIBUTS:
-                        objectSelected = drawPanel.getSelectedObject(mouseEvent.getX() / drawPanel.scaleX, mouseEvent.getY() / drawPanel.scaleY);
+                        objectSelected = drawPanel.getSelectedObject(x / drawPanel.scaleX, y / drawPanel.scaleY);
                         if (objectSelected != null) {
                             drawPanel.showOptions(objectSelected);
                         } else {
@@ -110,6 +110,7 @@ public void mousePressed(java.awt.event.MouseEvent mouseEvent) {
                         break;
                     case SELECT:
                         objectDragged = drawPanel.getSelectedObject(x/drawPanel.scaleX, y/drawPanel.scaleY);
+                        System.out.println(objectDragged);
                         break;
                 }
             }
@@ -145,8 +146,8 @@ public void mouseExited(java.awt.event.MouseEvent mouseEvent) {
     }
 
     public void mouseDragged(MouseEvent e) {
-        int dx = e.getX() - x;
-        int dy = e.getY() - y;
+        int dx = e.getX()*(int)drawPanel.scaleFactor - x;
+        int dy = e.getY()*(int)drawPanel.scaleFactor - y;
 
         if (SwingUtilities.isMiddleMouseButton(e)) {
 

src/com/tech/app/windows/handlers/DrawMouse.java

@@ -1,5 +1,7 @@
 package com.tech.app.windows.panels;
 
+import com.tech.app.functions.FMaths;
+import com.tech.app.functions.FUtils;
 import com.tech.app.models.Arc;
 import com.tech.app.models.Model;
 import com.tech.app.models.Place;
@@ -35,15 +37,21 @@ public class DrawPanel extends JPanel {
     public final double MIN_ZOOM = 0.5;
 
     /* Variables d'agrandissement et zoom */
-    public double scaleX = 1;
-    public double scaleY = 1;
+    public double scaleFactor;
+    public double scaleX;
+    public double scaleY;
+
     public AffineTransform transform;
 
     public DrawPanel(JFrame frame, Model model) {
+        this.scaleFactor = FUtils.OS.isMacOs() ? 2 : 1;
+        this.scaleX = this.scaleFactor;
+        this.scaleY = this.scaleFactor;
+
         this.frame = frame;
         this.model = model;
         this.transform  = AffineTransform.getScaleInstance(scaleX, scaleY);
-        this.setBorder(BorderFactory.createLineBorder(Color.BLACK, 5));
+        //this.setBorder(BorderFactory.createLineBorder(Color.BLACK, 5));
     }
 
     /* Utilisé pour déplacer tous les objets (click-molette) */
@@ -70,16 +78,16 @@ public void updatePosition(Object obj, double x, double y, double scaleX, double
         if (obj != null) {
             if (obj instanceof Place) {
                 Place p = (Place) obj;
-                if (p.forme.getBounds2D().contains(x, y)) {
+                //if (p.forme.getBounds2D().contains(x, y)) {
                     p.updatePosition(p.getX() + dx * 1 / scaleX, p.getY() + dy * 1 / scaleY);
                     repaint();
-                }
+                //}
             } else {
                 Transition p = (Transition) obj;
-                if (p.forme.getBounds2D().contains(x, y)) {
+                //if (p.forme.getBounds2D().contains(x, y)) {
                     p.updatePosition(p.getX() + dx * 1 / scaleX, p.getY() + dy * 1 / scaleY);
                     repaint();
-                }
+                //}
             }
         }
     }
@@ -124,8 +132,8 @@ public void paintComponent(Graphics g) {
             }
             Color color = g.getColor();
             g.setColor(Color.BLACK);
-            g.setFont(new Font("Console", Font.PLAIN, (int)(15/scaleX)));
-            g.drawString(draggedObject.toString(), (int)(10/scaleX), (int)((this.frame.getContentPane().getSize().getHeight()-50)/scaleY));
+            g.setFont(new Font("Console", Font.PLAIN, (int)(scaleFactor*15/scaleX)));
+            g.drawString(draggedObject.toString(), (int)(10/scaleX), (int)((this.frame.getContentPane().getSize().getHeight()-50)*scaleFactor/scaleY));
             g.setColor(color);
         }
 
@@ -134,11 +142,11 @@ public void paintComponent(Graphics g) {
     private void drawTooltips(Graphics g) {
         Color color = g.getColor();
         g.setColor(Color.BLUE);
-        g.setFont(new Font("Console", Font.PLAIN, (int)(15/scaleX)));
+        g.setFont(new Font("Console", Font.PLAIN, (int)(15/scaleX*scaleFactor)));
         if (this.indexOfClickArc == 1) {
-            g.drawString("Arc origin set", (int)(10/scaleX), (int)((this.frame.getContentPane().getSize().getHeight()-80)/scaleY));
+            g.drawString("Arc origin set", (int)(10/scaleX*scaleFactor), (int)((this.frame.getContentPane().getSize().getHeight()-80)*scaleFactor/scaleY));
         }
-        g.drawString("X:" + mouseX + "-Y:" + mouseY, (int)(10/scaleX), (int)(50/scaleY));
+        //g.drawString("X:" + FMaths.round(mouseX/scaleX,2) + "-Y:" + FMaths.round(mouseY/scaleY, 2), (int)(10/scaleX*scaleFactor), (int)(50/scaleY*scaleFactor));
         g.setColor(color);
     }
 
@@ -153,7 +161,7 @@ public void clearAll() {
 
     /* Ajouter une place au système */
     public void addPlace(double x, double y){
-        model.addPlace(new Place("p" + idPlace, x, y));
+        model.addPlace(new Place("P" + idPlace, x, y));
         this.idPlace++;
         repaint();
     }