projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
modeladapter
/
ViewLogicModelAdapter.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java
index
17dc22f
..
6e722a0
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java
@@
-95,7
+95,7
@@
public class ViewLogicModelAdapter
if (externalWireCandidate != null)
if (externalWire == null)
externalWire = externalWireCandidate;
if (externalWireCandidate != null)
if (externalWire == null)
externalWire = externalWireCandidate;
- else if (externalWire.
length == externalWireCandidate.leng
th)
+ else if (externalWire.
width == externalWireCandidate.wid
th)
Wire.fuse(externalWire, externalWireCandidate);
else
throw new IllegalArgumentException(
Wire.fuse(externalWire, externalWireCandidate);
else
throw new IllegalArgumentException(