TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-08-03 17:58:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

allows generic code to add and parameterize new generic custom circuits

Browse Source
This commit is contained in:
hneemann 2021-01-07 16:10:54 +01:00
parent 17b6b904e8
commit a8da7858e1
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/de/neemann/digital/draw/library/ResolveGenerics.java
View File

@ -135,7 +135,7 @@ public class ResolveGenerics {
boolean isCustom = elementTypeDescription instanceof ElementTypeDescriptionCustom; boolean isCustom = elementTypeDescription instanceof ElementTypeDescriptionCustom;
Statement genS = getStatement(gen); Statement genS = getStatement(gen);
Context mod = createContext(c, newComponents) Context mod = createContext(c, newComponents, args)
.declareVar("args", args); .declareVar("args", args);
if (isCustom) { if (isCustom) {
mod.declareFunc("setCircuit", new SetCircuitFunc(ve)); mod.declareFunc("setCircuit", new SetCircuitFunc(ve));
@ -156,13 +156,13 @@ public class ResolveGenerics {
return new CircuitHolder(c, args); return new CircuitHolder(c, args);
} }
private Context createContext(Circuit circuit, ArrayList<VisualElement> newComponents) throws NodeException { private Context createContext(Circuit circuit, ArrayList<VisualElement> newComponents, Args args) throws NodeException {
try { try {
Context context = new Context(); Context context = new Context();
if (circuit.getOrigin() != null) if (circuit.getOrigin() != null)
context.declareVar(Context.BASE_FILE_KEY, circuit.getOrigin()); context.declareVar(Context.BASE_FILE_KEY, circuit.getOrigin());
context.declareFunc("addWire", new AddWire(circuit)); context.declareFunc("addWire", new AddWire(circuit));
context.declareFunc("addComponent", new AddComponent(newComponents)); context.declareFunc("addComponent", new AddComponent(newComponents, args));
return context; return context;
} catch (HGSEvalException e) { } catch (HGSEvalException e) {
throw new NodeException("error setting the base filename", e); throw new NodeException("error setting the base filename", e);
@ -392,10 +392,12 @@ public class ResolveGenerics {
private final class AddComponent extends Function { private final class AddComponent extends Function {
private final ArrayList<VisualElement> newComponents; private final ArrayList<VisualElement> newComponents;
private final Args args;
private AddComponent(ArrayList<VisualElement> newComponents) { private AddComponent(ArrayList<VisualElement> newComponents, Args args) {
super(3); super(3);
this.newComponents = newComponents; this.newComponents = newComponents;
this.args = args;
} }
@Override @Override
@ -404,7 +406,29 @@ public class ResolveGenerics {
Vector pos = new Vector(Value.toInt(args[1]) * SIZE, Value.toInt(args[2]) * SIZE); Vector pos = new Vector(Value.toInt(args[1]) * SIZE, Value.toInt(args[2]) * SIZE);
VisualElement ve = new VisualElement(name).setPos(pos).setShapeFactory(library.getShapeFactory()); VisualElement ve = new VisualElement(name).setPos(pos).setShapeFactory(library.getShapeFactory());
newComponents.add(ve); newComponents.add(ve);
return new SubstituteLibrary.AllowSetAttributes(ve.getElementAttributes());
ElementAttributes elementAttributes = ve.getElementAttributes();
try {
ElementTypeDescription etd = library.getElementType(ve.getElementName(), ve.getElementAttributes());
if (etd instanceof ElementTypeDescriptionCustom) {
ElementTypeDescriptionCustom etdc = (ElementTypeDescriptionCustom) etd;
if (etdc.isGeneric()) {
Context c = new Context() {
@Override
public void hgsMapPut(String key, Object val) throws HGSEvalException {
this.declareVar(key, val);
}
}
.declareVar("args", this.args);
elementAttributes.putToCache(GEN_ARGS_KEY, c);
return c;
}
}
} catch (ElementNotFoundException e) {
e.printStackTrace();
}
return new SubstituteLibrary.AllowSetAttributes(elementAttributes);
} }
} }
} }