Commit d491aa08 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier

Merge branch 'master' into psychology

parents d07586dd 4d57ac3d
Pipeline #172890 passed with stages
in 125 minutes and 21 seconds
......@@ -61,7 +61,7 @@ public class OnlineVisualisationWindow extends JPanel implements Observer {
this.toolbar = new JToolBar("OnlineVisualizationToolbar");
toolbar.setFloatable(false);
// toolbar.setBorderPainted(false);
toolbar.setBorderPainted(false);
toolbar.setAlignmentX(Component.LEFT_ALIGNMENT);
toolbar.setAlignmentY(Component.TOP_ALIGNMENT);
// TODO: Should this be really configurable in a config file?
......
......@@ -298,7 +298,7 @@ public class PostvisualizationModel extends SimulationModel<PostvisualizationCon
public synchronized List<VPoint> getPositions() {
List<VPoint> positions = new ArrayList<>();
trajectories.getAgents(getSimTimeInSec()).forEach(row -> toPosition(row));
trajectories.getAgents(getSimTimeInSec()).forEach(row -> positions.add(toPosition(row)));
return positions;
}
......
......@@ -89,7 +89,7 @@ public class PostvisualizationWindow extends JPanel implements Observer, DropTar
// 6. construct the toolbar
toolbar = new JToolBar("Toolbar");
int toolbarSize = CONFIG.getInt("Gui.toolbar.size");
toolbar.setPreferredSize(new Dimension(toolbarSize, toolbarSize));
//toolbar.setPreferredSize(new Dimension(toolbarSize, toolbarSize));
toolbar.setBorderPainted(false);
toolbar.setFloatable(false);
toolbar.setAlignmentX(Component.LEFT_ALIGNMENT);
......
......@@ -81,9 +81,10 @@ public class TopographyWindow extends JPanel {
toolbar = new ScenarioToolBar("Toolbar");
int toolbarSize = VadereConfig.getConfig().getInt("Gui.toolbar.size");
toolbar.setPreferredSize(new Dimension(toolbarSize, toolbarSize));
toolbar.setBorderPainted(false);
toolbar.setFloatable(false);
Dimension prefSize = new Dimension(toolbarSize, toolbarSize);
//toolbar.setPreferredSize(prefSize);
toolbar.setBorderPainted(true);
toolbar.setFloatable(true);
toolbar.setAlignmentX(Component.LEFT_ALIGNMENT);
toolbar.setAlignmentY(Component.TOP_ALIGNMENT);
......
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