projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
eccd431
)
Renderers can now be used for atomic GUI components
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Fri, 9 Aug 2019 18:48:19 +0000
(20:48 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Fri, 9 Aug 2019 18:48:19 +0000
(20:48 +0200)
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java
patch
|
blob
|
history
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java
patch
|
blob
|
history
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java
patch
|
blob
|
history
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java
patch
|
blob
|
history
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java
index
7c691a8
..
394eec0
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java
@@
-4,6
+4,7
@@
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
import java.io.InputStream;
import java.util.Map;
+import net.mograsim.logic.model.model.components.GUIComponent;
import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler;
import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer;
import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler;
import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer;
@@
-12,8
+13,8
@@
import net.mograsim.logic.model.util.JsonHandler;
public class SubmodelComponentSnippetSuppliers
{
public class SubmodelComponentSnippetSuppliers
{
- public static final CodeSnippetSupplier<
Submodel
Component, Renderer> symbolRendererSupplier;
- public static final CodeSnippetSupplier<
Submodel
Component, Renderer> outlineRendererSupplier;
+ public static final CodeSnippetSupplier<
GUI
Component, Renderer> symbolRendererSupplier;
+ public static final CodeSnippetSupplier<
GUI
Component, Renderer> outlineRendererSupplier;
public static final CodeSnippetSupplier<SubmodelComponent, HighLevelStateHandler> highLevelStateHandlerSupplier;
static
public static final CodeSnippetSupplier<SubmodelComponent, HighLevelStateHandler> highLevelStateHandlerSupplier;
static
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java
index
13a8eb4
..
2bee25f
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java
@@
-3,7
+3,6
@@
package net.mograsim.logic.model.snippets.outlinerenderers;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.model.model.components.GUIComponent;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.model.model.components.GUIComponent;
-import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.logic.model.snippets.Renderer;
import net.mograsim.logic.model.snippets.SnippetDefinintion;
import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.logic.model.snippets.Renderer;
import net.mograsim.logic.model.snippets.SnippetDefinintion;
@@
-16,12
+15,12
@@
public class DefaultOutlineRenderer implements Renderer
{
private final GUIComponent component;
{
private final GUIComponent component;
- public DefaultOutlineRenderer(
Submodel
Component component)
+ public DefaultOutlineRenderer(
GUI
Component component)
{
this(component, null);
}
{
this(component, null);
}
- public DefaultOutlineRenderer(
Submodel
Component component, @SuppressWarnings("unused") Void params)
+ public DefaultOutlineRenderer(
GUI
Component component, @SuppressWarnings("unused") Void params)
{
this.component = component;
}
{
this.component = component;
}
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java
index
7705203
..
515b7b6
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java
@@
-5,7
+5,6
@@
import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.model.model.components.GUIComponent;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.model.model.components.GUIComponent;
-import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.logic.model.snippets.Renderer;
import net.mograsim.logic.model.snippets.SnippetDefinintion;
import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.logic.model.snippets.Renderer;
import net.mograsim.logic.model.snippets.SnippetDefinintion;
@@
-25,7
+24,7
@@
public class CenteredTextSymbolRenderer implements Renderer
private final String text;
private final double fontHeight;
private final String text;
private final double fontHeight;
- public CenteredTextSymbolRenderer(
Submodel
Component component, CenteredTextParams params)
+ public CenteredTextSymbolRenderer(
GUI
Component component, CenteredTextParams params)
{
this.component = component;
this.text = params.text;
{
this.component = component;
this.text = params.text;
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java
index
d24ff22
..
9e097aa
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java
@@
-4,7
+4,6
@@
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.model.model.components.GUIComponent;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.model.model.components.GUIComponent;
-import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.logic.model.snippets.Renderer;
import net.mograsim.logic.model.snippets.SnippetDefinintion;
import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.logic.model.snippets.Renderer;
import net.mograsim.logic.model.snippets.SnippetDefinintion;
@@
-19,12
+18,12
@@
public class DefaultSymbolRenderer implements Renderer
private final GUIComponent component;
private final GUIComponent component;
- public DefaultSymbolRenderer(
Submodel
Component component)
+ public DefaultSymbolRenderer(
GUI
Component component)
{
this(component, null);
}
{
this(component, null);
}
- public DefaultSymbolRenderer(
Submodel
Component component, @SuppressWarnings("unused") Void params)
+ public DefaultSymbolRenderer(
GUI
Component component, @SuppressWarnings("unused") Void params)
{
this.component = component;
}
{
this.component = component;
}
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java
index
be820a6
..
2eda106
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java
@@
-9,7
+9,6
@@
import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.model.model.components.GUIComponent;
import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.mograsim.logic.model.model.components.GUIComponent;
-import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.logic.model.snippets.Renderer;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.serializing.IdentifierGetter;
import net.mograsim.logic.model.snippets.Renderer;
@@
-34,7
+33,7
@@
public class SimpleRectangularLikeSymbolRenderer implements Renderer
private final double pinLabelHeight;
private final double pinLabelMargin;
private final double pinLabelHeight;
private final double pinLabelMargin;
- public SimpleRectangularLikeSymbolRenderer(
Submodel
Component component, SimpleRectangularLikeParams params)
+ public SimpleRectangularLikeSymbolRenderer(
GUI
Component component, SimpleRectangularLikeParams params)
{
this.component = component;
this.centerText = params.centerText;
{
this.component = component;
this.centerText = params.centerText;