projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewLogicModelAdapter now supports directly connected interface pins
[Mograsim.git]
/
net.mograsim.logic.ui
/
src
/
net
/
mograsim
/
logic
/
ui
/
modeladapter
/
ViewLogicModelAdapter.java
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
index
3e081ad
..
193e240
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
@@
-114,8
+114,11
@@
public class ViewLogicModelAdapter
if (externalWireCandidate != null)
if (externalWire == null)
externalWire = externalWireCandidate;
if (externalWireCandidate != null)
if (externalWire == null)
externalWire = externalWireCandidate;
+ else if (externalWire.length == externalWireCandidate.length)
+ Wire.fuse(externalWire, externalWireCandidate);
else
else
- throw new IllegalArgumentException("Two pins to external wires can't be connected directly");
+ throw new IllegalArgumentException(
+ "Two pins to external wires with different logicWidths can't be connected directly");
}
return externalWire == null ? new Wire(timeline, e.getKey().logicWidth, params.wireTravelTime) : externalWire;
}));
}
return externalWire == null ? new Wire(timeline, e.getKey().logicWidth, params.wireTravelTime) : externalWire;
}));