X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FInlineComponent.java;h=d3e8742c9db93019bc3fe8d087d146a8fa5c2bb8;hb=1ca09aa9bae3ea1e3382ceff0a2a09427f173286;hp=3ec6b3547c317c5022a5bac7804e4288eef7e096;hpb=b6cccb572f043f3247274c52b353577ba3f1dcb1;p=simantics%2F3d.git diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java index 3ec6b354..d3e8742c 100644 --- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java +++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java @@ -120,16 +120,21 @@ public class InlineComponent extends PipelineComponent { public void updateParameters() { super.updateParameters(); if (!isVariableLength()) { - Map calculated = getTotalParameters(); - if (calculated.containsKey("length")) { - controlPoint.setLength((Double)calculated.get("length")); - } + Map calculated = getCalculatedParameters(); + if (calculated.containsKey("offset")) { controlPoint.setOffset((Double)calculated.get("offset")); componentCalculatedOffset = true; } else { componentCalculatedOffset = false; } + + Map total = getTotalParameters(); + + if (total.containsKey("length")) { + controlPoint.setLength((Double)total.get("length")); + } + PipingRules.requestUpdate(getControlPoint()); } } @@ -165,7 +170,7 @@ public class InlineComponent extends PipelineComponent { if (!Double.isNaN(controlPoint.getLength()) && controlPoint.isVariableLength()) map.put("length", controlPoint.getLength()); if (controlPoint.isDualInline()) { - PipeControlPoint sub = controlPoint.getSubPoint().get(0); + PipeControlPoint sub = controlPoint.getDualSub(); PipeRun pipeRun2 = sub.getPipeRun(); if (pipeRun2 != null) { map.put("radius2", pipeRun2.getPipeDiameter() * 0.5);