projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplified file representation of SubmodelComponents
[Mograsim.git]
/
net.mograsim.logic.ui
/
src
/
net
/
mograsim
/
logic
/
ui
/
model
/
components
/
params
/
SubComponentParams.java
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/params/SubComponentParams.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/params/SubComponentParams.java
index
dc05114
..
8ea235f
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/params/SubComponentParams.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/params/SubComponentParams.java
@@
-1,15
+1,18
@@
package net.mograsim.logic.ui.model.components.params;
import java.io.IOException;
package net.mograsim.logic.ui.model.components.params;
import java.io.IOException;
+import java.util.Map;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
public class SubComponentParams
{
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
public class SubComponentParams
{
+ public String type;
public final static String fileExtension = ".sc";
public double width, height;
public InterfacePinParams[] interfacePins;
public GeneralComponentParams composition;
public final static String fileExtension = ".sc";
public double width, height;
public InterfacePinParams[] interfacePins;
public GeneralComponentParams composition;
+ public Map<String, Object> specialized;
public static class InterfacePinParams
{
public static class InterfacePinParams
{
@@
-17,6
+20,17
@@
public class SubComponentParams
public int logicWidth;
}
public int logicWidth;
}
+ public static class InnerWireParams
+ {
+ public InnerPinParams pin1, pin2;
+ public Point[] path;
+ }
+
+ public static class InnerPinParams
+ {
+ public int compId, pinIndex;
+ }
+
public static SubComponentParams readJson(String path) throws IOException
{
return JsonHandler.readJson(path, SubComponentParams.class);
public static SubComponentParams readJson(String path) throws IOException
{
return JsonHandler.readJson(path, SubComponentParams.class);