kenkeiras/mini-cards
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extend removal mechanism for all wires.

Browse Source
This commit is contained in:
Sergio Martínez Portela 2020-06-01 16:49:38 +02:00
parent 8b3bbfee78
commit af9352de42
5 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/codigoparallevar/minicards/CanvasView.java
View File

@ -368,17 +368,14 @@ public class CanvasView extends View implements PartGrid {
List<OutputConnector> outputConnectors = part.getOutputConnectors();
if (outputConnectors != null) {
for (OutputConnector outputConnector : outputConnectors) {
if (outputConnector instanceof SignalRoundOutputConnector) {
SignalRoundOutputConnector conn = (SignalRoundOutputConnector) outputConnector;
List<SignalWire> wires = conn.getWires();
if (wires == null) {
continue;
}
for (Wire wire : wires) {
if (wire.containsPoint(x, y)) {
Log.d(LogTag, "Point in wire " + wire);
return wire;
}
List<SignalWire> wires = outputConnector.getWires();
if (wires == null) {
continue;
}
for (Wire wire : wires) {
if (wire.containsPoint(x, y)) {
Log.d(LogTag, "Point in wire " + wire);
return wire;
}
}
}

6
app/src/main/java/com/codigoparallevar/minicards/parts/connectors/AnyRoundOutputConnector.java
View File

@ -97,6 +97,7 @@ public class AnyRoundOutputConnector implements Drawable, AnyOutputConnector,
@Override
public void unlinkWire(AnyWire wire) {
_wires.remove(wire);
_connections.remove(wire.getAttachedTo());
}
@Override
@ -162,6 +163,11 @@ public class AnyRoundOutputConnector implements Drawable, AnyOutputConnector,
return _part.query(lastValue);
}
@Override
public List<AnyWire> getWires() {
return _wires;
}
public int getX() {
return _centerX;
}

6
app/src/main/java/com/codigoparallevar/minicards/parts/connectors/BooleanRoundOutputConnector.java
View File

@ -96,6 +96,7 @@ public class BooleanRoundOutputConnector implements Drawable, BooleanOutputConne
@Override
public void unlinkWire(BooleanWire wire) {
_wires.remove(wire);
_connections.remove(wire.getAttachedTo());
}
@Override
@ -160,4 +161,9 @@ public class BooleanRoundOutputConnector implements Drawable, BooleanOutputConne
public Object query(Object lastValue) {
return _part.query(lastValue);
}
@Override
public List<BooleanWire> getWires() {
return _wires;
}
}

6
app/src/main/java/com/codigoparallevar/minicards/parts/connectors/StringRoundOutputConnector.java
View File

@ -96,6 +96,7 @@ public class StringRoundOutputConnector implements Drawable, StringOutputConnect
@Override
public void unlinkWire(StringWire wire) {
_wires.remove(wire);
_connections.remove(wire.getAttachedTo());
}
@Override
@ -160,4 +161,9 @@ public class StringRoundOutputConnector implements Drawable, StringOutputConnect
public Object query(Object lastValue) {
return _part.query(lastValue);
}
@Override
public List<StringWire> getWires() {
return _wires;
}
}

2
app/src/main/java/com/codigoparallevar/minicards/types/connectors/output/OutputConnector.java
View File

@ -25,4 +25,6 @@ public interface OutputConnector<T extends WireDataType,
void send(T data);
Object query(Object lastValue);
List<T2> getWires();
}