projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaned up initializing of ModelComponents (also improved HLSDebugShell)
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
model
/
components
/
submodels
/
SubmodelComponent.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
index
f67be7d
..
ffe6ed6
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
@@
-11,14
+11,14
@@
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.gcs.TranslatedGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.model.LogicUIRenderer;
import net.haspamelodica.swt.helper.gcs.TranslatedGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.model.LogicUIRenderer;
-import net.mograsim.logic.model.model.
View
Model;
-import net.mograsim.logic.model.model.
View
ModelModifiable;
-import net.mograsim.logic.model.model.components.
GUI
Component;
+import net.mograsim.logic.model.model.
Logic
Model;
+import net.mograsim.logic.model.model.
Logic
ModelModifiable;
+import net.mograsim.logic.model.model.components.
Model
Component;
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.serializing.IdentifyParams;
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.serializing.IdentifyParams;
-import net.mograsim.logic.model.serializing.Indirect
GUI
ComponentCreator;
+import net.mograsim.logic.model.serializing.Indirect
Model
ComponentCreator;
import net.mograsim.logic.model.serializing.SubmodelComponentParams;
import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
import net.mograsim.logic.model.snippets.Renderer;
import net.mograsim.logic.model.serializing.SubmodelComponentParams;
import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
import net.mograsim.logic.model.snippets.Renderer;
@@
-26,20
+26,20
@@
import net.mograsim.logic.model.util.JsonHandler;
import net.mograsim.preferences.Preferences;
/**
import net.mograsim.preferences.Preferences;
/**
- * A {@link
GUI
Component} consisting of another model. A <code>SubmodelComponent</code> can have so-called "interface pins" connecting the
+ * A {@link
Model
Component} consisting of another model. A <code>SubmodelComponent</code> can have so-called "interface pins" connecting the
* inner and outer models.
*/
* inner and outer models.
*/
-public abstract class SubmodelComponent extends
GUI
Component
+public abstract class SubmodelComponent extends
Model
Component
{
public static final String SUBMODEL_INTERFACE_NAME = "_submodelinterface";
/**
* A modifiable view of {@link #submodel}.
*/
{
public static final String SUBMODEL_INTERFACE_NAME = "_submodelinterface";
/**
* A modifiable view of {@link #submodel}.
*/
- protected final
View
ModelModifiable submodelModifiable;
+ protected final
Logic
ModelModifiable submodelModifiable;
/**
* The model this {@link SubmodelComponent} consists of.
*/
/**
* The model this {@link SubmodelComponent} consists of.
*/
- public final
View
Model submodel;
+ public final
Logic
Model submodel;
/**
* The list of all submodel interface pins of this {@link SubmodelComponent} on the submodel side.
*/
/**
* The list of all submodel interface pins of this {@link SubmodelComponent} on the submodel side.
*/
@@
-99,10
+99,15
@@
public abstract class SubmodelComponent extends GUIComponent
// creation and destruction
// creation and destruction
- public SubmodelComponent(
View
ModelModifiable model, String name)
+ public SubmodelComponent(
Logic
ModelModifiable model, String name)
{
{
- super(model, name);
- this.submodelModifiable = new ViewModelModifiable();
+ this(model, name, true);
+ }
+
+ protected SubmodelComponent(LogicModelModifiable model, String name, boolean callInit)
+ {
+ super(model, name, false);
+ this.submodelModifiable = new LogicModelModifiable();
this.submodel = submodelModifiable;
this.submodelPins = new HashMap<>();
this.submodelMovablePinsUnmodifiable = Collections.unmodifiableMap(submodelPins);
this.submodel = submodelModifiable;
this.submodelPins = new HashMap<>();
this.submodelMovablePinsUnmodifiable = Collections.unmodifiableMap(submodelPins);
@@
-125,6
+130,9
@@
public abstract class SubmodelComponent extends GUIComponent
model.removeRedrawHandlerChangedListener(redrawHandlerChangedListener);
});
submodelModifiable.setRedrawHandler(model.getRedrawHandler());
model.removeRedrawHandlerChangedListener(redrawHandlerChangedListener);
});
submodelModifiable.setRedrawHandler(model.getRedrawHandler());
+
+ if (callInit)
+ init();
}
// pins
}
// pins
@@
-159,7
+167,7
@@
public abstract class SubmodelComponent extends GUIComponent
default:
throw new IllegalArgumentException("Unknown enum constant: " + supermodelPin.usage);
}
default:
throw new IllegalArgumentException("Unknown enum constant: " + supermodelPin.usage);
}
- MovablePin submodelPin = new MovablePin(submodelInterface, name, supermodelPin.logicWidth, submodelPinUsage,
+ MovablePin submodelPin = new MovablePin(
model,
submodelInterface, name, supermodelPin.logicWidth, submodelPinUsage,
supermodelPin.getRelX() / submodelScale, supermodelPin.getRelY() / submodelScale);
submodelPin.addPinMovedListener(p ->
supermodelPin.getRelX() / submodelScale, supermodelPin.getRelY() / submodelScale);
submodelPin.addPinMovedListener(p ->
@@
-356,7
+364,7
@@
public abstract class SubmodelComponent extends GUIComponent
{
double scaledX = (x - getPosX()) / submodelScale;
double scaledY = (y - getPosY()) / submodelScale;
{
double scaledX = (x - getPosX()) / submodelScale;
double scaledY = (y - getPosY()) / submodelScale;
- for (
GUI
Component component : submodel.getComponentsByName().values())
+ for (
Model
Component component : submodel.getComponentsByName().values())
if (component.getBounds().contains(scaledX, scaledY) && component.clicked(scaledX, scaledY))
return true;
return false;
if (component.getBounds().contains(scaledX, scaledY) && component.clicked(scaledX, scaledY))
return true;
return false;
@@
-449,7
+457,7
@@
public abstract class SubmodelComponent extends GUIComponent
static
{
static
{
- Indirect
GUI
ComponentCreator.setComponentSupplier(SubmodelComponent.class.getCanonicalName(),
+ Indirect
Model
ComponentCreator.setComponentSupplier(SubmodelComponent.class.getCanonicalName(),
(m, p, n) -> SubmodelComponentSerializer.deserialize(m, JsonHandler.fromJsonTree(p, SubmodelComponentParams.class), n));
}
}
\ No newline at end of file
(m, p, n) -> SubmodelComponentSerializer.deserialize(m, JsonHandler.fromJsonTree(p, SubmodelComponentParams.class), n));
}
}
\ No newline at end of file