X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Factions%2FRoutePipeAction.java;h=a4c04b3e321e0b11f0eddc51677f1e21baa3f673;hb=refs%2Fchanges%2F20%2F3420%2F1;hp=64d2d8c6e6c84d7c7f70ae7bd1ab2a90313ea536;hpb=43b9a071783377f64924bb0c2f1930fb49316f6f;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java
index 64d2d8c6..a4c04b3e 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java
@@ -13,6 +13,7 @@ import javax.vecmath.Point3d;
 import javax.vecmath.Tuple3d;
 import javax.vecmath.Vector3d;
 
+import org.simantics.db.Resource;
 import org.simantics.g3d.math.MathTools;
 import org.simantics.g3d.math.Ray;
 import org.simantics.g3d.scenegraph.NodeMap;
@@ -23,6 +24,7 @@ import org.simantics.g3d.vtk.swt.InteractiveVtkComposite;
 import org.simantics.g3d.vtk.swt.vtkSwtAction;
 import org.simantics.g3d.vtk.utils.vtkUtil;
 import org.simantics.plant3d.Activator;
+import org.simantics.plant3d.gizmo.ConstraintPointGizmo;
 import org.simantics.plant3d.gizmo.SplitPointSelectionGizmo;
 import org.simantics.plant3d.gizmo.TerminalSelectionGizmo;
 import org.simantics.plant3d.scenegraph.EndComponent;
@@ -61,8 +63,9 @@ public class RoutePipeAction extends vtkSwtAction {
 
 	private TranslateAxisGizmo translateAxisGizmo = new TranslateAxisGizmo();
 	private SplitPointSelectionGizmo splitPointSelectionGizmo;
+	private ConstraintPointGizmo constraintPointGizmo;
 	private TerminalSelectionGizmo terminalSelectionGizmo;
-	private NodeMap<vtkProp,INode> nodeMap;
+	private NodeMap<Resource,vtkProp,INode> nodeMap;
 	
 	private enum ToolState{NOT_ACTIVE, INITIALIZING, SELECTING_POSITION, SELECTING_SPLIT, ROUTING};
 	private ToolState state = ToolState.NOT_ACTIVE;
@@ -93,6 +96,7 @@ public class RoutePipeAction extends vtkSwtAction {
 		nodeMap = root.getNodeMap();
 		splitPointSelectionGizmo = new SplitPointSelectionGizmo(panel);
 		terminalSelectionGizmo = new TerminalSelectionGizmo(panel);
+		constraintPointGizmo = new ConstraintPointGizmo(panel);
 		detector = new org.simantics.g3d.vtk.swt.ConstraintDetector(panel);
 	}
 	
@@ -111,7 +115,7 @@ public class RoutePipeAction extends vtkSwtAction {
 	public void deattach() {
 		deactivate();
 		startComponent = null;
-		nodeMap.commit("Route pipe");
+		
 		deattachUI();
 		super.deattach();
 		panel.refresh();
@@ -151,6 +155,8 @@ public class RoutePipeAction extends vtkSwtAction {
 			splitPointSelectionGizmo.deattach();
 		if (terminalSelectionGizmo.isAttached())
 			terminalSelectionGizmo.deattach();
+		if (constraintPointGizmo.isAttached())
+		    constraintPointGizmo.deattach();
 		if (infoActor != null) {
 			panel.getRenderer().RemoveActor(infoActor);
 			infoActor.Delete();
@@ -417,11 +423,23 @@ public class RoutePipeAction extends vtkSwtAction {
 		state = ToolState.SELECTING_SPLIT;
 	}
 	public void deactivate() {
-		for (PipelineComponent component : added) {
-			component.getControlPoint().setDeletable(true);
-		}
+	    if (added.size() > 0) {
+    	    for (PipelineComponent component : added) {
+    			component.getControlPoint().setDeletable(true);
+    		}
+		
+            for (PipelineComponent comp : added) {
+                PipingRules.requestUpdate(comp.getControlPoint());
+            }
+            try {
+                PipingRules.update();
+                nodeMap.commit("Route pipe");
+            } catch (Exception e) {
+                ExceptionUtils.logAndShowError(e);
+            }
+            added.clear();        
+        }
 		
-		added.clear();
 		startComponent.getControlPoint().setDeletable(startRemovable);
 
 		direction = null;
@@ -595,7 +613,10 @@ public class RoutePipeAction extends vtkSwtAction {
 	
 	private void updateConstraints() {
 	    detector.clearConstraints();
+	    constraintPointGizmo.clearPositions();
 	    if (hoverObject == null) {
+	        if (constraintPointGizmo.isAttached())
+	            constraintPointGizmo.deattach();
 	        return;
 	    }
 	    if (hoverObject instanceof Nozzle) {
@@ -608,10 +629,19 @@ public class RoutePipeAction extends vtkSwtAction {
 	        c.getEnds(p1, p2);
 	        detector.addContraintPoint(p1);
 	        detector.addContraintPoint(p2);
+	        detector.addContraintPoint(new Point3d(c.getWorldPosition()));
 	    } else if (hoverObject instanceof TurnComponent) {
 	        TurnComponent n = (TurnComponent)hoverObject;
             detector.addContraintPoint(new Point3d(n.getWorldPosition()));
 	    }
+	    if (detector.getConstraintPoints().size() > 0) {
+	        for (Point3d p : detector.getConstraintPoints()) {
+	            constraintPointGizmo.addPosition(new Vector3d(p));
+	        }
+	        if (constraintPointGizmo.isAttached())
+	            constraintPointGizmo.deattach();
+	        constraintPointGizmo.attach(panel);
+	    }
 	}
 	
 	@Override