X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Futils%2FP3DUtil.java;h=18d5b2cd2e9e0e908e532e619e22890b0f7f7d56;hb=15e688c6d6148fdbda457e5f55bdea4259c97aa8;hp=0d656b054de0e724e72d4592597fa46aa52b4a17;hpb=d00bd5522f6a92bbfeb2a72a7d28ba25c3f36fed;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/utils/P3DUtil.java b/org.simantics.plant3d/src/org/simantics/plant3d/utils/P3DUtil.java
index 0d656b05..18d5b2cd 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/utils/P3DUtil.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/utils/P3DUtil.java
@@ -1,9 +1,13 @@
 package org.simantics.plant3d.utils;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Deque;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
@@ -23,10 +27,10 @@ import org.simantics.plant3d.scenegraph.controlpoint.PipingRules;
 import org.simantics.plant3d.utils.Item.Type;
 
 public class P3DUtil {
-    
-    public static List<Item> getEquipments() throws DatabaseException {
-        return getEquipments(Plant3D.URIs.Builtin);
-    }
+	
+	public static List<Item> getEquipments() throws DatabaseException {
+		return getEquipments(Plant3D.URIs.Builtin);
+	}
 	
 	public static List<Item> getEquipments(final String libUri) throws DatabaseException {
 		return Simantics.getSession().syncRequest(new Read<List<Item>>() {
@@ -44,12 +48,12 @@ public class P3DUtil {
 		});
 	}
 	
-	public static List<Item> getNozzles() throws DatabaseException {
+	public static List<Item> getNozzles(String libUri) throws DatabaseException {
 		return Simantics.getSession().syncRequest(new Read<List<Item>>() {
 			@Override
 			public List<Item> perform(ReadGraph graph) throws DatabaseException {
 				Plant3D p3d = Plant3D.getInstance(graph);
-				ItemQuery query = new ItemQuery(p3d.Nozzle, Plant3D.URIs.Builtin);
+				ItemQuery query = new ItemQuery(p3d.Nozzle, libUri);
 				return graph.syncRequest(query);
 			}
 		});
@@ -65,81 +69,91 @@ public class P3DUtil {
 		
 		@Override
 		public List<Item> perform(ReadGraph graph) throws DatabaseException {
-			Resource project = Simantics.getProject().get();
+//			Resource project = Simantics.getProject().get();
 			Resource builtins = graph.getResource(libUri);
-			List<Item> actions = getItems(graph, project,type);
+			List<Item> actions = new ArrayList<>();
+//			actions.addAll(getItems(graph, project,type));
 			actions.addAll(getItems(graph, builtins,type));
 			return actions;
 		}
 		
 		@Override
 		public boolean equals(Object obj) {
-		    if (obj.getClass() != this.getClass())
-		        return false;
-		    ItemQuery other = (ItemQuery)obj;
-		    if (!type.equals(other.type))
-		        return false;
-		    return libUri.equals(other.libUri);
+			if (obj.getClass() != this.getClass())
+				return false;
+			ItemQuery other = (ItemQuery)obj;
+			if (!type.equals(other.type))
+				return false;
+			return libUri.equals(other.libUri);
 		}
 		
 		@Override
 		public int hashCode() {
-		    return type.hashCode() + libUri.hashCode();
+			return type.hashCode() + libUri.hashCode();
 		}
 	}
 	
-	public static List<Item> getEnds() throws DatabaseException {
+	public static List<Item> getEnds(String libUri) throws DatabaseException {
 		return Simantics.getSession().syncRequest(new Read<List<Item>>() {
 			@Override
 			public List<Item> perform(ReadGraph graph) throws DatabaseException {
 				Plant3D p3d = Plant3D.getInstance(graph);
-				ItemQuery query = new ItemQuery(p3d.EndComponent, Plant3D.URIs.Builtin);
+				ItemQuery query = new ItemQuery(p3d.EndComponent, libUri);
 				return graph.syncRequest(query);
 			}
 		});
 	}
 	
-	public static List<Item> getTurns() throws DatabaseException {
+	public static List<Item> getTurns(String libUri) throws DatabaseException {
 		return Simantics.getSession().syncRequest(new Read<List<Item>>() {
 			@Override
 			public List<Item> perform(ReadGraph graph) throws DatabaseException {
 				Plant3D p3d = Plant3D.getInstance(graph);
-				ItemQuery query = new ItemQuery(p3d.TurnComponent, Plant3D.URIs.Builtin);
+				ItemQuery query = new ItemQuery(p3d.TurnComponent, libUri);
 				return graph.syncRequest(query);
 			}
 		});
 	}
 	
-	public static List<Item> getInlines() throws DatabaseException {
+	public static List<Item> getInlines(String libUri) throws DatabaseException {
 		return Simantics.getSession().syncRequest(new Read<List<Item>>() {
 			@Override
 			public List<Item> perform(ReadGraph graph) throws DatabaseException {
 				Plant3D p3d = Plant3D.getInstance(graph);
-				ItemQuery query = new ItemQuery(p3d.InlineComponent, Plant3D.URIs.Builtin);
+				ItemQuery query = new ItemQuery(p3d.InlineComponent, libUri);
 				return graph.syncRequest(query);
 			}
 		});
 	}
 	
 	public static List<Item> filterUserComponents(List<Item> items) {
-	    List<Item> result = new ArrayList<Item>(items.size());
-	    for (Item i : items) {
-	        if (!i.isCode())
-	            result.add(i);
-	    }
-	    return result;
+		List<Item> result = new ArrayList<Item>(items.size());
+		for (Item i : items) {
+			if (!i.isCode())
+				result.add(i);
+		}
+		return result;
 	}
 	
 	private static List<Item> getItems(ReadGraph graph, Resource lib, Resource type) throws DatabaseException{
 		Plant3D p3d = Plant3D.getInstance(graph);
 		Layer0 l0 = Layer0.getInstance(graph);
 		List<Item> result = new ArrayList<Item>();
-		for (Resource r : graph.getObjects(lib, l0.ConsistsOf)) {
+		Set<Resource> processed = new HashSet<>();
+		Deque<Resource> stack = new ArrayDeque<Resource>();
+		stack.addAll(graph.getObjects(lib, l0.ConsistsOf));
+		stack.addAll(graph.getObjects(lib, p3d.ComponentLibrary_contains));
+		while (!stack.isEmpty()) {
+		    Resource r = stack.pop();
+		    if (processed.contains(r))
+		        continue;
+		    processed.add(r);
 			if (graph.isInstanceOf(r, type) ) {
 				Resource geom = graph.getPossibleObject(r,p3d.hasGeometry);
 				if (geom != null || graph.hasStatement(r,p3d.NonVisibleComponent)) {
 					
 					result.add(createItem(graph, r));
+					continue;
 				}
 			} 
 			if (graph.isInheritedFrom(r, type)) {
@@ -152,15 +166,20 @@ public class P3DUtil {
 				}
 				if (asserts) {		
 					result.add(createItem(graph, r));
+					continue;
 				}
 			}
+			if (graph.isInstanceOf(r, p3d.ComponentLibrary)) {
+			    stack.addAll(graph.getObjects(r, l0.ConsistsOf));
+		        stack.addAll(graph.getObjects(r, p3d.ComponentLibrary_contains));
+			}
 		}
 		Collections.sort(result, new Comparator<Item>() {
-		    @Override
-		    public int compare(Item o1, Item o2) {
-		        return o1.getName().compareTo(o2.getName());
-		    }
-        });
+			@Override
+			public int compare(Item o1, Item o2) {
+				return o1.getName().compareTo(o2.getName());
+			}
+		});
 		return result;
 	}
 	
@@ -186,10 +205,14 @@ public class P3DUtil {
 		if (graph.hasStatement(r, p3d.CodeComponent))
 			item.setCode(true);
 		if (graph.hasStatement(r, p3d.VariableAngleTurnComponent) ||
-		    graph.hasStatement(r, p3d.VariableLengthInlineComponent))
+			graph.hasStatement(r, p3d.VariableLengthInlineComponent))
 			item.setVariable(true);
+		if (graph.hasStatement(r, p3d.AdjustableLengthInlineComponent))
+		    item.setModifiable(true);
 		if (graph.hasStatement(r, p3d.SizeChangeComponent))
 			item.setSizeChange(true);
+		if (graph.hasStatement(r, p3d.RotateComponent))
+            item.setRotated(true);
 		return item;
 	}
 	
@@ -204,38 +227,42 @@ public class P3DUtil {
 	}
 	
 	public static void finalizeDBLoad(P3DRootNode rootNode) throws Exception{
-	    for (INode node : rootNode.getChild()) {
-            if (node instanceof PipeRun) {
-                for (PipelineComponent pc : ((PipeRun) node).getChild())
-                    pc.sync();
-            } else if (node instanceof Equipment) {
-                for (PipelineComponent pc : ((Equipment) node).getChild())
-                    pc.sync();
-            }
-        }
-        
-        for (INode node : rootNode.getChild()) {
-            if (node instanceof PipeRun) {
-                for (PipelineComponent pc : ((PipeRun) node).getChild())
-                    pc.sync2();
-            } else if (node instanceof Equipment) {
-                for (PipelineComponent pc : ((Equipment) node).getChild())
-                    pc.sync2();
-            }
-        }
-        for (INode node : rootNode.getChild()) {
-            if (node instanceof PipeRun) {
-                PipingRules.validate((PipeRun)node);
-            }
-        }
-        PipingRules.setEnabled(true);
+		for (INode node : rootNode.getChild()) {
+			if (node instanceof PipeRun) {
+				for (PipelineComponent pc : ((PipeRun) node).getChild())
+					pc.sync();
+			} else if (node instanceof Equipment) {
+				for (PipelineComponent pc : ((Equipment) node).getChild())
+					pc.sync();
+			}
+		}
+		
+		for (INode node : rootNode.getChild()) {
+			if (node instanceof PipeRun) {
+				for (PipelineComponent pc : ((PipeRun) node).getChild())
+					pc.sync2();
+			} else if (node instanceof Equipment) {
+				for (PipelineComponent pc : ((Equipment) node).getChild())
+					pc.sync2();
+			}
+		}
+		for (INode node : rootNode.getChild()) {
+			if (node instanceof PipeRun) {
+				PipingRules.validate((PipeRun)node);
+			}
+		}
+	}
+	
+   public static void finalizeDBLoad2(P3DRootNode rootNode) throws Exception{
+       PipingRules.setEnabled(true);
         for (INode node : rootNode.getChild()) {
             if (node instanceof PipeRun) {
                 PipeRun run = (PipeRun)node;
                 for (PipeControlPoint pcp : run.getControlPoints())
-                    PipingRules.positionUpdate(pcp);        
+                    PipingRules.positionUpdate(pcp);
+                    //PipingRules.requestUpdate(pcp);
             }
         }
-	}
+   }
 
 }