if (!PipingRules.enabled)
return false;
- if (requestUpdates.size() == 0)
- return false;
-
- List<PipeControlPoint> temp = new ArrayList<PipeControlPoint>(requestUpdates.size());
- synchronized(updateMutex) {
+ List<PipeControlPoint> temp;
+ synchronized(updateMutex) {
+ if (requestUpdates.size() == 0)
+ return false;
+
+ temp = new ArrayList<PipeControlPoint>(requestUpdates.size());
temp.addAll(requestUpdates);
requestUpdates.clear();
}
System.out.println("PipingRules.updateInlineControlPoint() " + pcp);
PipeControlPoint start = pcp.findPreviousEnd();
updatePathLegNext(start, pcp, PathLegUpdateType.NONE);
+
+ if (pcp.isOffset()) {
+ // Adjusting the rotation angle of an offset component may change variable angle turns
+ PipeControlPoint end = pcp.findNextEnd();
+ if (end.isVariableAngle()) {
+ updatePathLegNext(end, end, PathLegUpdateType.NONE);
+ }
+ if (start.isVariableAngle()) {
+ updatePathLegPrev(start, start, PathLegUpdateType.NONE);
+ }
+ }
}
private static PipeControlPoint insertElbow(PipeControlPoint pcp1, PipeControlPoint pcp2, Vector3d pos) throws Exception{
continue;
double curr = gapObj.d;
int d = 1;
- while (curr < -MIN_INLINE_LENGTH) {
- GapObj next = i+d >= 0 ? gaps.get(i+d) : null;
+ while (d < gaps.size() && curr < -MIN_INLINE_LENGTH) {
+ GapObj next = i+d < gaps.size() ? gaps.get(i+d) : null;
GapObj prev = i-d >= 0 ? gaps.get(i-d) : null;
if (next != null && next.gap == Gap.SPACE) {
double move = Math.min(-curr, next.d);
pcp.first.setWorldPosition(p);
}
}
- if (curr < -MIN_INLINE_LENGTH && prev != null && prev.gap == Gap.SPACE) {
+ else if (prev != null && prev.gap == Gap.SPACE) {
double move = Math.min(-curr, prev.d);
curr+= move;
- next.d -= move;
- if (next.d < MIN_INLINE_LENGTH)
- next.gap = Gap.ATTACHED;
+ prev.d -= move;
+ if (prev.d < MIN_INLINE_LENGTH)
+ prev.gap = Gap.ATTACHED;
Vector3d mv = new Vector3d(dir);
mv.normalize();
mv.scale(-move);
pcp.first.setWorldPosition(p);
}
}
+ else {
+ d++;
+ }
}
}
} else {
else if (d < -0.9999)
return tr*2.0; // point following turn is directly behind the nozzle, in theory, we should return Double.Inf...
- double curr = tr*0.1;
+ double curr = 0.0;
int iter = 10;
Vector3d tp0 = tcp.getPosition();
try {
while (iter > 0) {
Vector3d tp = new Vector3d(dir);
tp.scaleAdd(curr, dp);
- tcp.setPosition(tp);
+ tcp._setPosition(tp); // no firing of listeners here
if (other == ne) {
dir2 = pathLegDirection(tcp);
} else {
}
double a = dir.angle(dir2);
- double t = Math.tan(a * 0.5);
- double R = 0.0;
- if (t > MathTools.NEAR_ZERO)
- R = tr * t;
+
+ // other is directly between dcp and tcp, a zero angle turn should do
+ if (Math.PI - a <= MathTools.NEAR_ZERO)
+ return 0.0;
+
+ double R = tr * Math.tan(a * 0.5);
if (R <= curr)
break;
curr = R*1.001;
}
}
finally {
- tcp.setPosition(tp0);
+ tcp._setPosition(tp0); // return the original value
}
return curr;
}
return tcp.getTurnAngle();
return Math.PI; // FIXME : argh
}
- double turnAngle = prev.angle(next);
+
+ final boolean isDegenerate = prev.lengthSquared() < MathTools.NEAR_ZERO || next.lengthSquared() < MathTools.NEAR_ZERO;
+ double turnAngle = isDegenerate ? 0.0 : prev.angle(next);
Vector3d turnAxis = new Vector3d();
turnAxis.cross(prev, next);
return Math.PI; // FIXME : argh
}
- Quat4d q = PipeControlPoint.getControlPointOrientationQuat(dir, tcp.getRotationAngle() != null ? tcp.getRotationAngle() : 0.0);
+ Quat4d q = tcp.getControlPointOrientationQuat(dir, tcp.getRotationAngle() != null ? tcp.getRotationAngle() : 0.0);
Vector3d v = new Vector3d();
MathTools.rotate(q, MathTools.Y_AXIS,v);
tcp.setTurnAxis(v);
public static void validate(PipeRun pipeRun) {
if (pipeRun == null)
return;
- Collection<PipeControlPoint> pcps = pipeRun.getControlPoints();
- int count = 0;
- //System.out.println("Validate " + pipeRun.getName());
- for (PipeControlPoint pcp : pcps) {
- if (pcp.getParentPoint() == null || pcp.getParentPoint().getPipeRun() != pipeRun)
- count++;
- }
- List<PipeControlPoint> runPcps = getControlPoints(pipeRun);
- if (runPcps.size() != count) {
- System.out.println("Run " + pipeRun.getName() + " contains unconnected control points, found " + runPcps.size() + " connected, " + pcps.size() + " total.");
+ synchronized (ruleMutex) {
+ Collection<PipeControlPoint> pcps = pipeRun.getControlPoints();
+ int count = 0;
+ //System.out.println("Validate " + pipeRun.getName());
for (PipeControlPoint pcp : pcps) {
- if (!runPcps.contains(pcp)) {
- System.out.println("Unconnected " + pcp + " " + pcp.getPipelineComponent());
- }
+ if (pcp.getParentPoint() == null || pcp.getParentPoint().getPipeRun() != pipeRun)
+ count++;
}
- }
- for (PipeControlPoint pcp : pcps) {
- if (pcp.getPipeRun() == null) {
- System.out.println("PipeRun ref missing " + pcp + " " + pcp.getPipelineComponent());
- }
- if (!pcp.isDirected() && pcp.getNext() == null && pcp.getPrevious() == null)
- System.out.println("Orphan undirected " + pcp + " " + pcp.getPipelineComponent());
- }
- for (PipeControlPoint pcp : pcps) {
- if (pcp.getParentPoint() == null) {
- PipeControlPoint sub = null;
- if (pcp.isDualInline())
- sub = pcp.getDualSub();
- PipeControlPoint next = pcp.getNext();
- PipeControlPoint prev = pcp.getPrevious();
- if (next != null) {
- if (!(next.getPrevious() == pcp || next.getPrevious() == sub)) {
- System.out.println("Inconsistency between " + pcp + " -> " +next );
- }
+ List<PipeControlPoint> runPcps = getControlPoints(pipeRun);
+ if (runPcps.size() != count) {
+ System.out.println("Run " + pipeRun.getName() + " contains unconnected control points, found " + runPcps.size() + " connected, " + pcps.size() + " total.");
+ for (PipeControlPoint pcp : pcps) {
+ if (!runPcps.contains(pcp)) {
+ System.out.println("Unconnected " + pcp + " " + pcp.getPipelineComponent());
+ }
}
- if (prev != null) {
- PipeControlPoint prevParent = null;
- if (prev.isDualSub()) {
- prevParent = prev.getParentPoint();
- } else if (prev.isDualInline()) {
- System.out.println("Inconsistency between " + pcp + " <-- " +prev );
+ }
+ for (PipeControlPoint pcp : pcps) {
+ if (pcp.getPipeRun() == null) {
+ System.out.println("PipeRun ref missing " + pcp + " " + pcp.getPipelineComponent());
+ }
+ if (!pcp.isDirected() && pcp.getNext() == null && pcp.getPrevious() == null)
+ System.out.println("Orphan undirected " + pcp + " " + pcp.getPipelineComponent());
+ }
+ for (PipeControlPoint pcp : pcps) {
+ if (pcp.getParentPoint() == null) {
+ PipeControlPoint sub = null;
+ if (pcp.isDualInline())
+ sub = pcp.getDualSub();
+ PipeControlPoint next = pcp.getNext();
+ PipeControlPoint prev = pcp.getPrevious();
+ if (next != null) {
+ if (!(next.getPrevious() == pcp || next.getPrevious() == sub)) {
+ System.out.println("Inconsistency between " + pcp + " -> " +next );
+ }
}
- if (!(prev.getNext() == pcp && (prevParent == null || prevParent.getNext() == pcp))) {
- System.out.println("Inconsistency between " + pcp + " <-- " +prev );
+ if (prev != null) {
+ PipeControlPoint prevParent = null;
+ if (prev.isDualSub()) {
+ prevParent = prev.getParentPoint();
+ } else if (prev.isDualInline()) {
+ System.out.println("Inconsistency between " + pcp + " <-- " +prev );
+ }
+ if (!(prev.getNext() == pcp && (prevParent == null || prevParent.getNext() == pcp))) {
+ System.out.println("Inconsistency between " + pcp + " <-- " +prev );
+ }
}
}
}