projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Equivalent inner components now exchangeable. Fixed in/output pin order.
[Mograsim.git]
/
net.mograsim.logic.ui
/
src
/
net
/
mograsim
/
logic
/
ui
/
model
/
components
/
SubmodelComponentParams.java
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponentParams.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponentParams.java
index
5fd7ab5
..
1276d13
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponentParams.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponentParams.java
@@
-11,7
+11,7
@@
import net.mograsim.logic.ui.util.JsonHandler;
*/
public class SubmodelComponentParams
{
*/
public class SubmodelComponentParams
{
- String type;
+ String type
, name
;
double width, height;
InterfacePinParams[] interfacePins;
ComponentCompositionParams composition;
double width, height;
InterfacePinParams[] interfacePins;
ComponentCompositionParams composition;
@@
-19,19
+19,21
@@
public class SubmodelComponentParams
public static class InterfacePinParams
{
public static class InterfacePinParams
{
- public Point location;
- public int logicWidth;
+ Point location;
+ String name;
+ int logicWidth;
}
public static class InnerWireParams
{
}
public static class InnerWireParams
{
-
public
InnerPinParams pin1, pin2;
-
public
Point[] path;
+ InnerPinParams pin1, pin2;
+ Point[] path;
}
public static class InnerPinParams
{
}
public static class InnerPinParams
{
- public int compId, pinIndex;
+ int compId;
+ String pinName;
}
public static class ComponentCompositionParams
}
public static class ComponentCompositionParams
@@
-42,9
+44,9
@@
public class SubmodelComponentParams
public static class InnerComponentParams
{
public static class InnerComponentParams
{
-
public
Point pos;
-
public String typ
e;
-
public int logicWidth
;
+ Point pos;
+
String nam
e;
+
Map<String, Object> params
;
}
}
}
}