Adjust visualization

skjolber · Aug 24, 2023 · 8903395 · 8903395
1 parent e565e4b
commit 8903395
Show file tree

Hide file tree

Showing 4 changed files with 1,443 additions and 14,388 deletions.
diff --git a/pom.xml b/pom.xml
@@ -66,11 +66,6 @@
 		<url>https://github.com/skjolber/3d-bin-container-packing/issues</url>
 	</issueManagement>
 
-	<ciManagement>
-		<system>Travis CI</system>
-		<url>https://travis-ci.org/skjolber/3d-bin-container-packing</url>
-	</ciManagement>
-
 	<developers>
 		<developer>
 			<name>Thomas Skjølberg</name>

diff --git a/...github/skjolber/packing/visualizer/packaging/DefaultPackagingResultVisualizerFactory.java b/...github/skjolber/packing/visualizer/packaging/DefaultPackagingResultVisualizerFactory.java
@@ -1,14 +1,14 @@
 package com.github.skjolber.packing.visualizer.packaging;
 
 import java.util.List;
+import java.util.logging.Logger;
 
 import com.github.skjolber.packing.api.Container;
 import com.github.skjolber.packing.api.ContainerStackValue;
 import com.github.skjolber.packing.api.Stack;
 import com.github.skjolber.packing.api.StackPlacement;
 import com.github.skjolber.packing.api.StackValue;
 import com.github.skjolber.packing.api.Stackable;
-import com.github.skjolber.packing.api.ep.Point3D;
 import com.github.skjolber.packing.ep.points3d.ExtremePoints3D;
 import com.github.skjolber.packing.ep.points3d.SimplePoint3D;
 import com.github.skjolber.packing.visualizer.api.packaging.BoxVisualizer;
@@ -20,13 +20,18 @@
 
 public class DefaultPackagingResultVisualizerFactory extends AbstractPackagingResultVisualizerFactory<Container> {
 
+	private static final Logger LOGGER = Logger.getLogger(DefaultPackagingResultVisualizerFactory.class.getName());
+
 	protected final boolean calculatePoints;
 
 	public DefaultPackagingResultVisualizerFactory(boolean calculatePoints) {
 		this.calculatePoints = calculatePoints;
 	}
 
 	public PackagingResultVisualizer visualize(List<Container> inputContainers) {
+
+		boolean calculatePoints = this.calculatePoints;
+
 		int step = 0;
 		PackagingResultVisualizer visualization = new PackagingResultVisualizer();
 		for (Container inputContainer : inputContainers) {
@@ -79,20 +84,26 @@ public PackagingResultVisualizer visualize(List<Container> inputContainers) {
 				if(calculatePoints) {
 					int pointIndex = extremePoints.findPoint(placement.getAbsoluteX(), placement.getAbsoluteY(), placement.getAbsoluteZ());
 
-					extremePoints.add(pointIndex, placement);
-
-					for (SimplePoint3D<StackPlacement> point : extremePoints.getValues()) {
-						PointVisualizer p = new PointVisualizer();
-
-						p.setX(point.getMinX());
-						p.setY(point.getMinY());
-						p.setZ(point.getMinZ());
-
-						p.setDx(point.getMaxX() - point.getMinX() + 1);
-						p.setDy(point.getMaxY() - point.getMinY() + 1);
-						p.setDz(point.getMaxZ() - point.getMinZ() + 1);
-
-						stackPlacement.add(p);
+					if(pointIndex == -1) {
+						LOGGER.info("Unable to find next point, disabling further calculation of points");
+
+						calculatePoints = false;
+					} else {
+						extremePoints.add(pointIndex, placement);
+
+						for (SimplePoint3D<StackPlacement> point : extremePoints.getValues()) {
+							PointVisualizer p = new PointVisualizer();
+
+							p.setX(point.getMinX());
+							p.setY(point.getMinY());
+							p.setZ(point.getMinZ());
+
+							p.setDx(point.getMaxX() - point.getMinX() + 1);
+							p.setDy(point.getMaxY() - point.getMinY() + 1);
+							p.setDz(point.getMaxZ() - point.getMinZ() + 1);
+
+							stackPlacement.add(p);
+						}
 					}
 				}
 

diff --git a/...ging/src/test/java/com/github/skjolber/packing/visualizer/packaging/LaffPackagerTest.java b/...ging/src/test/java/com/github/skjolber/packing/visualizer/packaging/LaffPackagerTest.java
@@ -130,15 +130,15 @@ public void testLAFFPackager() throws Exception {
 	}
 
 	protected void write(PackagerResult result) throws Exception {
-		write(result, false);
+		write(result, true);
 	}
 
 	protected void write(Container container) throws Exception {
-		write(container, false);
+		write(container, true);
 	}
 
 	protected void write(List<Container> packList) throws Exception {
-		write(packList, false);
+		write(packList, true);
 	}
 
 }