Merge branch 'master' into psychology

VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java

@@ -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?

VadereGui/src/org/vadere/gui/postvisualization/model/PostvisualizationModel.java

@@ -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;
 	}
 

VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java

@@ -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);

VadereGui/src/org/vadere/gui/topographycreator/view/TopographyWindow.java

@@ -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);