Merge pull request #177 from t-oster/feature-move-head-position

Feature: Move head to mouse position.

Author: t-oster

src/com/t_oster/visicut/VisicutModel.java

@@ -23,6 +23,8 @@
 import com.t_oster.liblasercut.LaserJob;
 import com.t_oster.liblasercut.LaserProperty;
 import com.t_oster.liblasercut.ProgressListener;
+import com.t_oster.liblasercut.VectorPart;
+import com.t_oster.liblasercut.platform.Util;
 import com.t_oster.visicut.managers.LaserDeviceManager;
 import com.t_oster.visicut.managers.MappingManager;
 import com.t_oster.visicut.managers.MaterialManager;
@@ -761,6 +763,36 @@ else if (foc instanceof Double)
     return result;
   }
 
+  //moves the laser head to the given position (in mm)
+  public void moveHeadTo(Point2D.Double p)
+  {
+    try
+    {
+      LaserCutter lasercutter = this.getSelectedLaserDevice().getLaserCutter();
+      LaserJob job = new LaserJob("move", "move", "visicut");
+      if (this.startPoint != null)
+      {
+        job.setStartPoint(this.startPoint.x, this.startPoint.y);
+      }
+      double dpi = lasercutter.getResolutions().get(lasercutter.getResolutions().size()-1);
+      double factor = Util.dpi2dpmm(dpi);
+      AffineTransform mm2laserpx = AffineTransform.getScaleInstance(factor, factor);
+      VectorPart part = new VectorPart(lasercutter.getLaserPropertyForVectorPart(), dpi);
+      mm2laserpx.transform(p, p);
+      part.moveto((int) p.x, (int) p.y);
+      job.addPart(part);
+      lasercutter.sendJob(job);
+    }
+    catch (IllegalJobException ex)
+    {
+      Logger.getLogger(VisicutModel.class.getName()).log(Level.SEVERE, null, ex);
+    }
+    catch (Exception ex)
+    {
+      Logger.getLogger(VisicutModel.class.getName()).log(Level.SEVERE, null, ex);
+    }
+  }
+
   public enum Modification
   {
     NONE,

src/com/t_oster/visicut/gui/PreviewPanelKeyboardMouseHandler.java

@@ -18,6 +18,8 @@
  **/
 package com.t_oster.visicut.gui;
 
+import com.t_oster.liblasercut.LaserJob;
+import com.t_oster.liblasercut.VectorPart;
 import com.t_oster.visicut.VisicutModel;
 import com.t_oster.visicut.gui.beans.EditRectangle;
 import com.t_oster.visicut.gui.beans.EditRectangle.Button;
@@ -82,6 +84,7 @@ public class PreviewPanelKeyboardMouseHandler extends EditRectangleController im
   private JMenuItem startPointSetMenuItem;
   private JMenuItem startPointRemoveMenuItem;
   private JMenuItem selectScreenshotMenuItem;
+  private JMenuItem moveToPositionMenuItem;
 
   public PreviewPanelKeyboardMouseHandler(PreviewPanel panel)
   {
@@ -109,6 +112,8 @@ private void buildMenu()
     startPointSetMenuItem = new JMenuItem(bundle.getString("ADD_STARTPOINT"));
     startPointRemoveMenuItem = new JMenuItem(bundle.getString("REMOVE_STARTPOINT"));
     selectScreenshotMenuItem = new JMenuItem(bundle.getString("SELECT_SCREENSHOT"));
+    //TODO: i10n
+    moveToPositionMenuItem = new JMenuItem("MOVE TO POSITION");
 
     resetMenuItem.addActionListener(new ActionListener()
     {
@@ -274,6 +279,25 @@ public void actionPerformed(ActionEvent ae)
       }
     });
     backgroundMenu.add(selectScreenshotMenuItem);
+    moveToPositionMenuItem.addActionListener(new ActionListener(){
+
+      public void actionPerformed(ActionEvent ae)
+      {
+        try
+        {
+          PreviewPanelKeyboardMouseHandler that = PreviewPanelKeyboardMouseHandler.this;
+          Point2D.Double p = new Point2D.Double(that.lastMousePosition.x, that.lastMousePosition.y);
+          that.previewPanel.getMmToPxTransform().createInverse().transform(p, p);
+          VisicutModel.getInstance().moveHeadTo(p);
+        }
+        catch (NoninvertibleTransformException ex)
+        {
+          Logger.getLogger(PreviewPanelKeyboardMouseHandler.class.getName()).log(Level.SEVERE, null, ex);
+        }
+      }
+      
+    });
+    backgroundMenu.add(moveToPositionMenuItem);
   }
 
   private void flip(boolean horizontal)
@@ -563,7 +587,7 @@ public void mouseClicked(MouseEvent me)
     }
     else if (me.getButton() == MouseEvent.BUTTON3)
     {
-      if (getEditRect() != null)
+      if (this.previewPanel.isHighlightSelection() && getEditRect() != null)
       {
         Rectangle2D bb = getSelectedPart().getBoundingBox();
         Rectangle2D e = Helper.transform(bb, this.previewPanel.getMmToPxTransform());