Skip to content

GitLab

16.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit cc85ea4a authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

Merge branch 'tikzgenerator-feature' into 'master' 

add features to TikzGenerator

See merge request !76
parents 25bcc7b9 191e8b9f
Pipeline #132800 passed with stages
in 124 minutes and 33 seconds
Hide whitespace changes
Inline Side-by-side
VadereGui/resources/messages.properties
View file @ cc85ea4a
......@@ -230,6 +230,7 @@ PostVis.license.text=This product is licensed under the {0}
PostVis.chbHidePedAtTarget.text=Hide Pedestrians at Target
PostVis.chbHideTrajAtTarget.text=Hide Trajectories at Target
PostVis.chShowAllTrajOnSnapshot.text=Show all Trajectories on Snapshot
PostVis.chbCleanSnapshot.text=Hide Trajectories on Snapshots
SettingsDialog.chbUseRandomColors.text=Random Coloring
......
VadereGui/resources/messages_de_DE.properties
View file @ cc85ea4a
......@@ -227,6 +227,7 @@ PostVis.btnRecord.tooltip=Starte Aufnahme
PostVis.chbHidePedAtTarget.text=Fu\u00dfg\u00E4nger im Ziel nicht anzeigen
PostVis.chbHideTrajAtTarget.text=Trajektorien am Ziel nicht anzeigen
PostVis.chbCleanSnapshot.text=Trajektorien auf Snapshots nicht anzeigen
PostVis.chShowAllTrajOnSnapshot.text=Alle Trajektorien auf Snapshot anzeigen
SettingsDialog.chbUseRandomColors.text=Zuf\u00E4llige Farben
SettingsDialog.chbHideVoronoiDiagram.text=Voronoi-Diagramm nicht anzeigen
......
VadereGui/src/org/vadere/gui/components/model/DefaultSimulationConfig.java
View file @ cc85ea4a
......@@ -37,7 +37,7 @@ public class DefaultSimulationConfig extends DefaultConfig {
private boolean showGrid = false;
private boolean showDensity = false;
private boolean showGroups = false;
protected final Color pedestrianDefaultColor = Color.BLUE;
protected final Color pedestrianDefaultColor = new Color(76, 114, 202);
private Map<Integer, Color> pedestrianColors = new TreeMap<>();
private Map<Integer, Color> randomColors = new HashMap<>();
private double gridWidth = CONFIG.getDouble("ProjectView.cellWidth");
......
VadereGui/src/org/vadere/gui/postvisualization/model/PostvisualizationConfig.java
View file @ cc85ea4a
......@@ -14,6 +14,7 @@ public class PostvisualizationConfig extends DefaultSimulationConfig {
private boolean showAllTrajectories = true;
private boolean showTrajecoriesOnSnapshot = false;
private boolean showFaydedPedestrians = false;
private boolean showAllTrajOnSnapshot = false;
private boolean loadTopographyInformationsOnly = false;
private boolean useEvacuationTimeColor = false;
......@@ -98,6 +99,15 @@ public class PostvisualizationConfig extends DefaultSimulationConfig {
this.showFaydedPedestrians = showFaydedPedestrians;
setChanged();
}
public boolean isShowAllTrajOnSnapshot() {
return showAllTrajOnSnapshot;
}
public void setShowAllTrajOnSnapshot(boolean showAllTrajOnSnapshot) {
this.showAllTrajOnSnapshot = showAllTrajOnSnapshot;
setChanged();
}
}
VadereGui/src/org/vadere/gui/postvisualization/model/PostvisualizationModel.java
View file @ cc85ea4a
......@@ -436,6 +436,10 @@ public class PostvisualizationModel extends SimulationModel<PostvisualizationCon
return trajectories.values().stream().filter(t -> t.isAlive(getSimTimeInSec()));
}
public synchronized Trajectory getTrajectory(int pedestrianId){
return trajectories.get(pedestrianId);
}
public boolean isEmpty() {
return agentsByStep.isEmpty();
}
......
VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java
View file @ cc85ea4a
......@@ -6,11 +6,13 @@ import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
import org.vadere.gui.components.view.DefaultRenderer;
import org.vadere.gui.components.view.SimulationRenderer;
import org.vadere.gui.postvisualization.model.PostvisualizationConfig;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
import org.vadere.state.scenario.*;
import org.vadere.state.simulation.Step;
import org.vadere.state.simulation.Trajectory;
import org.vadere.util.geometry.shapes.VPoint;
import org.vadere.util.geometry.shapes.Vector2D;
import org.vadere.util.logging.Logger;
import org.vadere.util.voronoi.Face;
import org.vadere.util.voronoi.HalfEdge;
......@@ -93,7 +95,10 @@ public class TikzGenerator {
tikzCodeDrawSettings +
"\\begin{document}\n" +
"% Change scaling to [x=1mm,y=1mm] if TeX reports \"Dimension too large\".\n" +
"\\begin{tikzpicture}[x=1cm,y=1cm]\n" +
"\\begin{tikzpicture}\n" +
"[x=1cm,y=1cm,\n" +
addStyles() +
"]\n" +
tikzCodeScenarioElements +
"\\end{tikzpicture}\n" +
"\\end{document}\n";
......@@ -111,6 +116,17 @@ public class TikzGenerator {
}
}
private String addStyles(){
StringBuilder sb = new StringBuilder();
sb.append("trajectory/.style={},\n");
sb.append("pedestrian/.style={fill=AgentColor},\n"); // default color
sb.append("walkdirection/.style={},\n");
sb.append("ped_circle/.style={circle, minimum size=\\AgentDiameter cm, inner sep=0pt},\n");
sb.append("selected/.style={},\n");
sb.append("group/.style={},\n");
return sb.toString();
}
private String generateTikzColorDefinitions(SimulationModel<? extends DefaultSimulationConfig> model) {
String colorDefinitions = "% Color Definitions\n";
......@@ -154,6 +170,7 @@ public class TikzGenerator {
double opacityBetweenZeroAndOne = model.getConfig().getMeasurementAreaAlpha() / 255.0;
drawSettings += String.format(Locale.US,"\\newcommand{\\AgentRadius}{%f}\n", agentRadius);
drawSettings += String.format(Locale.US,"\\newcommand{\\AgentDiameter}{%f}\n", 2*agentRadius);
drawSettings += String.format(Locale.US,"\\newcommand{\\LineWidth}{%d}\n", 1);
drawSettings += String.format(Locale.US,"\\newcommand{\\MeasurementAreaOpacity}{%f}\n", opacityBetweenZeroAndOne);
......@@ -189,6 +206,8 @@ public class TikzGenerator {
if (config.isShowSources()) {
generatedCode += "% Sources\n";
for (Source source : topography.getSources()) {
VPoint centroid = source.getShape().getCentroid();
generatedCode += String.format(Locale.US, "\\coordinate (src_%d) at (%f,%f); %%centroid coordinate for source %d\n", source.getId(), centroid.x, centroid.y, source.getId());
generatedCode += String.format(Locale.US, "\\fill[SourceColor] %s;\n", generatePathForScenarioElement(source));
}
} else {
......@@ -198,6 +217,8 @@ public class TikzGenerator {
if (config.isShowTargets()) {
generatedCode += "% Targets\n";
for (Target target : topography.getTargets()) {
VPoint centroid = target.getShape().getCentroid();
generatedCode += String.format(Locale.US, "\\coordinate (trg_%d) at (%f,%f); %%centroid coordinate for target %d\n", target.getId(), centroid.x, centroid.y, target.getId());
generatedCode += String.format(Locale.US, "\\fill[TargetColor] %s;\n", generatePathForScenarioElement(target));
}
} else {
......@@ -207,6 +228,8 @@ public class TikzGenerator {
if (config.isShowAbsorbingAreas()) {
generatedCode += "% Absorbing Areas\n";
for (AbsorbingArea absorbingArea : topography.getAbsorbingAreas()) {
VPoint centroid = absorbingArea.getShape().getCentroid();
generatedCode += String.format(Locale.US, "\\coordinate (absorb_%d) at (%f,%f); %%centroid coordinate for absorbingArea %d\n", absorbingArea.getId(), centroid.x, centroid.y, absorbingArea.getId());
generatedCode += String.format(Locale.US, "\\fill[AbsorbingAreaColor] %s;\n", generatePathForScenarioElement(absorbingArea));
}
} else {
......@@ -216,6 +239,8 @@ public class TikzGenerator {
if (config.isShowObstacles()) {
generatedCode += "% Obstacles\n";
for (Obstacle obstacle : topography.getObstacles()) {
VPoint centroid = obstacle.getShape().getCentroid();
generatedCode += String.format(Locale.US, "\\coordinate (obs_%d) at (%f,%f); %%centroid coordinate for obstacle %d\n", obstacle.getId(), centroid.x, centroid.y, obstacle.getId());
generatedCode += String.format(Locale.US, "\\fill[ObstacleColor] %s;\n", generatePathForScenarioElement(obstacle));
}
} else {
......@@ -225,6 +250,8 @@ public class TikzGenerator {
if (config.isShowStairs()) {
generatedCode += "% Stairs\n";
for (Stairs stair : topography.getStairs()) {
VPoint centroid = stair.getShape().getCentroid();
generatedCode += String.format(Locale.US, "\\coordinate (str_%d) at (%f,%f); %%centroid coordinate for stair %d\n", stair.getId(), centroid.x, centroid.y, stair.getId());
generatedCode += String.format(Locale.US, "\\fill[black] %s;\n", generatePathForScenarioElement(stair));
generatedCode += String.format(Locale.US, "\\fill[StairColor] %s;\n", generatePathForStairs(stair));
}
......@@ -235,6 +262,8 @@ public class TikzGenerator {
if (config.isShowMeasurementArea()) {
generatedCode += "% Measurement Areas\n";
for (MeasurementArea measurementArea : topography.getMeasurementAreas()) {
VPoint centroid = measurementArea.getShape().getCentroid();
generatedCode += String.format(Locale.US, "\\coordinate (mrmtA_%d) at (%f,%f); %%centroid coordinate for measurementArea %d\n", measurementArea.getId(), centroid.x, centroid.y, measurementArea.getId());
generatedCode += String.format(Locale.US, "\\fill[MeasurementAreaColor,opacity=\\MeasurementAreaOpacity] %s;\n", generatePathForScenarioElement(measurementArea));
}
} else {
......@@ -252,7 +281,7 @@ public class TikzGenerator {
generatedCode += "% Trajectories\n";
if (model instanceof PostvisualizationModel) {
generatedCode += drawTrajectories((PostvisualizationModel)model);
generatedCode += drawTrajectories((PostvisualizationConfig) config, (PostvisualizationModel)model);
} else {
generatedCode += String.format(Locale.US, "%% Passed model %s does not contain trajectories\n", model.getClass().getSimpleName());
}
......@@ -271,22 +300,31 @@ public class TikzGenerator {
generatedCode += "% Agent Ids\n";
for (Agent agent : model.getAgents()) {
generatedCode += String.format(Locale.US, "\\node[text=AgentIdColor] (id%d) at (%f,%f) {\\textbf{%d}};\n",
generatedCode += String.format(Locale.US, "\\node[text=AgentIdColor] (pedIdNode_id%d) at (%f,%f) {\\textbf{%d}};\n",
agent.getId(), agent.getPosition().x, agent.getPosition().y, agent.getId());
}
} else {
generatedCode += "% Agent Ids (not enabled in config)\n";
}
if (!topography.hasBoundary()){
int id=1;
for(Obstacle obstacle : Topography.createObstacleBoundary(topography)) {
VPoint centroid = obstacle.getShape().getCentroid();
generatedCode += String.format(Locale.US, "\\coordinate (bound_%d) at (%f,%f); %%centroid coordinate for obstacle %d\n", id, centroid.x, centroid.y, obstacle.getId());
generatedCode += String.format(Locale.US, "\\fill[ObstacleColor] %s;\n", generatePathForScenarioElement(obstacle));
id++;
}
}
return generatedCode;
}
private String drawTrajectories(PostvisualizationModel model) {
private String drawTrajectories(PostvisualizationConfig config, PostvisualizationModel model) {
// Use a thread-safe string implementation because streams are used here.
final StringBuffer generatedCode = new StringBuffer("");
Stream<Trajectory> trajectoryStream = model.getAlivePedestrians();
//Step currentTimeStep = model.getStep().orElseGet(null);
Stream<Trajectory> trajectoryStream = config.isShowAllTrajOnSnapshot() ? model.getAppearedPedestrians() : model.getAlivePedestrians();
trajectoryStream.forEach(trajectory -> {
......@@ -328,15 +366,64 @@ public class TikzGenerator {
colorString = String.format(Locale.US, "{rgb,255: red,%d; green,%d; blue,%d}", pedestrianColor.getRed(), pedestrianColor.getGreen(), pedestrianColor.getBlue());
}
return String.format(Locale.US, "\\draw[draw=%s]\n%s;\n", colorString, trajectory);
return String.format(Locale.US, "\\draw[trajectory, draw=%s]\n%s;\n", colorString, trajectory);
}
/**
* Draw a small direction triangle which points in the direction of of the last step.
* The previous step is not always the step one time step earlier. If the agent did not
* move in the last time step.
*
* @param agent
* @return tikz code for small direction triangle.
*/
private String drawWalkingDirection(final Agent agent){
String tikzCode= "";
PostvisualizationModel postVisModel = (PostvisualizationModel)model;
Step currentTimeStep = postVisModel.getStep();
// ensure their is a current timeStep and its not the first. (If the first there is no previous)
if (currentTimeStep != null && currentTimeStep.getStepNumber() > 1){
Step previousTimeStep = new Step(currentTimeStep.getStepNumber()-1);
Trajectory trajectory = postVisModel.getTrajectory(agent.getId());
if (trajectory != null){
Agent currAgent = trajectory.getAgent(currentTimeStep).orElse(null);
Agent prevAgent = trajectory.getAgent(previousTimeStep).orElse(null);
while (currAgent != null && prevAgent !=null && currAgent.getPosition().equals(prevAgent.getPosition())){
previousTimeStep = new Step(previousTimeStep.getStepNumber() -1);
prevAgent = trajectory.getAgent(previousTimeStep).orElse(null);
if (previousTimeStep.getStepNumber() < 1){
// pedestrian never moved. Cannot draw walking direction.
prevAgent = null;
}
}
if (currAgent != null && prevAgent !=null){
Vector2D direction = new Vector2D(new VPoint(
currAgent.getPosition().x - prevAgent.getPosition().x,
currAgent.getPosition().y - prevAgent.getPosition().y));
direction.normalize(1);
double r = currAgent.getRadius();
VPoint p1 = currAgent.getPosition().add(direction.rotate(Math.PI/2).normalize(0.93*r));
VPoint p2 = currAgent.getPosition().add(direction.rotate(-Math.PI/2).normalize(0.93*r));
VPoint p3 = currAgent.getPosition().add(direction.normalize(1.8*r));
String directionStr = "\\draw[walkdirection] (%f,%f) -- (%f,%f) -- (%f,%f);\n";
tikzCode = String.format(Locale.US, directionStr, p1.x, p1.y, p3.x, p3.y, p2.x, p2.y);
}
}
}
return tikzCode;
}
@NotNull
private String drawAgents(DefaultSimulationConfig config) {
String generatedCode = "";
for (Agent agent : model.getAgents()) {
if(agent instanceof Pedestrian) {
if(config.isShowWalkdirection() && model instanceof PostvisualizationModel){
generatedCode += drawWalkingDirection(agent);
}
if (model.getConfig().isShowGroups()) {
try {
Pedestrian pedestrian = (Pedestrian) agent;
......@@ -344,28 +431,35 @@ public class TikzGenerator {
Shape pedestrianShape = renderer.getAgentRender().getShape(pedestrian);
String colorString = String.format(Locale.US, "{rgb,255: red,%d; green,%d; blue,%d}", pedestrianColor.getRed(), pedestrianColor.getGreen(), pedestrianColor.getBlue());
generatedCode += String.format(Locale.US, "\\fill[fill=%s] %s;\n", colorString, generatePathForShape(pedestrianShape));
generatedCode += String.format(Locale.US, "\\fill[pedestrian, group, fill=%s] %s;\n", colorString, generatePathForShape(pedestrianShape));
} catch (ClassCastException cce) {
logger.error("Error casting to Pedestrian");
cce.printStackTrace();
// Fall back to default rendering of agents.
String agentTextPattern = "\\fill[AgentColor] (%f,%f) circle [radius=\\AgentRadius];\n";
generatedCode += String.format(Locale.US, agentTextPattern, agent.getPosition().x, agent.getPosition().y);
String agentTextPattern = "\\node[ped_circle, pedestrian, fill=AgentColor] (%f,%f) (ped_%d) at (%f,%f) {};\n";
generatedCode += String.format(Locale.US, agentTextPattern, agent.getId(), agent.getPosition().x, agent.getPosition().y);
}
} else {
Pedestrian pedestrian = (Pedestrian) agent;
Color pedestrianColor = renderer.getPedestrianColor(pedestrian);
String colorString = String.format(Locale.US, "{rgb,255: red,%d; green,%d; blue,%d}", pedestrianColor.getRed(), pedestrianColor.getGreen(), pedestrianColor.getBlue());
// Do not draw agents as path for performance reasons. Usually, agents have a circular shape.
// generatedCode += String.format(Locale.US, "\\fill[AgentColor] %s\n", generatePathForScenarioElement(agent));
String agentTextPattern = "\\fill[fill=%s] (%f,%f) circle [radius=\\AgentRadius];\n";
generatedCode += String.format(Locale.US, agentTextPattern, colorString, agent.getPosition().x, agent.getPosition().y);
if (pedestrianColor.equals(model.getConfig().getPedestrianDefaultColor())){
String agentTextPattern = "\\node[ped_circle, pedestrian] (ped_%d) at (%f,%f) {};\n";
generatedCode += String.format(Locale.US, agentTextPattern, agent.getId(), agent.getPosition().x, agent.getPosition().y);
} else {
// override default color
String colorString = String.format(Locale.US, "{rgb,255: red,%d; green,%d; blue,%d}", pedestrianColor.getRed(), pedestrianColor.getGreen(), pedestrianColor.getBlue());
// Do not draw agents as path for performance reasons. Usually, agents have a circular shape.
// generatedCode += String.format(Locale.US, "\\fill[AgentColor] %s\n", generatePathForScenarioElement(agent));
String agentTextPattern = "\\node[ped_circle, pedestrian, fill=%s] (ped_%d) at (%f,%f) {};\n";
generatedCode += String.format(Locale.US, agentTextPattern, colorString, agent.getId(), agent.getPosition().x, agent.getPosition().y);
}
}
if (model.isElementSelected() && model.getSelectedElement().equals(agent)) {
String agentTextPattern = "\\draw[magenta] (%f,%f) circle [radius=\\AgentRadius];\n";
generatedCode += String.format(Locale.US, agentTextPattern, agent.getPosition().x, agent.getPosition().y);
String agentTextPattern = "\\draw[ped_circle, pedestrian, selected, magenta] (ped_%d) at (%f,%f) {};\n";
generatedCode += String.format(Locale.US, agentTextPattern, agent.getId(), agent.getPosition().x, agent.getPosition().y);
}
}
}
......
VadereGui/src/org/vadere/gui/postvisualization/view/SettingsDialog.java
View file @ cc85ea4a
......@@ -23,11 +23,12 @@ public class SettingsDialog extends org.vadere.gui.components.view.SettingsDialo
additionalLayeredPane.setBorder(
BorderFactory.createTitledBorder(Messages.getString("PostVis.additional.border.text")));
FormLayout additionalLayout = new FormLayout("5dlu, pref, 5dlu", // col
"5dlu, pref, 2dlu, pref, 2dlu, pref, 5dlu"); // rows
"5dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 5dlu"); // rows
additionalLayeredPane.setLayout(additionalLayout);
JCheckBox chCleanPed = new JCheckBox(Messages.getString("PostVis.chbHidePedAtTarget.text"));
JCheckBox chCleanSnapshot = new JCheckBox(Messages.getString("PostVis.chbCleanSnapshot.text"));
JCheckBox chCleanTrajecties = new JCheckBox(Messages.getString("PostVis.chbHideTrajAtTarget.text"));
JCheckBox chShowAllTrajOnSnapshot = new JCheckBox(Messages.getString("PostVis.chShowAllTrajOnSnapshot.text"));
chCleanPed.setSelected(!model.config.isShowTrajecoriesOnSnapshot());
chCleanPed.addItemListener(e -> {
......@@ -45,9 +46,16 @@ public class SettingsDialog extends org.vadere.gui.components.view.SettingsDialo
chCleanSnapshot.addItemListener(
e -> model.config.setShowTrajecoriesOnSnapshot(!model.config.isShowTrajecoriesOnSnapshot()));
chShowAllTrajOnSnapshot.setSelected(model.config.isShowAllTrajOnSnapshot());
chShowAllTrajOnSnapshot.addItemListener(e -> {
model.config.setShowAllTrajOnSnapshot(!model.config.isShowAllTrajOnSnapshot());
model.notifyObservers();
});
additionalLayeredPane.add(chCleanPed, cc.xy(2, 2));
additionalLayeredPane.add(chCleanTrajecties, cc.xy(2, 4));
additionalLayeredPane.add(chCleanSnapshot, cc.xy(2, 6));
additionalLayeredPane.add(chShowAllTrajOnSnapshot, cc.xy(2, 8));
JCheckBox chShowEvacTimeColor = new JCheckBox(Messages.getString("PostVis.chShowEvacTimeColor.text"));
getColorLayeredPane().add(chShowEvacTimeColor, cc.xyw(2, 26, 8));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment