projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
719565e
)
Made FixedOutput smaller
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sat, 12 Oct 2019 14:15:17 +0000
(16:15 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sat, 12 Oct 2019 14:15:17 +0000
(16:15 +0200)
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
patch
|
blob
|
history
plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java
patch
|
blob
|
history
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index
b8eb665
..
ae825b1
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@
-120,7
+120,7
@@
"id": "FixedOutput",
"name": "FixedOutput#0",
"pos": {
- "x": 5
40
.0,
+ "x": 5
55
.0,
"y": 270.0
},
"params": {
@@
-133,8
+133,8
@@
"id": "FixedOutput",
"name": "FixedOutput#1",
"pos": {
- "x": 6
3
5.0,
- "y": 3
8
0.0
+ "x": 6
4
5.0,
+ "y": 3
9
0.0
},
"params": {
"bits": [
@@
-146,8
+146,8
@@
"id": "FixedOutput",
"name": "FixedOutput#2",
"pos": {
- "x": 3
70
.0,
- "y": 5
05
.0
+ "x": 3
85
.0,
+ "y": 5
10
.0
},
"params": {
"bits": [
@@
-172,7
+172,7
@@
"id": "FixedOutput",
"name": "FixedOutput#4",
"pos": {
- "x": 4
2
0.0,
+ "x": 4
3
0.0,
"y": 570.0
},
"params": {
@@
-185,8
+185,8
@@
"id": "FixedOutput",
"name": "FixedOutput#5",
"pos": {
- "x": 4
7
5.0,
- "y": 5
05
.0
+ "x": 4
8
5.0,
+ "y": 5
10
.0
},
"params": {
"bits": [
@@
-198,8
+198,8
@@
"id": "FixedOutput",
"name": "FixedOutput#6",
"pos": {
- "x": 5
3
5.0,
- "y": 3
7
0.0
+ "x": 5
4
5.0,
+ "y": 3
8
0.0
},
"params": {
"bits": [
@@
-211,8
+211,8
@@
"id": "FixedOutput",
"name": "FixedOutput#7",
"pos": {
- "x": 2
6
0.0,
- "y": 3
7
0.0
+ "x": 2
7
0.0,
+ "y": 3
8
0.0
},
"params": {
"bits": [
@@
-2173,7
+2173,7
@@
"path": [
{
"x": 660.0,
- "y": 39
0
.0
+ "y": 39
5
.0
}
]
},
@@
-2201,12
+2201,12
@@
"name": "unnamedWire#37",
"path": [
{
- "x": 4
8
0.0,
+ "x": 4
7
0.0,
"y": 540.0
},
{
- "x": 4
8
0.0,
- "y": 5
70
.0
+ "x": 4
7
0.0,
+ "y": 5
65
.0
}
]
},
@@
-2223,7
+2223,7
@@
"path": [
{
"x": 445.0,
- "y": 5
80
.0
+ "y": 5
75
.0
}
]
},
@@
-2252,7
+2252,7
@@
"path": [
{
"x": 560.0,
- "y": 38
0
.0
+ "y": 38
5
.0
}
]
},
@@
-2430,7
+2430,7
@@
"path": [
{
"x": 570.0,
- "y": 2
80
.0
+ "y": 2
75
.0
}
]
},
@@
-3705,7
+3705,7
@@
"path": [
{
"x": 285.0,
- "y": 38
0
.0
+ "y": 38
5
.0
}
]
},
diff --git
a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java
b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java
index
9a62cad
..
1d70458
100644
(file)
--- a/
plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java
+++ b/
plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java
@@
-23,8
+23,8
@@
import net.mograsim.preferences.Preferences;
public class ModelFixedOutput extends ModelComponent
{
- private static final double width =
2
0;
- private static final double height =
2
0;
+ private static final double width =
1
0;
+ private static final double height =
1
0;
private static final double fontHeight = 5;
private static final double textMargin = 0.5;