Skip to content

GitLab

Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit fd910ca2 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

Merge branch 'master' of https://gitlab.lrz.de/vadere/vadere

parents 387a0b00 ba757cca
Pipeline #119621 passed with stages
in 138 minutes and 3 seconds
Hide whitespace changes
Inline Side-by-side
VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java
View file @ fd910ca2
......@@ -137,6 +137,8 @@ public class TikzGenerator {
Color agentColor = model.getConfig().getPedestrianDefaultColor();
colorDefinitions += String.format(Locale.US, colorTextPattern, "AgentColor", agentColor.getRed(), agentColor.getGreen(), agentColor.getBlue());
colorDefinitions += String.format(Locale.US, colorTextPattern, "AgentIdColor", 255, 127, 0); // This orange color is hard-coded in "DefaultRenderer".
colorDefinitions += "\n";
return colorDefinitions;
......@@ -262,9 +264,20 @@ public class TikzGenerator {
generatedCode += "% Agents\n";
generatedCode += drawAgents(config);
} else {
generatedCode = "% Agents (not enabled in config)\n";
generatedCode += "% Agents (not enabled in config)\n";
}
if (config.isShowPedestrianIds()) {
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",
agent.getId(), agent.getPosition().x, agent.getPosition().y, agent.getId());
}
} else {
generatedCode += "% Agent Ids (not enabled in config)\n";
}
return generatedCode;
}
......
VadereGui/src/org/vadere/gui/projectview/control/ActionShowAboutDialog.java
View file @ fd910ca2
......@@ -18,20 +18,15 @@ public class ActionShowAboutDialog extends AbstractAction {
super(name);
}
/*
JOptionPane.showMessageDialog(null, text,
Messages.getString("PostVis.about.title"),
JOptionPane.INFORMATION_MESSAGE);
*/
@Override
public void actionPerformed(final ActionEvent event) {
String text = "<html>" +
"<font size =\"3\"><em>" + MessageFormat.format(Messages.getString("ProjectView.version"), HashGenerator.releaseNumber()) + "</em></font><br>" +
"<font size =\"3\">" + MessageFormat.format(Messages.getString("ProjectView.license.text"), "GNU Lesser General Public License (<em>LGPL</em>)")+".</font></html>";
String text = "";
text += "<html>";
text += "<font size =\"3\"><em>" + MessageFormat.format(Messages.getString("ProjectView.version"), HashGenerator.releaseNumber()) + "</em></font><br>";
text += "<br>";
text += "<font size =\"3\">www.vadere.org</font><br>";
text += "<font size =\"3\">" + MessageFormat.format(Messages.getString("ProjectView.license.text"), "GNU Lesser General Public License (<em>LGPL</em>).") + "</font>";
text += "</html>";
JOptionPane.showMessageDialog(null,
text, Messages.getString("ProjectView.aboutDialog.label"),
......
VadereGui/src/org/vadere/gui/projectview/view/AboutDialogView.java deleted 100644 → 0
View file @ 387a0b00
package org.vadere.gui.projectview.view;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/**
* A simple about dialog for the Vadere GUI.
*
*
*/
public class AboutDialogView extends JDialog {
private static final long serialVersionUID = 7906201118628730905L;
private final JPanel contentPanel = new JPanel();
/**
* Create the dialog.
*/
public AboutDialogView() {
final JDialog currentDialog = this;
setTitle("About");
setBounds(100, 100, 450, 300);
getContentPane().setLayout(new BorderLayout());
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel, BorderLayout.CENTER);
contentPanel.setLayout(new BorderLayout(0, 0));
{
JLabel lblVadereGUI = new JLabel("Vadere GUI");
contentPanel.add(lblVadereGUI, BorderLayout.NORTH);
}
{
JLabel lblThisSoftwareManages = new JLabel(
"This software manages scenarios for the Vadere Pedestrian Crowd Simulator.");
contentPanel.add(lblThisSoftwareManages, BorderLayout.CENTER);
}
{
JPanel buttonPane = new JPanel();
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane, BorderLayout.SOUTH);
{
JButton closeButton = new JButton("Close");
closeButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
currentDialog.setVisible(false);
}
});
closeButton.setActionCommand("Close");
buttonPane.add(closeButton);
getRootPane().setDefaultButton(closeButton);
}
}
}
}
VadereGui/src/org/vadere/gui/projectview/view/ProjectView.java
View file @ fd910ca2
......@@ -427,7 +427,6 @@ public class ProjectView extends JFrame implements ProjectFinishedListener, Sing
menuBar.add(mnHelp);
Action showAboutAction = new ActionShowAboutDialog(Messages.getString("ProjectView.mntmAbout.text"));
setAcceleratorFromLocalizedShortcut(showAboutAction, "ProjectView.mntmAbout.shortcut");
JMenuItem mntmAbout = new JMenuItem(showAboutAction);
mnHelp.add(mntmAbout);
......
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