projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GUIBitDisplay and GUIManualSwitch now support logicWidth != 1
[Mograsim.git]
/
net.mograsim.logic.core
/
test
/
net
/
mograsim
/
logic
/
core
/
tests
/
GUITest.java
diff --git
a/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/GUITest.java
b/net.mograsim.logic.core/test/net/mograsim/logic/core/tests/GUITest.java
index
544b064
..
86eb115
100644
(file)
--- a/
net.mograsim.logic.core/test/net/mograsim/logic/core/tests/GUITest.java
+++ b/
net.mograsim.logic.core/test/net/mograsim/logic/core/tests/GUITest.java
@@
-66,7
+66,7
@@
public class GUITest extends JPanel
{
if (dim.getValue().contains(e.getPoint()))
{
{
if (dim.getValue().contains(e.getPoint()))
{
- dim.getKey().switchOff();
+ dim.getKey().switch
Full
Off();
repaint();
}
}
repaint();
}
}
@@
-79,7
+79,7
@@
public class GUITest extends JPanel
{
if (dim.getValue().contains(e.getPoint()))
{
{
if (dim.getValue().contains(e.getPoint()))
{
- dim.getKey().switchOn();
+ dim.getKey().switch
Full
On();
repaint();
}
}
repaint();
}
}
@@
-220,7
+220,7
@@
public class GUITest extends JPanel
switchMap.put(ms, r);
}
switchMap.put(ms, r);
}
- g.setColor(ms.isOn() ? Color.getHSBColor(.3f, .5f, 1f) : Color.WHITE);
+ g.setColor(ms.is
Full
On() ? Color.getHSBColor(.3f, .5f, 1f) : Color.WHITE);
g.fillRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1);
setBlack(g);
g.drawRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1);
g.fillRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1);
setBlack(g);
g.drawRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1);