redo relaxed validation

This commit is contained in:
Branislav Stojkovic
2019-03-23 19:11:06 +01:00
parent 0b8952e354
commit 9fd5a8fe96
4 changed files with 19 additions and 9 deletions
@@ -1258,15 +1258,15 @@ public class Presenter implements IPlugInPort {
} }
} }
// for (int i = 0; i < controlPoints.length - 1; i++) { for (int i = 0; i < controlPoints.length - 1; i++) {
// for (int j = i + 1; j < controlPoints.length; j++) { for (int j = i + 1; j < controlPoints.length; j++) {
// if (controlPoints[i] != null && controlPoints[j] != null && controlPoints[i].equals(controlPoints[j])) { if (controlPoints[i] != null && controlPoints[j] != null && controlPoints[i].equals(controlPoints[j])) {
// // Control points collision detected, cannot make // Control points collision detected, cannot make
// // this move. // this move.
// return null; return null;
// } }
// } }
// } }
} }
// Update all points to new location. // Update all points to new location.
@@ -263,6 +263,11 @@ public abstract class Abstract3LegSymbol extends AbstractComponent<String> {
@Override @Override
public boolean canPointMoveFreely(int pointIndex) { public boolean canPointMoveFreely(int pointIndex) {
return pointIndex == 3; return pointIndex == 3;
}
@Override
public boolean canControlPointOverlap(int index) {
return index >= 3;
} }
@EditableProperty @EditableProperty
@@ -536,6 +536,11 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
public VisibilityPolicy getControlPointVisibilityPolicy(int index) { public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
return getMoveLabel() || index < 2 ? VisibilityPolicy.ALWAYS : VisibilityPolicy.NEVER; return getMoveLabel() || index < 2 ? VisibilityPolicy.ALWAYS : VisibilityPolicy.NEVER;
} }
@Override
public boolean canControlPointOverlap(int index) {
return index >= 2;
}
@Override @Override
public void setControlPoint(Point point, int index) { public void setControlPoint(Point point, int index) {
Binary file not shown.