X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Futils%2FP3DUtil.java;h=ab795acc23e413d48a298631e366d680f03d37c3;hb=b402711239498596d7dfada0c66bc6627e37e7e6;hp=71f844d866329fe2dac458d7e9c468c6eb28ce33;hpb=bbf50fc505117a5269f0aaff504eaa3dc57b9d31;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 71f844d8..ab795acc 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;
@@ -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,9 +69,10 @@ 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;
 		}
@@ -88,34 +93,34 @@ public class P3DUtil {
 		}
 	}
 	
-	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);
 			}
 		});
@@ -134,12 +139,21 @@ public class P3DUtil {
 		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,8 +166,13 @@ 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
@@ -169,7 +188,8 @@ public class P3DUtil {
 		Plant3D p3d = Plant3D.getInstance(graph);
 		String name = graph.getRelatedValue(r, l0.HasName);
 		String uri = graph.getURI(r);
-		Item item = new Item(uri, name);
+		String label = graph.getPossibleRelatedValue(r, l0.HasLabel);
+		Item item = new Item(uri, name, label);
 		if (graph.isInstanceOf(r, p3d.Equipment))
 			item.setType(Type.EQUIPMENT);
 		else if (graph.isInstanceOf(r, p3d.InlineComponent))
@@ -188,8 +208,12 @@ public class P3DUtil {
 		if (graph.hasStatement(r, p3d.VariableAngleTurnComponent) ||
 			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;
 	}
 	
@@ -230,16 +254,17 @@ public class P3DUtil {
 		}
 	}
 	
-   public static void finalizeDBLoad2(P3DRootNode rootNode) throws Exception{
-       PipingRules.setEnabled(true);
+    public static void finalizeDBLoad2(P3DRootNode rootNode) throws Exception {
+        PipingRules.setEnabled(true);
         for (INode node : rootNode.getChild()) {
             if (node instanceof PipeRun) {
-                PipeRun run = (PipeRun)node;
+                PipeRun run = (PipeRun) node;
                 for (PipeControlPoint pcp : run.getControlPoints())
-                    PipingRules.positionUpdate(pcp);
-                    //PipingRules.requestUpdate(pcp);
+                    if (pcp.asPathLegEnd())
+                        PipingRules.requestUpdate(pcp);
             }
         }
-   }
+        PipingRules.update();
+    }
 
 }