Check for to many rows in Hexagon

//TODO: Resizing vertical images in Hexagon results in brocken pixels
lr101 · Jan 30, 2024 · a3e43a6 · a3e43a6
1 parent 597d52f
commit a3e43a6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/main/java/Hexagon.java b/src/main/java/Hexagon.java
@@ -114,7 +114,11 @@ int getHeight(int rows) {
     }
 
     int getWidth(int width) {
-        return (width / (2 * this.getXSize())) *  2 * this.getXSize();
+        int w = (width / (2 * this.getXSize())) *  2 * this.getXSize();
+        if (w <= 1) {
+            throw new NullPointerException("Height is big -> Therefore width is smaller than 1 pixel");
+        }
+        return w;
     }
 
     public void setSize(int width, int numImages, int rows) {

diff --git a/src/main/java/Main.java b/src/main/java/Main.java
@@ -72,12 +72,17 @@ public static void main(String[] args) {
             print("Stopping without doing anything: Not enough images found (only 0 or 1)");
             return;
         }
-        if (SELECTED_SHAPE instanceof Hexagon) {
-            m = new ShapeManagement(new File(picturesDir), imagePaths, SELECTED_SHAPE, new File(picturesDir), HEIGHT, WIDTH);
-        } else {
-            m = new ShapeManagement(new File(picturesDir), imagePaths, SELECTED_SHAPE, new File(picturesDir), new Dimension(WIDTH, HEIGHT));
+        try {
+            if (SELECTED_SHAPE instanceof Hexagon) {
+                m = new ShapeManagement(new File(picturesDir), imagePaths, SELECTED_SHAPE, new File(picturesDir), HEIGHT, WIDTH);
+            } else {
+                m = new ShapeManagement(new File(picturesDir), imagePaths, SELECTED_SHAPE, new File(picturesDir), new Dimension(WIDTH, HEIGHT));
+            }
+            m.run(FILE_NAME);
+        } catch (Exception e){
+            print("Stopping: " + e.getMessage());
+            return;
         }
-        m.run(FILE_NAME);
         print("Finished: Saved into: " + FILE_NAME);
 
     }