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

Makefile

@@ -6,34 +6,49 @@ PREFIX?=/usr
 all: jar
 
 help:
-	@echo "\n\n\n\
-	usage: \n\
-	make (or make jar): compile (includes LibLaserCut) \n\
-	make run: compile and run \n\
-	make dist: build setup files (in ./distribute subdirectory)\n\
-	make clean: remove all compiled files\n\
-	"
+	@echo "usage:"
+	@echo "  'make': same as 'make jar'"
+	@echo "  'make fulljar': compile VisiCut (including LibLaserCut) and run it"
+	@echo "  'make jar': compile VisiCut and run it"
+	@echo "  'make run': run VisiCut"
+	@echo "  'make dist': build setup files (in distribute/ subdirectory)"
+	@echo "  'make clean': remove all compiled files"
+
 splash:
 	./generatesplash.sh
-jar: splash libLaserCut
-	# Write version into properties file (used by Help-About screen).
-	./versionnumber.sh
-	echo "Version = $(shell ./versionnumber.sh)" > src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutAppVersion.properties
+
+jar:
+	mvn package
+	java -Xmx2048m -Xms256m -jar target/visicut*full.jar
+
+fulljar: splash libLaserCut
+	@echo "Version = $(shell ./versionnumber.sh)" > src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutAppVersion.properties
 	mvn initialize
 	mvn package
+	java -Xmx2048m -Xms256m -jar target/visicut*full.jar
+
 dist:
 	./distribute/distribute.sh zip
-	echo "Successfully built the Platform independent ZIP file. For other build variants, please run ./distribute/distribute.sh"
-run: jar
+	@echo "Successfully built the Platform independent ZIP file. For other build variants, please run ./distribute/distribute.sh"
+
+appimage:
+	./distribute/distribute.sh linux-appimage
+
+run:
+	@echo "Running the compiled JAR. If you'd like to recompile, run 'make jar'."
+	@echo
 	java -Xmx2048m -Xms256m -jar target/visicut*full.jar
+
 libLaserCut:
-	@test -f LibLaserCut/pom.xml  || { echo "Error: the LibLaserCut submodule is missing. Try running 'git submodule update --init'."; false; }
+	@test -f LibLaserCut/pom.xml || { echo "Error: the LibLaserCut submodule is missing. Try running 'git submodule update --init'."; false; }
 	cd LibLaserCut && mvn install
 	cd ..
+
 clean:
 	rm -f src/main/resources/de/thomas_oster/visicut/gui/resources/splash.png
 	rm -f src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutAppVersion.properties
 	mvn clean
+
 install:
 	mkdir -p $(DESTDIR)$(PREFIX)/share/visicut
 	cp target/visicut*full.jar $(DESTDIR)$(PREFIX)/share/visicut/Visicut.jar

README.md

@@ -1,16 +1,18 @@
 # VisiCut
 
 A userfriendly, platform-independent tool for preparing, saving and sending jobs to Lasercutters.<br/>
-For more information please look at the [project page](https://www.visicut.org).
+For more information please look at the [project page](https://www.visicut.org).<br/>
+
+This fork is actively developed by members of Fab Lab Region Nürnberg e.V.<br/>
+It includes sane defaults and many smaller improvements over [upstream VisiCut](https://github.com/t-oster/VisiCut).
 
 ## Download
 
--   [Latest releases](http://download.visicut.org)
--   [Some older versions on Github](https://github.com/t-oster/VisiCut/releases)
+[GitHub Releases](https://github.com/fablabnbg/VisiCut/releases)
 
 ## Compiling and Hacking
 
-See: [Getting Started](https://github.com/t-oster/VisiCut/wiki/Development:-Getting-started) in the wiki
+[Getting Started](https://github.com/t-oster/VisiCut/wiki/Development:-Getting-started)
 
 ## LibLaserCut
 

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)
       {