projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a bug in Am2900; created dlatch8/80; relayouted some components
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
model
/
components
/
submodels
/
SimpleRectangularSubmodelComponent.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SimpleRectangularSubmodelComponent.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SimpleRectangularSubmodelComponent.java
index
c04e7ae
..
ef567e9
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SimpleRectangularSubmodelComponent.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SimpleRectangularSubmodelComponent.java
@@
-6,9
+6,10
@@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.HashSet;
import java.util.List;
-import net.mograsim.logic.model.model.
View
ModelModifiable;
+import net.mograsim.logic.model.model.
Logic
ModelModifiable;
import net.mograsim.logic.model.model.wires.MovablePin;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.model.wires.MovablePin;
import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer;
import net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer;
import net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer.SimpleRectangularLikeParams;
import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer;
import net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer;
import net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer.SimpleRectangularLikeParams;
@@
-29,14
+30,19
@@
public class SimpleRectangularSubmodelComponent extends SubmodelComponent
private final List<String> outputPinNames;
private final List<String> outputPinNamesUnmodifiable;
private final List<String> outputPinNames;
private final List<String> outputPinNamesUnmodifiable;
- public SimpleRectangularSubmodelComponent(
View
ModelModifiable model, int logicWidth, String label)
+ public SimpleRectangularSubmodelComponent(
Logic
ModelModifiable model, int logicWidth, String label)
{
this(model, logicWidth, label, null);
}
{
this(model, logicWidth, label, null);
}
- public SimpleRectangularSubmodelComponent(
View
ModelModifiable model, int logicWidth, String label, String name)
+ public SimpleRectangularSubmodelComponent(
Logic
ModelModifiable model, int logicWidth, String label, String name)
{
{
- super(model, name);
+ this(model, logicWidth, label, name, true);
+ }
+
+ protected SimpleRectangularSubmodelComponent(LogicModelModifiable model, int logicWidth, String label, String name, boolean callInit)
+ {
+ super(model, name, false);
this.label = label;
this.logicWidth = logicWidth;
this.inputPinNames = new ArrayList<>();
this.label = label;
this.logicWidth = logicWidth;
this.inputPinNames = new ArrayList<>();
@@
-47,24
+53,28
@@
public class SimpleRectangularSubmodelComponent extends SubmodelComponent
SimpleRectangularLikeParams rendererParams = new SimpleRectangularLikeParams();
rendererParams.centerText = label;
rendererParams.centerTextHeight = labelFontHeight;
SimpleRectangularLikeParams rendererParams = new SimpleRectangularLikeParams();
rendererParams.centerText = label;
rendererParams.centerTextHeight = labelFontHeight;
- rendererParams.horizontalComponentCenter =
getWidth()
/ 2;
+ rendererParams.horizontalComponentCenter =
width
/ 2;
rendererParams.pinLabelHeight = pinNameFontHeight;
rendererParams.pinLabelMargin = pinNameMargin;
setSymbolRenderer(new SimpleRectangularLikeSymbolRenderer(this, rendererParams));
setOutlineRenderer(new DefaultOutlineRenderer(this));
rendererParams.pinLabelHeight = pinNameFontHeight;
rendererParams.pinLabelMargin = pinNameMargin;
setSymbolRenderer(new SimpleRectangularLikeSymbolRenderer(this, rendererParams));
setOutlineRenderer(new DefaultOutlineRenderer(this));
+
+ if (callInit)
+ init();
}
protected void setInputPins(String... pinNames)
{
}
protected void setInputPins(String... pinNames)
{
- setIOPins(0, inputPinNames, outputPinNames, pinNames);
+ setIOPins(0, inputPinNames, outputPinNames,
PinUsage.INPUT,
pinNames);
}
protected void setOutputPins(String... pinNames)
{
}
protected void setOutputPins(String... pinNames)
{
- setIOPins(width, outputPinNames, inputPinNames, pinNames);
+ setIOPins(width, outputPinNames, inputPinNames,
PinUsage.OUTPUT,
pinNames);
}
}
- private void setIOPins(double relX, List<String> pinNamesListThisSide, List<String> pinNamesListOtherSide, String... newPinNames)
+ private void setIOPins(double relX, List<String> pinNamesListThisSide, List<String> pinNamesListOtherSide, PinUsage usage,
+ String... newPinNames)
{
int inputCount = newPinNames.length;
List<String> newPinNamesList = Arrays.asList(newPinNames);
{
int inputCount = newPinNames.length;
List<String> newPinNamesList = Arrays.asList(newPinNames);
@@
-79,7
+89,8
@@
public class SimpleRectangularSubmodelComponent extends SubmodelComponent
String pinName = newPinNames[i];
int oldPinIndex = pinNamesListThisSide.indexOf(pinName);
if (oldPinIndex == -1)
String pinName = newPinNames[i];
int oldPinIndex = pinNamesListThisSide.indexOf(pinName);
if (oldPinIndex == -1)
- super.addSubmodelInterface(new MovablePin(this, pinName, logicWidth, relX, pinDistance / 2 + i * pinDistance));
+ super.addSubmodelInterface(
+ new MovablePin(model, this, pinName, logicWidth, usage, relX, pinDistance / 2 + i * pinDistance));
else
getSupermodelMovablePin(pinName).setRelPos(relX, pinDistance / 2 + i * pinDistance);
}
else
getSupermodelMovablePin(pinName).setRelPos(relX, pinDistance / 2 + i * pinDistance);
}