X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2Fcontrolpoint%2FPipingRules.java;h=f5c6f876a98d507eca60c31bcd809dd8f25bb37d;hb=refs%2Fchanges%2F60%2F3460%2F1;hp=393dc85e1ab005bae0e56c515e5ebc238cc99835;hpb=a1e1faa6915445e786f482170576b9c9d0f5d982;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java
index 393dc85e..f5c6f876 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java
@@ -375,6 +375,7 @@ public class PipingRules {
 
 	}
 
+	@SuppressWarnings("unused")
 	private static boolean calculateOffset(Vector3d startPoint, Vector3d endPoint, ArrayList<PipeControlPoint> list, Vector3d dir, Vector3d offset) {
 		boolean hasOffsets = false;
 		List<PipeControlPoint> offsets = new ArrayList<PipeControlPoint>(list.size());
@@ -684,6 +685,11 @@ public class PipingRules {
 			// must be removed
 			
 			if (icp.isDeletable()) {
+			    if (!allowInsertRemove) {
+			        icp.setLength(0.0001);
+			        triedIR = true;
+			        return false;
+			    }
 				if (DEBUG)
 					System.out.println("PipingRules.updateVariableLength removing " + icp);
 				icp._remove();
@@ -713,7 +719,7 @@ public class PipingRules {
 													// position of the
 													// component
 				dir.add(prevPos);
-				PipeControlPoint scp = insertStraight(prev, icp, dir, length);
+				insertStraight(prev, icp, dir, length);
 				return true;
 			} else {
 				triedIR = true;
@@ -1367,6 +1373,7 @@ public class PipingRules {
 	// end,Point3d endPoint, Vector3d dir, boolean hasOffsets,int iter, boolean
 	// reversed, ArrayList<ExpandIterInfo> toRemove) throws TransactionException
 	// {
+	@SuppressWarnings("unused")
 	private static void processPathLegNoOffset(UpdateStruct2 u) throws Exception {
 		if (DEBUG)
 			System.out.println("PipingRules.processPathLeg " + u.start + " " + u.end);
@@ -1871,7 +1878,6 @@ public class PipingRules {
 			// this should not be possible
 			throw new RuntimeException("VariableLengthComponent " + splittingComponent + " is not connected to anything.");
 		}
-		double reservedLength = splittingComponent.getControlPoint().getLength();
 		double newLength = newComponent.getControlPoint().getLength();
 		
 		
@@ -1907,21 +1913,20 @@ public class PipingRules {
 		vn.interpolate(next, 0.5);
 		
 		
-		PipeControlPoint newVariableLengthCP = null;//insertStraight(pcp1, pcp2, pos, length);
 		if (nextCP == null) {
 			newCP.insert(splittingCP, Direction.NEXT);
-			newVariableLengthCP = insertStraight(newCP, Direction.NEXT, new Vector3d(vn), ln);
+			insertStraight(newCP, Direction.NEXT, new Vector3d(vn), ln);
 			splittingCP.setWorldPosition(new Vector3d(vp));
 //			ControlPointTools.setWorldPosition(splittingCP, vp);
 //			splittingCP.setRelatedScalarDouble(ProcessResource.plant3Dresource.HasLength, lp);
 		} else if (prevCP == null) {
 			newCP.insert(splittingCP, Direction.PREVIOUS);
-			newVariableLengthCP = insertStraight(newCP, Direction.PREVIOUS, new Vector3d(vp), lp);
+			insertStraight(newCP, Direction.PREVIOUS, new Vector3d(vp), lp);
 			splittingCP.setWorldPosition(new Vector3d(vn));
 //			splittingCP.setRelatedScalarDouble(ProcessResource.plant3Dresource.HasLength, ln);
 		} else {
 			newCP.insert(splittingCP, nextCP);
-			newVariableLengthCP = insertStraight(newCP, nextCP, new Vector3d(vn), ln);
+			insertStraight(newCP, nextCP, new Vector3d(vn), ln);
 			splittingCP.setWorldPosition(new Vector3d(vp));
 //			splittingCP.setRelatedScalarDouble(ProcessResource.plant3Dresource.HasLength, lp);
 		}