Fixes for SVG import

pom.xml

@@ -67,7 +67,7 @@
     <ugs.surefire.version>3.0.0-M5</ugs.surefire.version>
     <download-maven-plugin.version>1.3.0</download-maven-plugin.version>
     <mockito.version>3.2.4</mockito.version>
-    <batik.version>1.14</batik.version>
+    <batik.version>1.16</batik.version>
     <jxmodem.version>0.1a</jxmodem.version>
     <jts.version>1.19.0</jts.version>
     <ugs.maven-resources-plugin.version>3.1.0</ugs.maven-resources-plugin.version>

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/entities/EntityGroup.java

@@ -25,7 +25,7 @@ This file is part of Universal Gcode Sender (UGS).
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
+import java.awt.geom.RectangularShape;
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
@@ -44,6 +44,7 @@ public class EntityGroup extends AbstractEntity implements EntityListener {
 
     private double groupRotation = 0;
     private Point2D cachedCenter = new Point2D.Double(0, 0);
+    private Rectangle2D cachedBounds = new Rectangle2D.Double(0, 0, 0, 0);
 
     public EntityGroup() {
         super();
@@ -87,12 +88,34 @@ public void rotate(Point2D center, double angle) {
 
     @Override
     public Shape getShape() {
-        final Area area = new Area();
+        return getBounds();
+    }
+
+    @Override
+    public Size getSize() {
+        Rectangle2D bounds = getBounds();
+        return new Size(bounds.getWidth(), bounds.getHeight());
+    }
+
+    @Override
+    public Rectangle2D getBounds() {
+        if (cachedBounds != null) {
+            return cachedBounds;
+        }
+
         List<Entity> allChildren = getAllChildren();
-        allChildren.stream()
-                .filter(c -> c != this)
-                .forEach(c -> area.add(new Area(c.getBounds())));
-        return area.getBounds2D();
+        double maxX = allChildren.stream().map(Entity::getBounds).mapToDouble(RectangularShape::getMaxX).max().orElse(0);
+        double maxY = allChildren.stream().map(Entity::getBounds).mapToDouble(RectangularShape::getMaxY).max().orElse(0);
+        double minX = allChildren.stream().map(Entity::getBounds).mapToDouble(RectangularShape::getMinX).min().orElse(0);
+        double minY = allChildren.stream().map(Entity::getBounds).mapToDouble(RectangularShape::getMinY).min().orElse(0);
+        cachedBounds = new Rectangle2D.Double(minX, minY, maxX - minX, maxY - minY);
+        return cachedBounds;
+    }
+
+    @Override
+    public Point2D getPosition(Anchor anchor) {
+        Rectangle2D bounds = getBounds();
+        return new Point2D.Double(bounds.getX(), bounds.getY());
     }
 
     @Override
@@ -124,12 +147,13 @@ public void addChild(Entity entity, int index) {
 
     private void invalidateCenter() {
         cachedCenter = null;
+        cachedBounds = null;
     }
 
     @Override
     public Point2D getCenter() {
         if (cachedCenter == null) {
-            Rectangle2D bounds = getShape().getBounds2D();
+            Rectangle2D bounds = getBounds();
             cachedCenter = new Point2D.Double(bounds.getCenterX(), bounds.getCenterY());
         }
 

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/entities/cuttable/Rectangle.java

@@ -43,7 +43,7 @@ public Rectangle() {
      */
     public Rectangle(double x, double y) {
         super(x, y);
-        this.shape = new Rectangle2D.Double(0, 0, 10, 10);
+        this.shape = new Rectangle2D.Double(0, 0, 1, 1);
         setName("Rectangle");
     }
 

ugs-platform/ugs-platform-plugin-designer/src/main/java/com/willwinder/ugs/nbp/designer/gui/SelectionSettingsPanel.java

@@ -316,11 +316,7 @@ public void changedUpdate(DocumentEvent e) {
                 double width = Utils.parseDouble(widthTextField.getText());
                 double height = Utils.parseDouble(heightTextField.getText());
 
-                if (width <= 0 || height <= 0) {
-                    return;
-                }
-
-                if (!lockRatioButton.isSelected()) {
+                if (width >= 0 && height >= 0 & !lockRatioButton.isSelected()) {
                     double ratio = controller.getSelectionManager().getSize().getRatio();
                     if (e.getDocument() == widthTextField.getDocument()) {
                         height = width / ratio;