Merge pull request #7 from jyrkioraskari/master

V2.6

IFCtoLBDGeometry/pom.xml

@@ -74,5 +74,5 @@
 			</plugin>
 		</plugins>
 	</build>
-	<version>2.3</version>
+	<version>2.6</version>
 </project>

IFCtoLBDGeometry/src/main/java/de/rwth_aachen/dc/lbd/IFCBoundingBoxes.java

@@ -32,56 +32,56 @@ public BoundingBox getBoundingBox(String guid) {
 		BoundingBox boundingBox = null;
 
 		IfcOpenShellEntityInstance renderEngineInstance;
-		renderEngineInstance = renderEngineModel.getInstancesByGuid().get(guid);
+		renderEngineInstance = renderEngineModel.getInstanceFromGUID(guid);
 
 		if (renderEngineInstance == null) {
 			return null;
 		}
 		IfcGeomServerClientEntity geometry = renderEngineInstance.generateGeometry();
-		 if (geometry != null && geometry.getIndices().length > 0) {
-				boundingBox = new BoundingBox();
-				double[] tranformationMatrix = new double[16];
-				if (renderEngineInstance.getTransformationMatrix() != null) {
-				    tranformationMatrix = renderEngineInstance.getTransformationMatrix();
-				    tranformationMatrix = Matrix.changeOrientation(tranformationMatrix);
-				} else {
-				    Matrix.setIdentityM(tranformationMatrix, 0);
-				}
-
-				float[] vertices=geometry.getPositions();
-				for (int i = 0; i < geometry.getPositions().length; i+=3) {
-				    processExtends(boundingBox, tranformationMatrix, vertices[i],vertices[i+1],vertices[i+2]);
-				}
-			    }
+		if (geometry != null && geometry.getIndices().length > 0) {
+			boundingBox = new BoundingBox();
+			double[] tranformationMatrix = new double[16];
+			if (renderEngineInstance.getTransformationMatrix() != null) {
+				tranformationMatrix = renderEngineInstance.getTransformationMatrix();
+				tranformationMatrix = Matrix.changeOrientation(tranformationMatrix);
+			} else {
+				Matrix.setIdentityM(tranformationMatrix, 0);
+			}
+
+			float[] vertices = geometry.getPositions();
+			for (int i = 0; i < geometry.getPositions().length; i += 3) {
+				processExtends(boundingBox, tranformationMatrix, vertices[i], vertices[i + 1], vertices[i + 2]);
+			}
+		}
 		return boundingBox;
 	}
 
 	private IfcOpenShellModel getRenderEngineModel(File ifcFile) throws RenderEngineException, IOException {
 		String ifcGeomServerLocation = OperatingSystemCopyOf_IfcGeomServer.getIfcGeomServer();
-		System.out.println("ifcGeomServerLocation: "+ifcGeomServerLocation);
+		System.out.println("ifcGeomServerLocation: " + ifcGeomServerLocation);
 		Path ifcGeomServerLocationPath = Paths.get(ifcGeomServerLocation);
 		IfcOpenShellEngine ifcOpenShellEngine = new IfcOpenShellEngine(ifcGeomServerLocationPath, false, false);
 		System.out.println("init");
 		ifcOpenShellEngine.init();
 		System.out.println("init done");
 		FileInputStream ifcFileInputStream = new FileInputStream(ifcFile);
 
-		System.out.println("ifcFile: "+ifcFile);
+		System.out.println("ifcFile: " + ifcFile);
 		IfcOpenShellModel model = ifcOpenShellEngine.openModel(ifcFileInputStream);
 		System.out.println("IfcOpenShell opens ifc: " + ifcFile.getAbsolutePath());
-		
+
 		model.generateGeneralGeometry();
 		return model;
 	}
 
-	  private void processExtends(BoundingBox boundingBox, double[] transformationMatrix, double x, double y, double z) {
-			double[] result = new double[4];
-			Matrix.multiplyMV(result, 0, transformationMatrix, 0, new double[] { x, y, z, 1 }, 0);
-			x = result[0];
-			y = result[1];
-			z = result[2];
-			Point3d point = new Point3d(x / 1000, y / 1000, z / 1000);
-			boundingBox.add(point);
-		    }
+	private void processExtends(BoundingBox boundingBox, double[] transformationMatrix, double x, double y, double z) {
+		double[] result = new double[4];
+		Matrix.multiplyMV(result, 0, transformationMatrix, 0, new double[] { x, y, z, 1 }, 0);
+		x = result[0];
+		y = result[1];
+		z = result[2];
+		Point3d point = new Point3d(x / 1000, y / 1000, z / 1000);
+		boundingBox.add(point);
+	}
 
 }

IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcGeomServerClient.java

@@ -751,7 +751,14 @@ public IfcGeomServerClientEntity getNext() throws RenderEngineException {
 			askForMore();
 
 			return e.getEntity();
-		} catch (IOException e) {
+		} 
+		// JO 2020
+		catch (java.io.EOFException e) {
+			// Do nothing.The file is read!
+			return null;
+		}
+		catch (IOException e) {
+			e.printStackTrace();
 			terminate();
 			return null;
 		}

IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellEngine.java

@@ -47,7 +47,9 @@
 import java.io.InputStream;
 import java.nio.file.Path;
 
+import org.bimserver.plugins.renderengine.RenderEngine;
 import org.bimserver.plugins.renderengine.RenderEngineException;
+import org.bimserver.plugins.renderengine.RenderEngineModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellEnginePlugin.java

@@ -53,7 +53,9 @@
 import org.bimserver.models.store.StoreFactory;
 import org.bimserver.plugins.PluginConfiguration;
 import org.bimserver.plugins.PluginContext;
+import org.bimserver.plugins.renderengine.RenderEngine;
 import org.bimserver.plugins.renderengine.RenderEngineException;
+import org.bimserver.plugins.renderengine.RenderEnginePlugin;
 import org.bimserver.plugins.renderengine.VersionInfo;
 import org.bimserver.shared.exceptions.PluginException;
 import org.slf4j.Logger;

IFCtoLBDGeometry/src/main/java/org/ifcopenshell/IfcOpenShellModel.java

@@ -48,9 +48,15 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collection;
 import java.util.HashMap;
 
+import org.bimserver.plugins.renderengine.EntityNotFoundException;
 import org.bimserver.plugins.renderengine.RenderEngineException;
+import org.bimserver.plugins.renderengine.RenderEngineFilter;
+import org.bimserver.plugins.renderengine.RenderEngineInstance;
+import org.bimserver.plugins.renderengine.RenderEngineModel;
+import org.bimserver.plugins.renderengine.RenderEngineSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,8 +66,8 @@ public class IfcOpenShellModel  {
 	private InputStream ifcInputStream;
 
 	private HashMap<Integer,IfcOpenShellEntityInstance> instancesById;
-	private HashMap<String,IfcOpenShellEntityInstance> instancesByGuid;
-
+	private HashMap<String,IfcOpenShellEntityInstance> instancesByGUID;
+	
 	private IfcGeomServerClient client;
 
 	public IfcOpenShellModel(IfcGeomServerClient client, InputStream ifcInputStream) throws RenderEngineException, IOException {
@@ -92,25 +98,27 @@ public void close() throws RenderEngineException {
 	public void generateGeneralGeometry() throws RenderEngineException {
 		// We keep track of instances ourselves
 		instancesById = new HashMap<Integer,IfcOpenShellEntityInstance>();
-		instancesByGuid = new HashMap<String,IfcOpenShellEntityInstance>();
+		instancesByGUID = new HashMap<String,IfcOpenShellEntityInstance>();
 
 		final double t0 = (double) System.nanoTime();
 
 		while (client.hasNext()) {
 			IfcGeomServerClientEntity next = client.getNext();
-			// Store the instance in our dictionary
+			if(next==null) // JO 2020
+				break;
 			IfcOpenShellEntityInstance instance = new IfcOpenShellEntityInstance(next);
+			System.out.println("GEN GEOM:  "+next.getGuid());
+			// Store the instance in our dictionary
 			instancesById.put(next.getId(), instance);
-			instancesByGuid.put(next.getGuid(), instance);
-			System.out.println(next.getGuid());
+			instancesByGUID.put(next.getGuid(), instance);
 		}
 
 		final double t1 = (double) System.nanoTime();
 
 		LOGGER.debug(String.format("Took %.2f seconds to obtain representations for %d entities", (t1-t0) / 1.E9, instancesById.size()));
 	}
 
-	public IfcOpenShellEntityInstance getInstanceFromExpressId(int oid) throws RenderEngineException {
+	public IfcOpenShellEntityInstance getInstanceFromExpressId(int oid) {
 		if ( instancesById.containsKey(oid) ) {
 			return instancesById.get(oid);
 		} else {
@@ -121,9 +129,11 @@ public IfcOpenShellEntityInstance getInstanceFromExpressId(int oid) throws Rende
 		    return null;
 		}
 	}
-
-	public HashMap<String, IfcOpenShellEntityInstance> getInstancesByGuid() {
-		return instancesByGuid;
+	public IfcOpenShellEntityInstance getInstanceFromGUID(String guid) {
+		if ( instancesByGUID.containsKey(guid) ) {
+			return instancesByGUID.get(guid);
+		} else {
+		    return null;
+		}
 	}
-
 }

IFCtoLBD_OpenAPI/.settings/org.eclipse.wst.common.component

@@ -3,7 +3,10 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-        <dependent-module archiveName="IFCtoLBD-2.4.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD/IFCtoLBD">
+        <dependent-module archiveName="IFCtoLBD-2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD/IFCtoLBD">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="IFCtoLBDGeometry-2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBDGeometry/IFCtoLBDGeometry">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="IFCtoRDF-0.5J-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoRDF/IFCtoRDF">

IFCtoLBD_OpenAPI/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.rwth-aachen.dc.ifctolbd</groupId>
 	<artifactId>IFCtoLBD_OpenAPI</artifactId>
-	<version>2.4</version>
+	<version>2.6</version>
 	<packaging>war</packaging>
 	<name>IFCtoLBD OpenAPI Interface</name>
 
@@ -128,7 +128,7 @@
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>IFCtoLBD</artifactId>
-			<version>2.4</version>
+			<version>2.6</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.jena/apache-jena-libs -->