Fix Visicut calling inkscape in an AppImage.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "LibLaserCut"]
 	path = LibLaserCut
-	url = https://github.com/t-oster/LibLaserCut.git
+	url = https://github.com/fablabnbg/LibLaserCut.git

src/main/java/de/thomas_oster/visicut/VisicutModel.java

@@ -86,6 +86,7 @@ public class VisicutModel extends Component // FIXME: "extends Component" isn't
 
   private PlfPart selectedPart = null;
   public static final String PROP_SELECTEDPART = "selectedPart";
+  public static final float ZERO_TOLERANCE = 0.0001f;
 
   private PlfFile plfFile = new PlfFile();
 
@@ -866,16 +867,30 @@ public Modification fitObjectsIntoBed()
 
     for(PlfPart p : this.plfFile)
     {
-
       boolean modified = false;
       Rectangle2D bb = p.getGraphicObjects().getBoundingBox();
-      
+
       result.oldHeight = bb.getHeight();
       result.oldWidth = bb.getWidth();
-
-
+
       AffineTransform trans = p.getGraphicObjects().getTransform();
-      //first try moving to origin, if not in range
+
+      // automatically move if there are floating point errors
+      if (bb.getX() < 0 && bb.getX() > -ZERO_TOLERANCE)
+      {
+        // adding ZERO_TOLERANCE to show 0 instead of -0 mm as reference point x/y
+        trans.preConcatenate(AffineTransform.getTranslateInstance(-bb.getX() + ZERO_TOLERANCE, 0));
+        p.getGraphicObjects().setTransform(trans);
+        bb = p.getGraphicObjects().getBoundingBox();
+      }
+      if (bb.getY() < 0 && bb.getY() > -ZERO_TOLERANCE)
+      {
+        trans.preConcatenate(AffineTransform.getTranslateInstance(0, -bb.getY() + ZERO_TOLERANCE));
+        p.getGraphicObjects().setTransform(trans);
+        bb = p.getGraphicObjects().getBoundingBox();
+      }
+
+      // if outside of bed, try moving to origin
       if (bb.getX() < 0 || bb.getX() + bb.getWidth() > bw)
       {
         trans.preConcatenate(AffineTransform.getTranslateInstance(-bb.getX(), 0));
@@ -886,7 +901,7 @@ public Modification fitObjectsIntoBed()
         result.newHeight = bb.getHeight();
         result.newWidth = bb.getWidth();
         result.newX = bb.getX();
-        result.newY = bb.getY();        
+        result.newY = bb.getY();
       }
       if (bb.getY() < 0 || bb.getY() + bb.getHeight() > bh)
       {
@@ -898,8 +913,9 @@ public Modification fitObjectsIntoBed()
         result.newHeight = bb.getHeight();
         result.newWidth = bb.getWidth();
         result.newX = bb.getX();
-        result.newY = bb.getY();          
+        result.newY = bb.getY();
       }
+
       //if still too big (we're in origin now) check if rotation is useful 
       if (bb.getX() + bb.getWidth() > bw || bb.getY() + bb.getHeight() > bh)
       {

tools/inkscape_extension/visicut_export.inx

@@ -7,7 +7,7 @@
   <effect needs-live-preview="false">
         <object-type>path</object-type>
         <effects-menu>
-            <submenu _name="Lasercut Path"/>
+            <submenu _name="VisiCut"/>
         </effects-menu>
     </effect>
   <script>

tools/inkscape_extension/visicut_export.py

@@ -33,6 +33,7 @@
 import random
 import string
 import socket
+from pathlib import Path
 
 try:
     from os import fsencode
@@ -140,13 +141,17 @@ def is_exe(fpath):
 
 def inkscape_version():
     """Return Inkscape version number as float, e.g. version "0.92.4" --> return: float 0.92"""
-    version = subprocess.check_output([INKSCAPEBIN, "--version"],  stderr=DEVNULL).decode('ASCII', 'ignore')
-    assert version.startswith("Inkscape ")
-    match = re.match(r"Inkscape ([0-9]+\.[0-9]+).*", version)
-    assert match is not None
+    version_raw = subprocess.check_output([INKSCAPEBIN, "--version"],  stderr=DEVNULL).decode('ASCII', 'ignore')
+    ## When inkscape lives in an appimage, AppRun may pollute stdout with extra information.
+    # Go through all the lines, and find the one that starts with Inkscape
+    lines = version_raw.splitlines()
+    version = [line for line in lines if line.startswith("Inkscape ")]
+    assert len(version) == 1, "inkscape --version did not return a version number: " + version_raw
+    match = re.match(r"Inkscape ([0-9]+\.[0-9]+).*", version[0])
+    assert match is not None, "failed to parse version number from " + version[0]
     version_float = float(match.group(1))
     return version_float
-    
+
 
 
 # Strip SVG to only contain selected elements, convert objects to paths, unlink clones
@@ -157,7 +162,7 @@ def inkscape_version():
 # The idea is similar to http://bazaar.launchpad.net/~nikitakit/inkscape/svg2sif/view/head:/share/extensions/synfig_prepare.py#L181 , but more primitive - there is no need for more complicated preprocessing here
 def stripSVG_inkscape(src, dest, elements):
     version = inkscape_version()
-    
+
     # create temporary file for opening with inkscape.
     # delete this file later so that it will disappear from the "recently opened" list.
     tmpfile = tempfile.NamedTemporaryFile(delete=False, prefix='temp-visicut-', suffix='.svg')
@@ -199,8 +204,8 @@ def stripSVG_inkscape(src, dest, elements):
         verbs += ["UnhideAllInAllLayers", "EditInvertInAllLayers", "EditDelete", "EditSelectAllInAllLayers", "EditUnlinkClone", "ObjectToPath", "FileSave"]
         # --verb=action1;action2;...
         command += ["--verb=" + ";".join(verbs)]
-        
-        
+
+
         DEBUG = False
         if DEBUG:
             # Inkscape sometimes silently ignores wrong verbs, so we need to double-check that everything's right
@@ -248,7 +253,7 @@ def stripSVG_inkscape(src, dest, elements):
         actions += ["export-area-page"]
 
         command = [INKSCAPEBIN, tmpfile, "--export-overwrite", "--actions=" + ";".join(actions)]
-        
+
     try:
         #sys.stderr.write(" ".join(command))
         # run inkscape, buffer output
@@ -326,6 +331,16 @@ def get_original_filename(filename):
         VISICUTBIN = which("VisiCut.Linux", [VISICUTDIR, "/usr/share/visicut"])
 INKSCAPEBIN = which("inkscape", [INKSCAPEDIR])
 
+## Test if this inkscape is in an appimage.
+# We detect this by checking for an AppRun file, in one of the parent folders of our INKSCAPEBIN.
+# If so, replace INKSCAPEBIN with AppRun, as this is the only safe way to call inkscape.
+# (a direct call mixes libraries from the host system with the appimage, may or may not work.)
+for parent in Path(INKSCAPEBIN).parents:
+    apprun = parent / "AppRun"
+    if apprun.is_file() and os.access(apprun, os.X_OK):
+        INKSCAPEBIN = apprun
+        break
+
 tmpdir = tempfile.mkdtemp(prefix='temp-visicut-')
 dest_filename = os.path.join(tmpdir, get_original_filename(filename))
 
@@ -384,3 +399,4 @@ def get_original_filename(filename):
     sys.exit(1)
 
 # TODO (complicated, probably WONTFIX): cleanup temporary directories -- this is really difficult because we need to make sure that visicut no longer needs the file, even for reloading!
+# - Maybe add the PID od the running visicut, then we can detect orphaned temp direcories.

tools/inkscape_extension/visicut_export_replace.inx

@@ -7,7 +7,7 @@
   <effect needs-live-preview="false">
         <object-type>path</object-type>
         <effects-menu>
-            <submenu _name="Lasercut Path"/>
+            <submenu _name="VisiCut"/>
         </effects-menu>
     </effect>
   <script>