Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

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

Merge branch 'master' into topographyChecker

parents 0118a48b 5f12bea6
Pipeline #69458 passed with stages
in 66 minutes and 18 seconds
......@@ -43,7 +43,7 @@ unit_tests_with_coverage:
script:
- Documentation/version-control/git-hook-vadere-software
- mvn clean
- mvn -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList test
- mvn -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList,!TestCLOptimalStepsModel test
- python3 Tools/ContinuousIntegration/collect_line_and_branch_coverage.py
run_scenario_files:
......
......@@ -11,9 +11,14 @@ Toolbar.size=40
Logo.show=true
SettingsDialog.maxNumberOfTargets=10
View.dataFormat=yyyy_MM_dd_HH_mm_ss
View.outputDirectory.path=.
View.icon.height.value=35
View.icon.width.value=35
SettingsDialog.dataFormat=yyyy_MM_dd_HH_mm_ss
SettingsDialog.outputDirectory.path=.
SettingsDialog.snapshotDirectory.path=.
ProjectView.icon.height.value=35
ProjectView.icon.width.value=35
ProjectView.cellWidth=1.0
ProjectView.minCellWidth=0.01
ProjectView.maxCellWidth=10.0
PostVis.SVGWidth=1024
PostVis.SVGHeight=768
PostVis.snapshotDirectory.path=.
PostVis.maxNumberOfSaveDirectories=5
PostVis.maxFramePerSecond=30
PostVis.framesPerSecond=5
......
......@@ -199,8 +199,10 @@ AdjustPanel.lblStep.text=Timestep
ProjectView.mntmOutputToSceneario.text=Generate scenario
ProjectView.mntmRunOutput.text=Run offline again
PostVis.chbShowPedestrianIds.text=Show PedestrianIds
SettingsDialog.chbShowPedestrianIds.text=Show PedestrianIds
PostVis.chShowEvacTimeColor.text=Color Pedestrians regarding to Evacuation Times
PostVis.additional.border.text=PostVis
PostVis.btnPlay.tooltip=Play
PostVis.btnPause.tooltip=Pause
PostVis.btnStop.tooltip=Stop
......@@ -210,18 +212,21 @@ PostVis.about.title=About
PostVis.title=Vadere Post-Visualization
PostVis.version= Version {0}
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.chbCleanSnapshot.text=Hide Trajectories on Snapshots
PostVis.chbHideVoronoiDiagram.text=Hide VoronoiDiagram
PostVis.chbShowObstacles.text=Show Obstacles
PostVis.chbShowTargets.text=Show Targets
PostVis.chbShowSources.text=Show Sources
PostVis.chbShowStairs.text=Show Stairs
PostVis.btnSnapshot.tooltip=Snapshot
PostVis.btnPNGSnapshot.tooltip=PNG Snapshot
PostVis.btnSVGSnapshot.tooltip=SVG Snapshot
PostVis.btnTikZSnapshot.tooltip=TikZ Snapshot
SettingsDialog.chbUseRandomColors.text=Random Coloring
SettingsDialog.chbHideVoronoiDiagram.text=Hide VoronoiDiagram
SettingsDialog.chbShowObstacles.text=Show Obstacles
SettingsDialog.chbShowTargets.text=Show Targets
SettingsDialog.chbShowSources.text=Show Sources
SettingsDialog.chbShowStairs.text=Show Stairs
ProjectView.btnSnapshot.tooltip=Snapshot
ProjectView.btnPNGSnapshot.tooltip=PNG Snapshot
ProjectView.btnSVGSnapshot.tooltip=SVG Snapshot
ProjectView.btnTikZSnapshot.tooltip=TikZ Snapshot
PostVis.menuFile.title=File
PostVis.menuSettings.title=Setting
PostVis.menuRecentFiles.title=Recent Files
......@@ -257,20 +262,20 @@ SettingsDialog.btnClose.text=Close
SettingsDialog.lblDensityColor.text=Density
SettingsDialog.lblStair.text=Stair
SettingsDialog.lblPedestrianNoTarget.text=Without Target (-1)
SettingsDialog.menuOpenFloorFieldFile.title=Add Floor Field File...
View.btnDrawVoronoiDiagram.tooltip=Draw and display a Voronoi Diagram
View.chbLogo.text=Show the Vadere logo
View.btnShowWalkingDirection.tooltip=Show the walking direction of all pedestrians
View.btnShowGroupInformation.tooltip=Draw pedestrians within one group with same shape and color
View.btnShowPedestrian.tooltip=Show Pedestrians
View.btnShowPotentialfield.tooltip=Show Potential Field (only possible after adding potential field file)
View.btnShowTrajectories.tooltip=Show Trajectories
View.btnShowGrid.tooltip=Show Grid
View.btnShowDensity.tooltip=Show Density
View.btnSettings.tooltip=Settings
View.btnOk=OK
View.btnCancel=Cancel
ProjectView.menuOpenFloorFieldFile.title=Add Floor Field File...
ProjectView.btnDrawVoronoiDiagram.tooltip=Draw and display a Voronoi Diagram
SettingsDialog.chbLogo.text=Show the Vadere logo
ProjectView.btnShowWalkingDirection.tooltip=Show the walking direction of all pedestrians
ProjectView.btnShowGroupInformation.tooltip=Draw pedestrians within one group with same shape and color
ProjectView.btnShowPedestrian.tooltip=Show Pedestrians
ProjectView.btnShowPotentialfield.tooltip=Show Potential Field (only possible after adding potential field file)
ProjectView.btnShowTrajectories.tooltip=Show Trajectories
ProjectView.btnShowGrid.tooltip=Show Grid
ProjectView.btnShowDensity.tooltip=Show Density
ProjectView.btnSettings.tooltip=Settings
ProjectView.btnOk=OK
ProjectView.btnCancel=Cancel
TopographyCreator.btnMinimizeTopography.tooltip=Select Viewport area
TopographyCreator.btnMaximizeTopography.tooltip=Maximize Viewport area
......
......@@ -3,7 +3,6 @@
AttributeFileView.btnChangeAttributeFile.text=Attributsdatei \u00E4ndern...
AttributesFileView.btnSaveToFile.text=In Datei speichern...
AttributesFileView.txtrAttributefiletextarea.text=attributeFileTextArea
ChooseFile.text=Datei w\u00E4hlen...
ChooseProjectSaveDirMessage.title=Pfad f\u00FCr Projektdatei w\u00E4hlen...
ChooseSaveDirMessage.title=Pfad w\u00E4hlen...
......@@ -199,7 +198,8 @@ AdjustPanel.lblStep.text=Zeitschritt
ProjectView.mntmOutputToSceneario.text=Generiere Szenario
ProjectView.mntmRunOutput.text=Offline erneut starten
PostVis.chbShowPedestrianIds.text=Fu\u00dfg\u00E4nger-Ids anzeigen
SettingsDialog.chbShowPedestrianIds.text=Fu\u00dfg\u00E4nger-Ids anzeigen
PostVis.additional.border.text=PostVis
PostVis.chShowEvacTimeColor.text=F\u00e4rbe Fu\u00dfg\u00E4nger nach ihrer Evakuierungszeit
PostVis.btnPlay.tooltip=Start
PostVis.btnPause.tooltip=Pause
......@@ -210,18 +210,21 @@ PostVis.about.title=\u00dcber
PostVis.title=Vadere Post-Visualization
PostVis.version= Version {0}
PostVis.license.text=Dieses Produkt ist unter der {0} lizenziert
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.chbHideVoronoiDiagram.text=Voronoi-Diagramm nicht anzeigen
PostVis.chbShowObstacles.text=Hindernisse anzeigen
PostVis.chbShowTargets.text=Ziele anzeigen
PostVis.chbShowSources.text=Quellen anzeigen
PostVis.chbShowStairs.text=Treppen anzeigen
PostVis.btnSnapshot.tooltip=Snapshot
PostVis.btnPNGSnapshot.tooltip=PNG-Snapshot
PostVis.btnSVGSnapshot.tooltip=SVG-Snapshot
PostVis.btnTikZSnapshot.tooltip=TikZ-Snapshot
SettingsDialog.chbUseRandomColors.text=Zuf\u00E4llige Farben
SettingsDialog.chbHideVoronoiDiagram.text=Voronoi-Diagramm nicht anzeigen
SettingsDialog.chbShowObstacles.text=Hindernisse anzeigen
SettingsDialog.chbShowTargets.text=Ziele anzeigen
SettingsDialog.chbShowSources.text=Quellen anzeigen
SettingsDialog.chbShowStairs.text=Treppen anzeigen
ProjectView.btnSnapshot.tooltip=Snapshot
ProjectView.btnPNGSnapshot.tooltip=PNG-Snapshot
ProjectView.btnSVGSnapshot.tooltip=SVG-Snapshot
ProjectView.btnTikZSnapshot.tooltip=TikZ-Snapshot
PostVis.menuFile.title=Datei
PostVis.menuSettings.title=Einstellungen
PostVis.menuRecentFiles.title=K\u00FCrzlich verwendete Dateien
......@@ -245,7 +248,7 @@ SettingsDialog.title=Einstellungen
SettingsDialog.colors.border.text=Farben
SettingsDialog.additional.border.text=Extras
SettingsDialog.lblTarget.text=Ziel
#SettingsDialog.lblPedestrian.text=Pedestrian
SettingsDialog.lblPedestrian.text=Pedestrian
SettingsDialog.lblObstacle.text=Hindernis
SettingsDialog.lblSource.text=Quelle
SettingsDialog.lblSnapshotDir.text=Snapshot & Video-Verzeichnis
......@@ -258,19 +261,19 @@ SettingsDialog.lblDensityColor.text=Dichte
SettingsDialog.lblStair.text=Treppe
SettingsDialog.lblPedestrianNoTarget.text=Ohne Ziel (-1)
SettingsDialog.menuOpenFloorFieldFile.title=Floor Field-Datei hinzuf\u00fcgen...
View.btnDrawVoronoiDiagram.tooltip=Voronoi-Diagramm zeichnen und anzeigen
View.chbLogo.text=VADERE-Logo anzeigen
View.btnShowWalkingDirection.tooltip=Gehrichtung aller Fu\u00dfg\u00e4nger anzeigen
View.btnShowGroupInformation.tooltip=Zeichne Fu\u00dfg\u00e4nger einer Gruppe mit denn selben Formen und Farben
View.btnShowPedestrian.tooltip=Fu\u00dfg\u00e4nger anzeigen
View.btnShowPotentialfield.tooltip=Potenzialfeld anzeigen (nur m\u00f6glich, nachdem eine Datei f\u00fcr das Potenzialfeld hinzugef\u00fcgt wurde)
View.btnShowTrajectories.tooltip=Trajektorien anzeigen
View.btnShowGrid.tooltip=Gitter anzeigen
View.btnShowDensity.tooltip=Dichte anzeigen
View.btnSettings.tooltip=Einstellungen
View.btnOk=OK
View.btnCancel=Abbrechen
SettingsDialog.btnDrawVoronoiDiagram.tooltip=Voronoi-Diagramm zeichnen und anzeigen
SettingsDialog.chbLogo.text=VADERE-Logo anzeigen
ProjectView.btnShowWalkingDirection.tooltip=Gehrichtung aller Fu\u00dfg\u00e4nger anzeigen
ProjectView.btnShowGroupInformation.tooltip=Zeichne Fu\u00dfg\u00e4nger einer Gruppe mit denn selben Formen und Farben
ProjectView.btnShowPedestrian.tooltip=Fu\u00dfg\u00e4nger anzeigen
ProjectView.btnShowPotentialfield.tooltip=Potenzialfeld anzeigen (nur m\u00f6glich, nachdem eine Datei f\u00fcr das Potenzialfeld hinzugef\u00fcgt wurde)
ProjectView.btnShowTrajectories.tooltip=Trajektorien anzeigen
ProjectView.btnShowGrid.tooltip=Gitter anzeigen
ProjectView.btnShowDensity.tooltip=Dichte anzeigen
ProjectView.btnSettings.tooltip=Einstellungen
ProjectView.btnOk=OK
ProjectView.btnCancel=Abbrechen
TopographyCreator.btnMinimizeTopography.tooltip=Select Viewport area
TopographyCreator.btnMaximizeTopography.tooltip=Anzeigebereich maximieren
......
package org.vadere.gui.onlinevisualization.control;
package org.vadere.gui.components.control.simulation;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
......@@ -24,7 +24,7 @@ import javax.swing.*;
public class ActionGeneratePNG extends AbstractAction implements IRendererChangeListener {
private static Logger logger = LogManager.getLogger(ActionGeneratePNG.class);
private static Resources resources = Resources.getInstance("postvisualization");
private static Resources resources = Resources.getInstance("global");
private ImageGenerator generator;
private final SimulationModel<? extends DefaultSimulationConfig> model;
......@@ -41,10 +41,10 @@ public class ActionGeneratePNG extends AbstractAction implements IRendererChange
ImageSizeDialog imageSizeDialog = new ImageSizeDialog(model);
if (imageSizeDialog.getState() == ImageSizeDialog.State.Ok) {
JFileChooser fileChooser = new JFileChooser(Preferences.userNodeForPackage(PostVisualisation.class).get("PostVis.snapshotDirectory.path", "."));
JFileChooser fileChooser = new JFileChooser(Preferences.userNodeForPackage(PostVisualisation.class).get("SettingsDialog.snapshotDirectory.path", "."));
Date todaysDate = new java.util.Date();
SimpleDateFormat formatter = new SimpleDateFormat(resources.getProperty("View.dataFormat"));
SimpleDateFormat formatter = new SimpleDateFormat(resources.getProperty("SettingsDialog.dataFormat"));
String formattedDate = formatter.format(todaysDate);
......
package org.vadere.gui.onlinevisualization.control;
package org.vadere.gui.components.control.simulation;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
......@@ -20,7 +20,7 @@ import javax.swing.*;
public class ActionGenerateSVG extends AbstractAction implements IRendererChangeListener {
private static Logger logger = LogManager.getLogger(ActionGenerateSVG.class);
private static Resources resources = Resources.getInstance("postvisualization");
private static Resources resources = Resources.getInstance("global");
private final SVGGenerator svgGenerator;
private final SimulationModel<? extends DefaultSimulationConfig> model;
......@@ -34,10 +34,10 @@ public class ActionGenerateSVG extends AbstractAction implements IRendererChange
@Override
public void actionPerformed(ActionEvent e) {
Date todaysDate = new java.util.Date();
SimpleDateFormat formatter = new SimpleDateFormat(resources.getProperty("View.dataFormat"));
SimpleDateFormat formatter = new SimpleDateFormat(resources.getProperty("SettingsDialog.dataFormat"));
String formattedDate = formatter.format(todaysDate);
JFileChooser fileChooser = new JFileChooser(Preferences.userNodeForPackage(PostVisualisation.class).get("PostVis.snapshotDirectory.path", "."));
JFileChooser fileChooser = new JFileChooser(Preferences.userNodeForPackage(PostVisualisation.class).get("SettingsDialog.snapshotDirectory.path", "."));
File outputFile = new File("pv_snapshot_" + formattedDate + ".svg");
fileChooser.setSelectedFile(outputFile);
......
package org.vadere.gui.onlinevisualization.control;
package org.vadere.gui.components.control.simulation;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
......@@ -8,7 +8,6 @@ import org.vadere.gui.components.utils.Resources;
import org.vadere.gui.components.view.SimulationRenderer;
import org.vadere.gui.onlinevisualization.view.IRendererChangeListener;
import org.vadere.gui.postvisualization.PostVisualisation;
import org.vadere.gui.postvisualization.utils.SVGGenerator;
import org.vadere.gui.postvisualization.utils.TikzGenerator;
import javax.swing.*;
......@@ -21,7 +20,7 @@ import java.util.prefs.Preferences;
public class ActionGenerateTikz extends AbstractAction implements IRendererChangeListener {
private static Logger logger = LogManager.getLogger(ActionGenerateTikz.class);
private static Resources resources = Resources.getInstance("postvisualization");
private static Resources resources = Resources.getInstance("global");
private final TikzGenerator tikzGenerator;
private final SimulationModel<? extends DefaultSimulationConfig> model;
......@@ -35,10 +34,10 @@ public class ActionGenerateTikz extends AbstractAction implements IRendererChang
@Override
public void actionPerformed(ActionEvent e) {
Date todaysDate = new Date();
SimpleDateFormat formatter = new SimpleDateFormat(resources.getProperty("View.dataFormat"));
SimpleDateFormat formatter = new SimpleDateFormat(resources.getProperty("SettingsDialog.dataFormat"));
String formattedDate = formatter.format(todaysDate);
JFileChooser fileChooser = new JFileChooser(Preferences.userNodeForPackage(PostVisualisation.class).get("PostVis.snapshotDirectory.path", "."));
JFileChooser fileChooser = new JFileChooser(Preferences.userNodeForPackage(PostVisualisation.class).get("SettingsDialog.snapshotDirectory.path", "."));
File outputFile = new File("pv_snapshot_" + formattedDate + ".tex");
fileChooser.setSelectedFile(outputFile);
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import java.awt.Color;
import java.awt.event.ActionEvent;
......@@ -6,12 +6,13 @@ import java.awt.event.ActionEvent;
import javax.swing.JColorChooser;
import javax.swing.JPanel;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
public abstract class ActionSetColor extends ActionVisualization {
private JPanel coloredPanel;
public ActionSetColor(final String name, final PostvisualizationModel model, final JPanel coloredPanel) {
public ActionSetColor(final String name, final SimulationModel<? extends DefaultSimulationConfig> model, final JPanel coloredPanel) {
super(name, model);
this.coloredPanel = coloredPanel;
}
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import java.awt.Color;
import javax.swing.JPanel;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
import org.vadere.gui.components.control.simulation.ActionSetColor;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
public class ActionSetDensityColor extends ActionSetColor {
public ActionSetDensityColor(String name, PostvisualizationModel model, JPanel coloredPanel) {
public ActionSetDensityColor(String name, SimulationModel<? extends DefaultSimulationConfig> model, JPanel coloredPanel) {
super(name, model, coloredPanel);
}
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import java.awt.Color;
import javax.swing.JPanel;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
import org.vadere.gui.components.control.simulation.ActionSetColor;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
public class ActionSetObstacleColor extends ActionSetColor {
public ActionSetObstacleColor(String name, PostvisualizationModel model, JPanel coloredPanel) {
public ActionSetObstacleColor(String name, SimulationModel<? extends DefaultSimulationConfig> model, JPanel coloredPanel) {
super(name, model, coloredPanel);
}
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import java.awt.Color;
import javax.swing.JComboBox;
import javax.swing.JPanel;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
import org.vadere.gui.components.control.simulation.ActionSetColor;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
public class ActionSetPedestrianColor extends ActionSetColor {
private final JComboBox<Integer> comboBox;
public ActionSetPedestrianColor(final String name, final PostvisualizationModel model, final JPanel coloredPanel,
final JComboBox<Integer> comboBox) {
public ActionSetPedestrianColor(final String name, final SimulationModel<? extends DefaultSimulationConfig> model, final JPanel coloredPanel,
final JComboBox<Integer> comboBox) {
super(name, model, coloredPanel);
this.comboBox = comboBox;
}
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import java.awt.Color;
import javax.swing.JPanel;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
import org.vadere.gui.components.control.simulation.ActionSetColor;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
public class ActionSetPedestrianWithoutTargetColor extends ActionSetColor {
public ActionSetPedestrianWithoutTargetColor(String name, PostvisualizationModel model, JPanel coloredPanel) {
public ActionSetPedestrianWithoutTargetColor(String name, SimulationModel<? extends DefaultSimulationConfig> model, JPanel coloredPanel) {
super(name, model, coloredPanel);
}
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import java.awt.event.ActionEvent;
import java.io.File;
......@@ -7,16 +7,17 @@ import java.util.prefs.Preferences;
import javax.swing.JFileChooser;
import javax.swing.JTextField;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
import org.vadere.gui.components.utils.Resources;
import org.vadere.gui.postvisualization.PostVisualisation;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
public class ActionSetSnapshotDirectory extends ActionVisualization {
private static Resources resources = Resources.getInstance("postvisualization");
private final JTextField textField;
public ActionSetSnapshotDirectory(final String name, final PostvisualizationModel model,
public ActionSetSnapshotDirectory(final String name, final SimulationModel<? extends DefaultSimulationConfig> model,
final JTextField textField) {
super(name, model);
this.textField = textField;
......@@ -24,13 +25,13 @@ public class ActionSetSnapshotDirectory extends ActionVisualization {
@Override
public void actionPerformed(ActionEvent e) {
final JFileChooser fc = new JFileChooser(resources.getProperty("PostVis.snapshotDirectory.path"));
final JFileChooser fc = new JFileChooser(resources.getProperty("SettingsDialog.snapshotDirectory.path"));
fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
int returnVal = fc.showOpenDialog(null);
if (returnVal == JFileChooser.APPROVE_OPTION) {
File file = fc.getSelectedFile();
resources.setProperty("PostVis.snapshotDirectory.path", file.getAbsolutePath());
Preferences.userNodeForPackage(PostVisualisation.class).put("PostVis.snapshotDirectory.path",
resources.setProperty("SettingsDialog.snapshotDirectory.path", file.getAbsolutePath());
Preferences.userNodeForPackage(PostVisualisation.class).put("SettingsDialog.snapshotDirectory.path",
file.getAbsolutePath());
textField.setText(file.getAbsolutePath());
}
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import java.awt.Color;
import javax.swing.JPanel;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
import org.vadere.gui.components.control.simulation.ActionSetColor;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
public class ActionSetSourceColor extends ActionSetColor {
public ActionSetSourceColor(String name, PostvisualizationModel model, JPanel coloredPanel) {
public ActionSetSourceColor(String name, SimulationModel<? extends DefaultSimulationConfig> model, JPanel coloredPanel) {
super(name, model, coloredPanel);
}
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import javax.swing.*;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
import org.vadere.gui.components.control.simulation.ActionSetColor;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
import java.awt.*;
public class ActionSetStairsColor extends ActionSetColor {
public ActionSetStairsColor(final String name, final PostvisualizationModel model, final JPanel coloredPanel) {
public ActionSetStairsColor(final String name, final SimulationModel<? extends DefaultSimulationConfig> model, final JPanel coloredPanel) {
super(name, model, coloredPanel);
}
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import java.awt.Color;
import javax.swing.JPanel;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
import org.vadere.gui.components.control.simulation.ActionSetColor;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
public class ActionSetTargetColor extends ActionSetColor {
public ActionSetTargetColor(final String name, final PostvisualizationModel model, final JPanel coloredPanel) {
public ActionSetTargetColor(final String name, final SimulationModel<? extends DefaultSimulationConfig> model, final JPanel coloredPanel) {
super(name, model, coloredPanel);
}
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.vadere.gui.components.control.DefaultSelectionMode;
import org.vadere.gui.components.control.DrawVoronoiDiagramMode;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
import javax.swing.*;
import java.awt.event.ActionEvent;
......@@ -13,11 +14,11 @@ public class ActionSwapSelectionMode extends ActionVisualization {
private static Logger logger = LogManager.getLogger(ActionSwapSelectionMode.class);
public ActionSwapSelectionMode(final String name, final PostvisualizationModel model) {
public ActionSwapSelectionMode(final String name, final SimulationModel<? extends DefaultSimulationConfig> model) {
super(name, model);
}
public ActionSwapSelectionMode(final String name, Icon icon, final PostvisualizationModel model) {
public ActionSwapSelectionMode(final String name, Icon icon, final SimulationModel<? extends DefaultSimulationConfig> model) {
super(name, icon, model);
}
......
package org.vadere.gui.postvisualization.control;
package org.vadere.gui.components.control.simulation;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Icon;
import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel;
import org.vadere.gui.postvisualization.model.PostvisualizationModel;
public class ActionVisualization extends AbstractAction {
protected final PostvisualizationModel model;
protected final SimulationModel<? extends DefaultSimulationConfig> model;
public ActionVisualization(final String name, Icon icon, final PostvisualizationModel model) {
public ActionVisualization(final String name, Icon icon, final SimulationModel<? extends DefaultSimulationConfig> model) {
super(name, icon);
this.model = model;
}
public ActionVisualization(final String name, final PostvisualizationModel model) {
public ActionVisualization(final String name, final SimulationModel<? extends DefaultSimulationConfig> model) {
this(name, null, model);
}
......
......@@ -66,7 +66,7 @@ public abstract class DefaultModel<T extends DefaultConfig> extends Observable i
this.cursorWorldPosition = VPoint.ZERO;
this.selectScenarioElementListener = new LinkedList<>();
this.voronoiDiagram = null;
this.showVoroniDiagram = false;