X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FTurnComponent.java;h=ff12143bcf01dd4497299aad442e42bdd1319ff7;hb=53d55c24c779745f188bdb18d32f71d20acb61b2;hp=0205f5a318f9778531a36160414ad99ab5d4f497;hpb=f36217aeeb09c0c46f99886ee99772156ce9cfe6;p=simantics%2F3d.git diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java index 0205f5a3..ff12143b 100644 --- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java +++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java @@ -64,18 +64,18 @@ public class TurnComponent extends PipelineComponent { } public boolean isVariableAngle() { - return !controlPoint.isFixed(); - } + return !controlPoint.isFixed(); + } @Override public void updateParameters() { - super.updateParameters(); - if (!isVariableAngle()) { - Map calculated = getCalculatedParameters(); - if (calculated.containsKey("length")) { - controlPoint.setLength((Double)calculated.get("length")); - } - } + super.updateParameters(); + if (!isVariableAngle()) { + Map calculated = getCalculatedParameters(); + if (calculated.containsKey("length")) { + controlPoint.setLength((Double)calculated.get("length")); + } + } } @RelatedGetValue(Plant3D.URIs.HasTurnAngle) @@ -85,9 +85,9 @@ public class TurnComponent extends PipelineComponent { @RelatedSetValue(Plant3D.URIs.HasTurnAngle) public void setTurnAngle(Double a) { - if (!getControlPoint().isFixed()) - return; - getControlPoint().setTurnAngle(a); + if (!getControlPoint().isFixed()) + return; + getControlPoint().setTurnAngle(a); } @GetPropertyValue(name="Turn Angle", value="turn angle", tabId = "Default") @@ -103,61 +103,61 @@ public class TurnComponent extends PipelineComponent { } @RelatedGetValue(Plant3D.URIs.HasRotationAngle) - @GetPropertyValue(name="Rotation Angle", value=Plant3D.URIs.HasRotationAngle, tabId = "Default") - public Double getRotationAngle() { - if (!controlPoint.isFixed()) - return null; - Double d = controlPoint.getRotationAngle(); - if (d == null) - return 0.0; - return MathTools.radToDeg(d); - } - @RelatedSetValue(Plant3D.URIs.HasRotationAngle) - @SetPropertyValue(value=Plant3D.URIs.HasRotationAngle) - public void setRotationAngle(Double angle) { - if (!controlPoint.isFixed()) - return; - - if (angle == null || Double.isInfinite(angle) || Double.isNaN(angle)) { - return; - } - angle = MathTools.degToRad(angle); - if (controlPoint.getRotationAngle() != null && Math.abs(controlPoint.getRotationAngle()-angle) < MathTools.NEAR_ZERO) - return; - controlPoint.setRotationAngle(angle); - try { - PipingRules.requestUpdate(getControlPoint()); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @RelatedGetValue(Plant3D.URIs.IsReversed) - @GetPropertyValue(name="Reverse", value=Plant3D.URIs.IsReversed, tabId = "Default") - public Boolean isReversed() { - if (!controlPoint.isFixed()) - return null; - Boolean d = controlPoint._getReversed(); - return d; - } - @RelatedSetValue(Plant3D.URIs.IsReversed) - //@SetPropertyValue(value=Plant3D.URIs.IsReversed) - public void setReversed(Boolean reverse) { - if (!controlPoint.isFixed()) - return; - - if (reverse == null) { - return; - } - controlPoint.setReversed(reverse); - try { - PipingRules.requestUpdate(getControlPoint()); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + @GetPropertyValue(name="Rotation Angle", value=Plant3D.URIs.HasRotationAngle, tabId = "Default") + public Double getRotationAngle() { + if (!controlPoint.isFixed()) + return null; + Double d = controlPoint.getRotationAngle(); + if (d == null) + return 0.0; + return MathTools.radToDeg(d); + } + @RelatedSetValue(Plant3D.URIs.HasRotationAngle) + @SetPropertyValue(value=Plant3D.URIs.HasRotationAngle) + public void setRotationAngle(Double angle) { + if (!controlPoint.isFixed()) + return; + + if (angle == null || Double.isInfinite(angle) || Double.isNaN(angle)) { + return; + } + angle = MathTools.degToRad(angle); + if (controlPoint.getRotationAngle() != null && Math.abs(controlPoint.getRotationAngle()-angle) < MathTools.NEAR_ZERO) + return; + controlPoint.setRotationAngle(angle); + try { + PipingRules.requestUpdate(getControlPoint()); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @RelatedGetValue(Plant3D.URIs.IsReversed) + @GetPropertyValue(name="Reverse", value=Plant3D.URIs.IsReversed, tabId = "Default") + public Boolean isReversed() { + if (!controlPoint.isFixed()) + return null; + Boolean d = controlPoint._getReversed(); + return d; + } + @RelatedSetValue(Plant3D.URIs.IsReversed) + //@SetPropertyValue(value=Plant3D.URIs.IsReversed) + public void setReversed(Boolean reverse) { + if (!controlPoint.isFixed()) + return; + + if (reverse == null) { + return; + } + controlPoint.setReversed(reverse); + try { + PipingRules.requestUpdate(getControlPoint()); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } @Override protected double[] getColor() {