From 0c20647f692e3737107f8f39e1757a87d062c15c Mon Sep 17 00:00:00 2001 From: Benedikt Kleinmeier Date: Tue, 3 Jul 2018 14:45:18 +0200 Subject: [PATCH] In "TikzGenerator.java", highlight currently selected agent with colored border. In "PostvisualizationWindow.java", added button to generate TikZ image. --- VadereGui/resources/messages_de_DE.properties | 2 +- .../view/OnlineVisualisationWindow.java | 6 +++--- .../vadere/gui/postvisualization/utils/TikzGenerator.java | 7 ++++++- .../postvisualization/view/PostvisualizationWindow.java | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/VadereGui/resources/messages_de_DE.properties b/VadereGui/resources/messages_de_DE.properties index 8716d3930..430b04a4e 100644 --- a/VadereGui/resources/messages_de_DE.properties +++ b/VadereGui/resources/messages_de_DE.properties @@ -220,7 +220,7 @@ PostVis.chbShowStairs.text=Treppen anzeigen PostVis.btnSnapshot.tooltip=Snapshot PostVis.btnPNGSnapshot.tooltip=PNG-Snapshot PostVis.btnSVGSnapshot.tooltip=SVG-Snapshot -PostVis.btnTikZSnapshot.tooltip=TikZ Snapshot +PostVis.btnTikZSnapshot.tooltip=TikZ-Snapshot PostVis.menuFile.title=Datei PostVis.menuSettings.title=Einstellungen PostVis.menuRecentFiles.title=K\u00FCrzlich verwendete Dateien diff --git a/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java b/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java index 06b1391f3..97548031f 100644 --- a/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java +++ b/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java @@ -150,20 +150,20 @@ public class OnlineVisualisationWindow extends JPanel implements Observer { }; ActionGeneratePNG generatePNG = new ActionGeneratePNG( - "generatePNG", + Messages.getString("PostVis.btnPNGSnapshot.tooltip"), resources.getIcon("camera_png.png", iconWidth, iconHeight), new OnlinevisualizationRenderer(model), model); ActionGenerateSVG generateSVG = new ActionGenerateSVG( - "generateSVG", + Messages.getString("PostVis.btnSVGSnapshot.tooltip"), resources.getIcon("camera_svg.png", iconWidth, iconHeight), new OnlinevisualizationRenderer(model), model); ActionGenerateTikz generateTikz = new ActionGenerateTikz( - "generateTikz", + Messages.getString("PostVis.btnTikZSnapshot.tooltip"), resources.getIcon("camera_tikz.png", iconWidth, iconHeight), new OnlinevisualizationRenderer(model), model); diff --git a/VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java b/VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java index 0ea9f9883..2c8c84987 100644 --- a/VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java +++ b/VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java @@ -166,7 +166,12 @@ public class TikzGenerator { if (config.isShowPedestrians()) { generatedCode += "% Agents\n"; for (Agent agent : model.getAgents()) { - String agentTextPattern = "\\fill[AgentColor] (%f,%f) circle [radius=%fcm];\n"; + String agentTextPattern = "\\fill[AgentColor] (%f,%f) circle [radius=%fcm];\n"; + + if (model.isElementSelected() && model.getSelectedElement().equals(agent)) { + agentTextPattern = "\\fill[draw=magenta,fill=AgentColor] (%f,%f) circle [radius=%fcm];\n"; + } + generatedCode += String.format(agentTextPattern, agent.getPosition().x, agent.getPosition().y, agent.getRadius()); // Do not draw agents as path for performance reasons. Usually, agents have a circular shape. // generatedCode += String.format("\\fill[AgentColor] %s\n", generatePathForScenarioElement(agent)); diff --git a/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java b/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java index 86fe48bd7..25418661b 100644 --- a/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java +++ b/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java @@ -253,12 +253,13 @@ public class PostvisualizationWindow extends JPanel implements Observer { renderer); ActionVisualization svgImg = new ActionGenerateSVG(Messages.getString("PostVis.btnSVGSnapshot.tooltip"), resources.getIcon("camera_svg.png", iconWidth, iconHeight), renderer); - ActionVisualization tikzImg = new ActionGenerateTikz("tikz_snapshot", resources.getIcon("camera_tikz.png", iconWidth, iconHeight), + ActionVisualization tikzImg = new ActionGenerateTikz(Messages.getString("PostVis.btnTikZSnapshot.tooltip"), resources.getIcon("camera_tikz.png", iconWidth, iconHeight), renderer); // add new ImageGenerator Action ... imgOptions.add(pngImg); imgOptions.add(svgImg); + imgOptions.add(tikzImg); // add Action to List .... ActionVisualizationMenu imgDialog = new ActionVisualizationMenu( -- GitLab