iets

Agenda/Agenda.java

@@ -51,20 +51,7 @@ public class Agenda implements Serializable {
 	{
 		return stages;
 	}
-	public ArrayList<Event> eventsForStage(AgendaStage st)
-	{
-		ArrayList<Event> stageEvents = new ArrayList<Event>();
-		for(Event e: events)
-		{
-			if(e.getStage() == st)
-			{
-				stageEvents.add(e);
-			}
-		}
-		return stageEvents;
-	}
 	
-	/*
 	public void saveAgenda()
 	{
 		JFileChooser fileChooser = new JFileChooser();
@@ -192,7 +179,7 @@ public class Agenda implements Serializable {
 		{
 			boolean exists = false;
 			String name = e.getStage().getName();
-			for (Stage s : stages)
+			for (AgendaStage s : stages)
 			{
 				if ( s.getName().equals(name) ) {
 					exists = true;
@@ -215,8 +202,7 @@ public class Agenda implements Serializable {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-	}	
-	*/	
+	}		
 	
 	public void clearAgenda()
 	{
@@ -225,12 +211,10 @@ public class Agenda implements Serializable {
 		artists.clear();
 	}	
 	
-	/*
 	public void fillAllLists()
 	{
 		loadAgenda();
 		fillStages();
 		fillArtists();
 	}
-	*/
-}
+}

Agenda/EditArtistPanel.java

@@ -19,7 +19,7 @@ public class EditArtistPanel extends JFrame {
 
 	public EditArtistPanel(Agenda agenda, Artist art, TabbedPane tab)
 	{
-		super("Artist editscreen");
+		super("Artist editscreen!");
 		setDefaultCloseOperation(HIDE_ON_CLOSE);
 		JPanel content = new JPanel(new BorderLayout());
 		JPanel south = new JPanel(new FlowLayout());

Agenda/EditEventPanel.java

@@ -24,7 +24,7 @@ public class EditEventPanel extends JFrame{
 
 	public EditEventPanel(Agenda agenda, Event e, TabbedPane tab)
 	{
-		super("Event editscreen");
+		super("Event editscreen!");
 		setDefaultCloseOperation(HIDE_ON_CLOSE);
 		JPanel content = new JPanel(new BorderLayout());
 		JPanel south = new JPanel(new FlowLayout());

Agenda/EditStagePanel.java

@@ -20,7 +20,7 @@ public class EditStagePanel extends JFrame{
 
 	public EditStagePanel(Agenda agenda, AgendaStage sta)
 	{
-		super("Stage editscreen");
+		super("Stage editscreen!");
 		setDefaultCloseOperation(HIDE_ON_CLOSE);
 		JPanel content = new JPanel(new BorderLayout());
 		JPanel south = new JPanel(new FlowLayout());

Agenda/Event.java

@@ -34,8 +34,8 @@ public class Event implements Serializable {
 				endHour, endMinute);
 		this.startHour = startHour;
 		this.startMinute = startMinute;
-		this.stopHour = endHour;
-		this.stopMinute = endMinute;
+		this.stopHour = stopHour;
+		this.stopMinute = stopMinute;
 		this.stage = stage;
 		this.artist = artist;
 		this.description = description;
@@ -55,11 +55,11 @@ public class Event implements Serializable {
 	}
 	
 	public int getStart(){
-		return (startHour * 60) + startMinute;
+		return (startHour * 100) + startMinute;
 	}
 	
 	public int getStop(){
-		return (stopHour * 60) + stopMinute;
+		return (stopHour * 100) + stopMinute;
 	}
 	
 	public int getStopHour(){

Agenda/MenuBar.java

@@ -63,8 +63,7 @@ public class MenuBar extends JMenuBar {
 		open.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, ActionEvent.CTRL_MASK));
 		open.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				Applicatie.SaveLoad.load(w.getPanel());
-				w.setAgenda(w.getPanel().getAgenda());
+				w.getAgenda().loadAgenda();
 				Window.updatePanel();
 			}
 		});
@@ -73,7 +72,7 @@ public class MenuBar extends JMenuBar {
 		save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, ActionEvent.CTRL_MASK));
 		save.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				Applicatie.SaveLoad.save(w.getPanel());
+				w.getAgenda().saveAgenda();
 				Window.updatePanel();
 			}
 		});
@@ -134,4 +133,4 @@ public class MenuBar extends JMenuBar {
 		view.add(art_sta);
 		add(view);
 	}
-}
+}

Agenda/Window.java

@@ -1,5 +1,6 @@
 package Agenda;
 
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -35,16 +36,14 @@ public class Window extends JFrame {
 	private static GregorianCalendar date;
 	private static Agenda agenda;
 	private static String currentPanel = "table";
-	private Applicatie.Panel ap;
 	
-	public Window(Applicatie.Panel ap)
+	public Window()
 	{
 		/*
 		 * Initialize window
 		 */
 		super("Agenda");
-		this.ap = ap;
-		agenda = ap.getAgenda();
+		agenda = new Agenda();
 		
 		setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter() {
@@ -182,7 +181,7 @@ public class Window extends JFrame {
             }
 		});
 	}
-
+	
 	public static void changePanel(String panel)
 	{
 		currentPanel = panel;
@@ -232,13 +231,7 @@ public class Window extends JFrame {
 	public void setAgenda(Agenda a)
 	{
 		agenda = a; 
-		ap.setAgenda(a);
-	}
-	
-	public Applicatie.Panel getPanel()
-	{
-		return ap;
 	}
 	
 	
-}
+}

Applicatie/Action.java

@@ -11,15 +11,13 @@ public class Action
 	private int starttime;
 	private int duration;
 	private DrawObject target;
-	private Waypoint waypoint;
 
-	public Action(Point2D position, int starttime, int duration, DrawObject tar, Waypoint waypoint)
+	public Action(Point2D position, int starttime, int duration, DrawObject tar)
 	{
 		this.position = position;
 		this.starttime = starttime;
 		this.duration = duration;
 		this.target = tar;
-		this.waypoint = waypoint;
 	}
 
 	public Point2D getPosition()
@@ -46,8 +44,4 @@ public class Action
 	{
 		return duration;
 	}
-
-	public Waypoint getWaypoint(){
-		return waypoint;
-	}
 }

Applicatie/ControlPanel.java

@@ -19,17 +19,13 @@ public class ControlPanel extends JPanel
 	private static final long serialVersionUID = 6805244250902524351L;
 
 	private Panel p;
-	private int people;
 	JLabel timeLabel;
-	JLabel peopleLabel;
-	JLabel runningLabel;
 	
 	public ControlPanel()
 	{
 		super();
 		BoxLayout box = new BoxLayout(this, BoxLayout.X_AXIS);
 		setLayout(box);
-		people = 0;
 		
 		setPreferredSize(new Dimension(0,50));
 		setBorder(BorderFactory.createLineBorder(new Color(180, 180, 180)));
@@ -37,8 +33,8 @@ public class ControlPanel extends JPanel
 		setFocusable(false);
 		
 		JPanel simulatorPanel  = new JPanel(new FlowLayout(FlowLayout.LEFT));
-		simulatorPanel.setPreferredSize(new Dimension(290,50));
-		simulatorPanel.setMaximumSize(new Dimension(290,50));
+		simulatorPanel.setPreferredSize(new Dimension(350,50));
+		simulatorPanel.setMaximumSize(new Dimension(350,50));
 		add(simulatorPanel);
 		{
 			JLabel simulatorLabel = new JLabel("Simulator: ");
@@ -52,12 +48,21 @@ public class ControlPanel extends JPanel
 				public void actionPerformed(ActionEvent e)
 				{
 					p.getT().start();
-					p.setPlay(true);
-					runningLabel.setText("Simulation Started");
 				}
 			});
 			simulatorPanel.add(playButton);
 			
+			JButton pauseButton = new JButton("Pause");
+			pauseButton.setFocusable(false);
+			pauseButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
+			pauseButton.addActionListener(new ActionListener(){
+				public void actionPerformed(ActionEvent e)
+				{
+					p.getT().stop();
+				}
+			});
+			simulatorPanel.add(pauseButton);
+			
 			JButton stopButton = new JButton("Stop");
 			stopButton.setFocusable(false);
 			stopButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
@@ -65,8 +70,6 @@ public class ControlPanel extends JPanel
 				public void actionPerformed(ActionEvent e)
 				{
 					p.getT().stop();
-					p.setPlay(false);
-					runningLabel.setText("Simulation Stopped");
 				}
 			});
 			simulatorPanel.add(stopButton);
@@ -102,7 +105,7 @@ public class ControlPanel extends JPanel
 		peoplePanel.setMaximumSize(new Dimension(285,50));
 		add(peoplePanel);
 		{
-			peopleLabel = new JLabel(people + " People");
+			JLabel peopleLabel = new JLabel("0/0 People");
 			peopleLabel.setFont(new Font("Segoe UI", Font.PLAIN, 20));
 			peoplePanel.add(peopleLabel);
 			
@@ -112,7 +115,7 @@ public class ControlPanel extends JPanel
 			peopleButton.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent e)
 				{
-					new AddPeoplePanel(p);
+					p.addVisitors();
 				}
 			});
 			peoplePanel.add(peopleButton);
@@ -125,7 +128,7 @@ public class ControlPanel extends JPanel
 		runningPanel.setMaximumSize(new Dimension(195,50));
 		add(runningPanel);
 		{
-			runningLabel = new JLabel("Simulation stopped");
+			JLabel runningLabel = new JLabel("Simulation stopped");
 			runningLabel.setFont(new Font("Segoe UI", Font.PLAIN, 20));
 			runningPanel.add(runningLabel);
 		}
@@ -144,7 +147,6 @@ public class ControlPanel extends JPanel
 	
 	public void setPeople(int people)
 	{
-		this.people = people;
-		peopleLabel.setText(people + " People");
+		
 	}
 }

Applicatie/Main.java

@@ -2,6 +2,7 @@ package Applicatie;
 
 public class Main
 {
+
 	public static void main(String[] args)
 	{
 		new Window();

Applicatie/MenuBar.java

@@ -33,13 +33,11 @@ public class MenuBar extends JMenuBar
 		{
 			public void actionPerformed(ActionEvent e)
 			{
-				new Agenda.Window(w.getPanel());
+				new Agenda.Window();
 			}
 		});
 		file.add(agenda);
 		
-		file.addSeparator();
-		
 		item = new JMenuItem("Open");
 		item.addActionListener(new ActionListener() {
 			
@@ -62,12 +60,22 @@ public class MenuBar extends JMenuBar
 		
 		file.addSeparator();
 		
+		item = new JMenuItem("Load agenda");
+		item.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				w.getPanel().agenda.loadAgenda();
+			}
+		});
+		file.add(item);
+		
 		item = new JMenuItem("Agenda");
 		item.addActionListener(new ActionListener()
 		{
 			public void actionPerformed(ActionEvent e)
 			{
-				new Agenda.Window(w.getPanel());
+				new Agenda.Window();
 			}
 		});
 		file.add(item);
@@ -79,7 +87,8 @@ public class MenuBar extends JMenuBar
 		{
 			public void actionPerformed(ActionEvent e)
 			{
-				System.exit(0);
+				w.setVisible(false);
+				w.dispose();
 			}
 		});
 

Applicatie/Panel.java

@@ -149,7 +149,7 @@ public class Panel extends JPanel implements ActionListener
 		addMouseWheelListener(new MouseWheel(this));
 
 		addFocusListener(new WindowFocusListener(this));
-		t = new Timer(1000/60, this);
+		t = new Timer(1000 / 100, this);
 	}
 
 	public int getPanelInfoLength()
@@ -230,16 +230,7 @@ public class Panel extends JPanel implements ActionListener
 		return waypoints;
 	}
 
-	public void addVisitors(ArrayList<DrawObject> entrances)
-	{
-		
-			DrawObject entrance = entrances.get((int) Math.floor(Math.random()*entrances.size()));
-			Point point = new Point((int)entrance.getPosition().getX(),(int)entrance.getPosition().getY());
-			visitors.add(new Visitor("visitor",point, agenda, objects, waypoints, date));
-		
-	}
-
-	public void addVisitors(int count)
+	public void addVisitors()
 	{
 		ArrayList<DrawObject> entrances = new ArrayList<>();
 		for(DrawObject object : objects) {
@@ -248,14 +239,21 @@ public class Panel extends JPanel implements ActionListener
 			}
 		}
 		if(!entrances.isEmpty()) {
-			for (int i = 0; i < count; i++)
-			{
-				addVisitors(entrances);
-			}
+			DrawObject entrance = entrances.get((int) Math.floor(Math.random()*entrances.size()));
+			Point point = new Point((int)entrance.getPosition().getX(),(int)entrance.getPosition().getY());
+			visitors.add(new Visitor("visitor",point, agenda, objects, waypoints, date));
 		}
-		else 
+		else {
 			JOptionPane.showMessageDialog(this, "You don't have an entrance");
-		cp.setPeople(visitors.size());
+		}
+	}
+
+	public void addVisitors(int count)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			addVisitors();
+		}
 	}
 
 	public void paintComponent(Graphics g)
@@ -390,9 +388,6 @@ public class Panel extends JPanel implements ActionListener
 	public void clearObjects()
 	{
 		objects.clear();
-		visitors.clear();
-		waypoints.clear();
-		paths.clear();
 	}
 
 	public Point getLastMousePosition()
@@ -643,6 +638,7 @@ public class Panel extends JPanel implements ActionListener
 			currentTime++;
 			date.setTimeInMillis(date.getTimeInMillis() + 1000);
 			cp.setTime(formatter.format(date.getTime()));
+			System.out.println(currentTime);
 		}
 
 		for (Visitor v : visitors)
@@ -672,7 +668,7 @@ public class Panel extends JPanel implements ActionListener
 	{
 		this.play = play;
 	}
-
+	
 	public boolean getPlay()
 	{
 		return play;
@@ -684,7 +680,6 @@ public class Panel extends JPanel implements ActionListener
 		this.height = height;
 		paths.clear();
 		objects.clear();
-		visitors.clear();
 		cameraScale = 1;
 		switch (terrainIndex)
 		{

Applicatie/PathPopup.java

@@ -1,7 +1,9 @@
 package Applicatie;
 
+import java.awt.BorderLayout;
 import java.awt.FlowLayout;
 import java.awt.Font;
+import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 

Applicatie/PropertiesPanel.java

@@ -11,8 +11,6 @@ import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.Iterator;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -22,11 +20,8 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import Agenda.AgendaStage;
-import Agenda.Event;
 import Objects.DrawObject;
 import Objects.Path;
-import Objects.Stage;
 
 @SuppressWarnings("serial")
 public class PropertiesPanel extends JPanel
@@ -41,7 +36,6 @@ public class PropertiesPanel extends JPanel
 
 	JLabel nameLabel;
 	JPanel areaPanel;
-	JPanel agendaPanel;
 	Component rigidArea;
 
 	JTextField locationXField;
@@ -506,9 +500,12 @@ public class PropertiesPanel extends JPanel
 		add(Box.createRigidArea(spacerDimension));
 
 		// AGENDA
-		agendaPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-		agendaPanel.setVisible(false);
-	
+		JPanel agendaPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+		JLabel agendaLabel = new JLabel("Agenda");
+		agendaLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
+		agendaPanel.setPreferredSize(new Dimension(200, 100));
+		agendaPanel.setMaximumSize(new Dimension(200, 100));
+		agendaPanel.add(agendaLabel);
 		add(agendaPanel);
 
 		enableComponents(this, false);
@@ -569,19 +566,12 @@ public class PropertiesPanel extends JPanel
 		nameLabel.setText("No Selection");
 		areaPanel.setVisible(false);
 		rigidArea.setVisible(false);
-		agendaPanel.setVisible(false);
-		agendaPanel.removeAll();
-		agendaPanel.validate();
 	}
 
 	private void fillFields()
 	{
 
 		nameLabel.setText(selectedObject.getName());
-		
-		agendaPanel.removeAll();
-		agendaPanel.validate();
-		agendaPanel.setVisible(false);
 
 		locationXField.setText(Math.round(selectedObject.getPosition().getX()) + "");
 		locationYField.setText(Math.round(selectedObject.getPosition().getY()) + "");
@@ -592,31 +582,7 @@ public class PropertiesPanel extends JPanel
 		areaBottomField.setText(selectedObject.getAreaBottom() + "");
 		areaLeftField.setText(selectedObject.getAreaLeft() + "");
 		areaRightField.setText(selectedObject.getAreaRight() + "");
-		
-		if(selectedObject instanceof Stage)
-		{
-		
-			agendaPanel.setVisible(true);
-			JLabel agendaLabel = new JLabel("Agenda");
-			agendaLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
-			agendaPanel.add(agendaLabel);
-			
-			AgendaStage st = ((Stage) selectedObject).getStage();
-			nameLabel.setText("Stage: " + st.getName());
-			ArrayList<Event> events = p.getAgenda().eventsForStage(st);
-			agendaPanel.setPreferredSize(new Dimension(200, ((30*events.size())+50) ));
-			agendaPanel.setMaximumSize(new Dimension(200, ((30*events.size())+50) ));
-			for(Event e : events)
-			{
-				JPanel eventPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-				JLabel eventLabel = new JLabel(e.getEventName() + " - " + e.getArtist().getName());
-				eventLabel.setFont(new Font("Segoe UI", Font.PLAIN, 15));
-				eventPanel.setPreferredSize(new Dimension(200, 30));
-				eventPanel.setMaximumSize(new Dimension(200, 30));
-				eventPanel.add(eventLabel);
-				agendaPanel.add(eventPanel);
-			}
-		}
+
 	}
 
 	public void setPanel(Panel p)

Applicatie/SaveLoad.java

@@ -1,5 +1,4 @@
 package Applicatie;
-
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
@@ -8,62 +7,48 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import javax.imageio.ImageIO;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 
-import Agenda.Agenda;
 import Objects.DrawObject;
-import Objects.Path;
 
-public class SaveLoad
-{
+public class SaveLoad {
 
+	
 	public static void save(Panel panel)
 	{
 		JFileChooser fileChooser = new JFileChooser();
-
-		fileChooser.setFileFilter(new FileFilter()
-		{
-			@Override
-			public boolean accept(File pathname)
-			{
-				if (pathname.isFile() && pathname.getName().endsWith(".agn"))
-				{
-					return true;
+		
+		fileChooser.setFileFilter(new FileFilter() {
+				@Override
+				public boolean accept(File pathname) {
+					if(pathname.isFile() && pathname.getName().endsWith(".agn"))
+					{
+						return true;
+					}else if(pathname.isDirectory()){return true;}else{return false;}
 				}
-				else if (pathname.isDirectory())
-				{
-					return true;
-				}
-				else
-				{
-					return false;
-				}
-			}
-
-			@Override
-			public String getDescription()
-			{
-				return ".agn";
-			}
 
+				@Override
+				public String getDescription() {
+					return ".agn";	
+				}
+			
 		});
 		fileChooser.setDialogTitle("Choose save location");
 		int userSelection = fileChooser.showSaveDialog(null);
-
-		if (userSelection == JFileChooser.APPROVE_OPTION)
+		
+		if(userSelection == JFileChooser.APPROVE_OPTION)
 		{
 			File file = fileChooser.getSelectedFile();
-			if (!file.getName().endsWith(".agn"))
+			if(!file.getName().endsWith(".agn"))
 			{
 				file = new File(file.getAbsolutePath() + ".agn");
 			}
-
-			if (file.exists())
+			
+			if(file.exists())
 			{
-				if (JOptionPane.showConfirmDialog(null, "Are you sure you want to overwrite: " + file.getName(), "Overwrite", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to overwrite: " + file.getName(), "Overwrite", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
 				{
 					saveTerrain(file, panel);
 				}
@@ -74,70 +59,49 @@ public class SaveLoad
 			}
 		}
 	}
+	
+	
+	public static void saveTerrain(File file, Panel panel) {
 
-	public static void saveTerrain(File file, Panel panel)
-	{
-
-		try
-		{
+		try {
 			FileOutputStream fos = new FileOutputStream(file);
 			ObjectOutputStream oos = new ObjectOutputStream(fos);
-			oos.writeObject(panel.getAgenda());
-			for (DrawObject object : panel.objects)
-			{
-				object.setSelected(false);
+			for (DrawObject object : panel.objects) {
 				oos.writeObject(object);
 			}
-			for(Path p : panel.paths)
-			{
-				oos.writeObject(p);
-			}
 			oos.close();
 			JOptionPane.showMessageDialog(null, "Saved succesfully");
-		}
-		catch (IOException e)
-		{
+		} catch (IOException e) {
 			e.printStackTrace();
 		}
-	}
-
+	}		
+	
 	public static void load(Panel panel)
 	{
 		JFileChooser fileChooser = new JFileChooser();
-		fileChooser.setFileFilter(new FileFilter()
-		{
+		fileChooser.setFileFilter(new FileFilter() {
 			@Override
-			public boolean accept(File pathname)
-			{
-				if (pathname.isFile() && pathname.getName().endsWith(".agn"))
+			public boolean accept(File pathname) {
+				if(pathname.isFile() && pathname.getName().endsWith(".agn"))
 				{
 					return true;
-				}
-				else if (pathname.isDirectory())
-				{
-					return true;
-				}
-				else
-				{
-					return false;
-				}
+				}else if(pathname.isDirectory()){return true;}else{return false;}
 			}
 
 			@Override
-			public String getDescription()
-			{
+			public String getDescription() {
 				return ".agn";
 			}
-
+		
 		});
-
+		
 		fileChooser.setDialogTitle("Choose file");
 		int userSelection = fileChooser.showOpenDialog(null);
-
-		if (userSelection == JFileChooser.APPROVE_OPTION)
+		
+		if(userSelection == JFileChooser.APPROVE_OPTION)
 		{
 			File file = fileChooser.getSelectedFile();
-			if (!file.exists())
+			if(!file.exists())
 			{
 				JOptionPane.showMessageDialog(null, "This file does not exist: " + file.getName());
 			}
@@ -148,54 +112,33 @@ public class SaveLoad
 			}
 		}
 	}
-
-	public static void fillTerrain(File file, Panel panel)
-	{
+	
+	
+	public static void fillTerrain(File file, Panel panel) {
 		FileInputStream fis = null;
 		ObjectInputStream ois = null;
 
-		try
-		{
-
+		try {
+			
 			fis = new FileInputStream(file);
 			ois = new ObjectInputStream(fis);
 
 			Object object;
-			Agenda a = (Agenda) ois.readObject();
-			panel.setAgenda(a);
-			try
-			{
-				object = ois.readObject();
+			object = ois.readObject();
+			try {
 				panel.clearObjects();
-				while (object != null)
-				{
-					if (object instanceof Waypoint)
-					{
-						panel.addWaypoint((Waypoint) object);
-						panel.objects.add((DrawObject) object);
-					}
-					if (object instanceof Path)
-					{
-						Path p = (Path) object;
-						p.updateImage();
-						panel.paths.add((Path) object);
-					}
-					else
-					{
-						panel.objects.add((DrawObject) object);
-					}
+				while (object != null) {
+					panel.objects.add((DrawObject) object); 					
 					object = ois.readObject();
 				}
+			} catch (EOFException e) {
 			}
-			catch (EOFException e)
-			{
-			}
-		}
-		catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		panel.update();
 	}
-
-}
+	
+	
+	
+}

Applicatie/Visitor.java

@@ -5,20 +5,16 @@ import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Shape;
 import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Random;
 
 import Agenda.Agenda;
 import Agenda.Event;
 import Objects.DrawObject;
 import Objects.Entrance;
 import Objects.Path;
-import Objects.Stage;
 
 public class Visitor
 {
@@ -31,28 +27,23 @@ public class Visitor
 	ArrayList<Action> actions;
 	Agenda agenda;
 	ArrayList<DrawObject> objects;
-
-	ArrayList<Waypoint> waypoints;
-	GregorianCalendar date;
 	int target;
 	int finalTarget;
 
-	public Visitor(String filename, Point2D position, Agenda agenda, ArrayList<DrawObject> objects, ArrayList<Waypoint> waypoints, GregorianCalendar date)
-
+	public Visitor(String filename, Point2D position, Agenda agenda, ArrayList<DrawObject> objects)
 	{
 		this.position = position;
 		this.filename = filename;
 		this.rotation = 0;
 		this.speed = 1 + Math.random() * 4;
-		this.waypoints = waypoints;
-		this.date = date;
 		scale = 1;
 		actions = new ArrayList<Action>();
 		this.agenda = agenda;
 		this.objects = objects;
 		fillActions();
+		System.out.println(actions.size());
 		target = 1;
-		finalTarget = 0;
+		finalTarget = 4;
 	}
 
 	public void draw(Graphics2D g2)
@@ -87,16 +78,15 @@ public class Visitor
 	public void update(ArrayList<DrawObject> objects, int currentTime, ArrayList<Visitor> visitors, ArrayList<Path> paths, Panel panel)
 	{
 		DrawObject target = getEntrance();
-
 		for (Action a : actions)
 		{
 			if (currentTime >= a.getStartTime() && currentTime < a.getStoptime())
 			{
-				this.finalTarget = a.getWaypoint().getSelf();
-
+				target = a.getTargetObject();
 			}
 
 		}
+
 		// moveToTarget(target, objects, visitors, paths);
 		move(target, panel);
 	}
@@ -119,6 +109,7 @@ public class Visitor
 		{
 			rotation += 0.15;
 		}
+
 		Point2D oldPosition = position;
 
 		// face direction
@@ -137,10 +128,8 @@ public class Visitor
 			{
 				continue;
 			}
-
-			if (hasCollisionDO(object))
+			if (hitTest(object))
 			{
-
 				possible = false;
 			}
 		}
@@ -149,25 +138,24 @@ public class Visitor
 			position = oldPosition;
 			rotation += 0.2;
 		}
-
 		if (checkIfOnWaypoint(panel))
 		{
-
 			HashMap<Integer, int[]> options = new HashMap<Integer, int[]>();
 			for (Waypoint w : panel.getWaypoints())
 			{
 				options.put(w.getSelf(), w.getOptions());
 			}
-
-			if (finalTarget != target)
+			for (Map.Entry<Integer, int[]> e : options.entrySet())
 			{
-				for (Map.Entry<Integer, int[]> e : options.entrySet())
+				for (int i : e.getValue())
 				{
-					// System.out.println("KEY: " + e.getKey());
-					for (int i : e.getValue())
-					{
-						// System.out.println("VAL: " + i);
+					System.out.println("KEY:" + e.getKey());
+					System.out.println("VAL:" + i);
+					System.out.println("TAR: " + target);
 
+					System.out.println("____________");
+					if (finalTarget != target)
+					{
 						if (finalTarget == i && e.getKey() == target)
 						{
 							target = finalTarget;
@@ -179,10 +167,10 @@ public class Visitor
 							break;
 						}
 					}
-
 				}
 			}
 		}
+
 	}
 
 	public boolean checkIfOnWaypoint(Panel panel)
@@ -243,17 +231,15 @@ public class Visitor
 			boolean possible = true;
 			for (DrawObject object : objects)
 			{
-				if (hasCollisionDO(object))
+				if (hitTest(object))
 				{
 					possible = false;
 				}
 			}
 			for (Visitor object : visitors)
 			{
-
-				if (hasCollision(object) && object != this)
+				if (hitTestVisitor(object) && object != this)
 				{
-
 					possible = false;
 				}
 			}
@@ -348,14 +334,14 @@ public class Visitor
 			boolean possible = true;
 			for (DrawObject object : objects)
 			{
-				if (hasCollisionDO(object))
+				if (hitTest(object))
 				{
 					possible = false;
 				}
 			}
 			for (Visitor object : visitors)
 			{
-				if (hasCollision(object) && object != this)
+				if (hitTestVisitor(object) && object != this)
 				{
 					possible = false;
 				}
@@ -368,7 +354,6 @@ public class Visitor
 		}
 	}
 
-	@SuppressWarnings("static-access")
 	public void fillActions()
 	{
 		int startTime = 540;
@@ -381,105 +366,61 @@ public class Visitor
 			{
 				Point2D position = null;
 				DrawObject targetStage = null;
-				ArrayList<Event> posEvents = new ArrayList<Event>();
 				for (Event e : agenda.getEvents())
 				{
-					if (startTime >= e.getStart() && startTime < e.getStop())
+					if (convertMinutesToHours(startTime) > e.getStart() && convertMinutesToHours(startTime) < e.getStop())
 					{
-						posEvents.add(e);
-					}
-				}
-				int totalPopularity = 0;
-				for (Event ev : posEvents)
-				{
-					totalPopularity += ev.getExpectedPopularity();
-				}
-
-				Random rand = new Random();
-				int n = rand.nextInt(totalPopularity + 1);
-				int currentPop = 0;
-				if (posEvents != null)
-				{
-					for (Event evs : posEvents)
-					{
-						int before = currentPop;
-						currentPop = currentPop + evs.getExpectedPopularity();
-						if (before < n && currentPop >= n)
+						for (DrawObject d : objects)
 						{
-							for (DrawObject d : objects)
+							if (d.getFileName().equals(e.getStage().getName()))
 							{
-								if (d.getFileName().equals("stage"))
-								{
-									Stage s = (Stage) d;
-									if (s.getStage().getName().equals(evs.getStage().getName()))
-									{
-										position = s.getPosition();
-										targetStage = d;
-									}
-								}
-
+								position = d.getPosition();
+								targetStage = d;
 							}
 						}
 					}
 				}
-
 				int randomtime = (int) (40 + (Math.random() * (60 - 40)));
 				if (position != null)
 				{
-					Waypoint w = getClosedWaypoint(position);
-					actions.add(new Action(position, startTime, randomtime, targetStage, w));
+					actions.add(new Action(position, startTime, randomtime, targetStage));
 				}
 				startTime = startTime + randomtime;
 
 			}
-			else if (random >= 30 && random < 40)
+			else if (random >= 30 && random < 35)
 			{
 				Point2D position = null;
-				DrawObject targetStage = null;
-				ArrayList<DrawObject> foodPlaces = new ArrayList<DrawObject>();
+				DrawObject targetDraw = null;
 				for (DrawObject d : objects)
 				{
-					if (d.getFileName().equals("food"))
+					if (d.getFileName().equals("entrance"))
 					{
-						foodPlaces.add(d);
+						position = d.getPosition();
 					}
 				}
-
-				if (foodPlaces.size() != 0)
+				if (position != null)
 				{
-					int r = (int) Math.floor(Math.random() * foodPlaces.size());
-					position = foodPlaces.get(r).getPosition();
-					targetStage = foodPlaces.get(r);
-					Waypoint w = getClosedWaypoint(position);
-					actions.add(new Action(position, startTime, 35, targetStage, w));
-					startTime = startTime + 20;
+					actions.add(new Action(position, startTime, 35, targetDraw));
+					startTime = startTime + 35;
 				}
 				startTime = startTime + 35;
 
 			}
-			else if (random >= 40)
+			else if (random > 35)
 			{
-
 				Point2D position = null;
-				DrawObject targetStage = null;
-				ArrayList<DrawObject> toilets = new ArrayList<DrawObject>();
+				DrawObject targetDrawobj = null;
 				for (DrawObject d : objects)
 				{
 					if (d.getFileName().equals("wc"))
 					{
-						toilets.add(d);
+						position = d.getPosition();
 					}
 				}
-
-				if (toilets.size() != 0)
+				if (position != null)
 				{
-					int r = (int) Math.floor(Math.random() * toilets.size());
-					position = toilets.get(r).getPosition();
-					targetStage = toilets.get(r);
-					Waypoint w = getClosedWaypoint(position);
-					actions.add(new Action(position, startTime, 35, targetStage, w));
-
-					startTime = startTime + 20;
+					actions.add(new Action(position, startTime, 35, targetDrawobj));
 				}
 				startTime = startTime + 35;
 
@@ -487,71 +428,35 @@ public class Visitor
 		}
 	}
 
-	public Waypoint getClosedWaypoint(Point2D point)
+	public int convertMinutesToHours(int startTime)
 	{
-		Waypoint waypoint = null;
-		int distance = 10000;
-		for (Waypoint w : waypoints)
-		{
-			if (w.getPosition().distance(point) < distance)
-			{
-
-				waypoint = w;
-				distance = (int) w.getPosition().distance(point);
-			}
-		}
-		return waypoint;
+		int time = 0;
+		int hours = startTime / 60;
+		int minutes = startTime % 60;
+		time = (hours * 100) + minutes;
+		return time;
 	}
 
-	public boolean hasCollisionDO(DrawObject object)
-	{
-
-		Image image = Images.getImage(filename);
-		Image image2 = Images.getImage(object.getFileName());
-		Rectangle recta = new Rectangle((int) position.getX(), (int) position.getY(), image.getWidth(null), image.getHeight(null));
-		Rectangle rectb = new Rectangle((int) object.getPosition().getX(), (int) object.getPosition().getY(), image2.getWidth(null), image2.getHeight(null));
-
-		Area a = new Area(recta);
-		Area b = new Area(rectb);
-
-		AffineTransform transA = new AffineTransform();
-		transA.rotate(rotation, position.getX(), position.getY());
-
-		AffineTransform transB = new AffineTransform();
-		transB.rotate(Math.toRadians(object.getRotation()), object.getPosition().getX(), object.getPosition().getY());
-
-		Area aa = a.createTransformedArea(transA);
-		Area bb = b.createTransformedArea(transB);
-
-		if (bb.intersects(aa.getBounds2D()))
-		{
-			return true;
-		}
-		return false;
-	}
-
-	public boolean hasCollision(Visitor v)
+	public int getEndX()
 	{
 		Image image = Images.getImage(filename);
-		Rectangle a = new Rectangle((int) position.getX(), (int) position.getY(), image.getWidth(null), image.getHeight(null));
-		Rectangle b = new Rectangle((int) v.position.getX(), (int) v.position.getY(), image.getWidth(null), image.getHeight(null));
-
-		Area aa = new Area(a);
-		Area bb = new Area(b);
-
-		AffineTransform af = new AffineTransform();
-		af.rotate(rotation, position.getX(), position.getY());
-
-		AffineTransform bf = new AffineTransform();
-		bf.rotate(v.rotation, v.position.getX(), v.position.getY());
-
-		Area ra = aa.createTransformedArea(af);
-		Area rb = bb.createTransformedArea(bf);
-
-		if (ra.intersects(rb.getBounds2D()))
-		{
-			return true;
-		}
-		return false;
+		return (int) (position.getX() + image.getWidth(null));
 	}
-}
+
+	public int getEndY()
+	{
+		Image image = Images.getImage(filename);
+		return (int) (position.getY() + image.getHeight(null));
+	}
+
+	public boolean hitTest(DrawObject to2)
+	{
+		return (getEndX() >= to2.getPosition().getX() && getEndY() >= to2.getPosition().getY() && to2.getEndX() >= position.getX() && to2.getEndY() >= position.getY());
+
+	}
+
+	public boolean hitTestVisitor(Visitor v)
+	{
+		return (getEndX() >= v.position.getX() && getEndY() >= v.position.getY() && v.getEndX() >= position.getX() && v.getEndY() >= position.getY());
+	}
+}

Applicatie/Waypoint.java

@@ -13,11 +13,6 @@ public class Waypoint extends DrawObject
 		super("waypoint", position);
 	}
 
-	public Point2D getAccuratePoint()
-	{
-		return new Point2D.Double(super.getPosition().getX() + (super.getImageRectangle().getWidth()/2), super.getPosition().getY() + super.getImageRectangle().getHeight());
-	}
-	
 	@Override
 	public String getName()
 	{
@@ -41,6 +36,7 @@ public class Waypoint extends DrawObject
 
 	public void setSelf(int self)
 	{
+		System.out.println(self);
 		this.self = self;
 	}
 

Applicatie/WaypointPopup.java

@@ -111,6 +111,7 @@ public class WaypointPopup extends JFrame {
 				for(int i = 0; i < options.length; i++)
 				{
 					ioptions[i] = Integer.valueOf(options[i]);
+					System.out.println(ioptions[i]);
 				}
 				wp.setOptions(ioptions);
 				

Listeners/Mouse.java

@@ -4,6 +4,7 @@ import java.awt.Color;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 
 import javax.swing.SwingUtilities;
@@ -15,6 +16,7 @@ import Applicatie.Waypoint;
 import Applicatie.WaypointPopup;
 import Objects.DrawObject;
 import Objects.Path;
+import Objects.Entrance;
 
 public class Mouse extends MouseAdapter
 {
@@ -33,126 +35,126 @@ public class Mouse extends MouseAdapter
 		Point2D clickPoint = panel.getClickPoint(e.getPoint());
 		panel.setLastClickPosition(clickPoint);
 		panel.setLastMousePosition(e.getPoint());
-
+		
 		if(!panel.getPlay())
 		{
-		if (!panel.getClickedOption().equals("Path"))
-		{
-			if (e.getY() < 150)
+			if (!panel.getClickedOption().equals("Path"))
 			{
-				int i = 0;
-				int last = 0;
-				for (BufferedImage image : panel.getPanelInfo())
+				if (e.getY() < 150)
 				{
-					if (e.getX() >= panel.getScrollfactor() && e.getX() < last + image.getWidth() + panel.getScrollfactor())
+					int i = 0;
+					int last = 0;
+					for (BufferedImage image : panel.getPanelInfo())
 					{
-						DrawObject tempDrawObj = panel.createNewDrawObject(i);
-						if (tempDrawObj != null)
+						if (e.getX() >= panel.getScrollfactor() && e.getX() < last + image.getWidth() + panel.getScrollfactor())
 						{
-							tempDrawObj.setPosition(clickPoint);
-							if (!panel.getObjects().isEmpty())
-								panel.clearObjectSelection();
-							panel.setDragObject(tempDrawObj);
-							panel.getDragObject().setSelected(true);
-							panel.getPP().setSelected(tempDrawObj);
-							panel.setSelectedObject(tempDrawObj);
-							selectedObject = tempDrawObj;
+							DrawObject tempDrawObj = panel.createNewDrawObject(i);
+							if (tempDrawObj != null)
+							{
+								tempDrawObj.setPosition(clickPoint);
+								if (!panel.getObjects().isEmpty())
+									panel.clearObjectSelection();
+								panel.setDragObject(tempDrawObj);
+								panel.getDragObject().setSelected(true);
+								panel.getPP().setSelected(tempDrawObj);
+								panel.setSelectedObject(tempDrawObj);
+								selectedObject = tempDrawObj;
+							}
+							break;
 						}
-						break;
+						i++;
+						last += image.getWidth();
 					}
-					i++;
-					last += image.getWidth();
-				}
-				if (panel.getDragObject() != null)
-				{
-					panel.add(panel.getDragObject());
-				}
-			}
-			else
-			{
-				for (DrawObject o : panel.getObjects())
-				{
-					if (o.contains(clickPoint))
+					if (panel.getDragObject() != null)
 					{
-						if (SwingUtilities.isRightMouseButton(e))
-						{
-							if (o instanceof Waypoint)
-							{
-								new WaypointPopup(o, panel);
-
-							}
-						}
-						if (o == selectedObject)
-						{
-							boolean upperLeft = o.containsCorner(clickPoint, 0);
-							boolean upperRight = o.containsCorner(clickPoint, 1);
-							boolean bottomLeft = o.containsCorner(clickPoint, 2);
-							boolean bottomRight = o.containsCorner(clickPoint, 3);
-							boolean rotate = o.containsCorner(clickPoint, 4);
-							if (upperLeft)
-							{
-								panel.setClickedOption("upperLeft");
-							}
-							else if (upperRight)
-							{
-								panel.setClickedOption("upperRight");
-							}
-							else if (bottomLeft)
-							{
-								panel.setClickedOption("bottomLeft");
-							}
-							else if (bottomRight)
-							{
-								panel.setClickedOption("bottomRight");
-							}
-							else if (rotate)
-							{
-								panel.setClickedOption("rotate");
-							}
-							else
-							{
-								panel.setClickedOption("drag");
-							}
-						}
-						if (selectedObject != null)
-							selectedObject.setSelected(false);
-						o.setSelected(true);
-						selectedObject = o;
-						panel.setDragObject(o);
-						panel.getPP().setSelected(o);
-						panel.setSelectedObject(o);
-						panel.setSelectionPosition(panel.getDragObject().getPosition());
-
-					}
-				}
-				Path clickedPath = panel.getClickedPath(clickPoint);
-				if (clickedPath != null)
-				{
-					if (SwingUtilities.isRightMouseButton(e))
-					{
-						//new PathPopup(clickedPath, panel);
+						panel.add(panel.getDragObject());
 					}
 				}
 				else
 				{
-					panel.checkPath(clickPoint);
+					for (DrawObject o : panel.getObjects())
+					{
+						if (o.contains(clickPoint))
+						{
+							if (SwingUtilities.isRightMouseButton(e))
+							{
+								if (o instanceof Waypoint)
+								{
+									new WaypointPopup(o, panel);
+
+								}
+							}
+							if (o == selectedObject)
+							{
+								boolean upperLeft = o.containsCorner(clickPoint, 0);
+								boolean upperRight = o.containsCorner(clickPoint, 1);
+								boolean bottomLeft = o.containsCorner(clickPoint, 2);
+								boolean bottomRight = o.containsCorner(clickPoint, 3);
+								boolean rotate = o.containsCorner(clickPoint, 4);
+								if (upperLeft)
+								{
+									panel.setClickedOption("upperLeft");
+								}
+								else if (upperRight)
+								{
+									panel.setClickedOption("upperRight");
+								}
+								else if (bottomLeft)
+								{
+									panel.setClickedOption("bottomLeft");
+								}
+								else if (bottomRight)
+								{
+									panel.setClickedOption("bottomRight");
+								}
+								else if (rotate)
+								{
+									panel.setClickedOption("rotate");
+								}
+								else
+								{
+									panel.setClickedOption("drag");
+								}
+							}
+							if (selectedObject != null)
+								selectedObject.setSelected(false);
+							o.setSelected(true);
+							selectedObject = o;
+							panel.setDragObject(o);
+							panel.getPP().setSelected(o);
+							panel.setSelectedObject(o);
+							panel.setSelectionPosition(panel.getDragObject().getPosition());
+
+						}
+					}
+					Path clickedPath = panel.getClickedPath(clickPoint);
+					if (clickedPath != null)
+					{
+						if (SwingUtilities.isRightMouseButton(e))
+						{
+							new PathPopup(clickedPath, panel);
+						}
+					}
+					else
+					{
+						panel.checkPath(clickPoint);
+					}
+
 				}
+				if (panel.getDragObject() == null && selectedObject != null)
+				{
+					selectedObject.setSelected(false);
+					panel.setSelectedObject(null);
+					panel.getPP().clearSelected();
+					selectedObject = null;
+				}
+			}
+			else
+			{ // Making path.
+
+				panel.getCurrentPath().addPoint(new Point2D.Double(clickPoint.getX(), clickPoint.getY()));
 
 			}
-			if (panel.getDragObject() == null && selectedObject != null)
-			{
-				selectedObject.setSelected(false);
-				panel.setSelectedObject(null);
-				panel.getPP().clearSelected();
-				selectedObject = null;
-			}
-		}
-		else
-		{ // Making path.
-
-			panel.getCurrentPath().addPoint(new Point2D.Double(clickPoint.getX(), clickPoint.getY()));
-
-		}
 		}
 		panel.repaint();
 	}
@@ -170,15 +172,8 @@ public class Mouse extends MouseAdapter
 			}
 			else
 			{
-				if (panel.getDragObject() instanceof Waypoint == false)
-				{
-					panel.getDragObject().setPosition(panel.getSelectionPosition());
-					panel.getDragObject().setRectangleColor(Color.BLACK);
-				}
-				else
-				{
-					panel.getDragObject().setRectangleColor(Color.BLACK);
-				}
+				panel.getDragObject().setPosition(panel.getSelectionPosition());
+				panel.getDragObject().setRectangleColor(Color.BLACK);
 			}
 			panel.setSelectionPosition(panel.getSelectedObject().getPosition());
 		}

Objects/DrawObject.java

@@ -15,7 +15,6 @@ import java.io.Serializable;
 import javax.swing.ImageIcon;
 
 import Applicatie.Images;
-import Applicatie.Panel;
 
 public abstract class DrawObject implements Serializable
 {
@@ -233,30 +232,13 @@ public abstract class DrawObject implements Serializable
 
 	public void setPosition(Point2D position)
 	{
-		if(position.getX() < -Panel.getFieldWidth()/2)
-		{
-			position.setLocation(-Panel.getFieldWidth()/2, position.getY());
-		}
-		if(position.getY() < -Panel.getFieldHeight()/2)
-		{
-			position.setLocation(position.getX(), -Panel.getFieldHeight()/2);
-		}
-		if(position.getX() > Panel.getFieldWidth()/2 - width)
-		{
-			position.setLocation(Panel.getFieldWidth()/2-width, position.getY());
-		}
-		if(position.getY() > Panel.getFieldHeight()/2 - height)
-		{
-			position.setLocation(position.getX(), Panel.getFieldHeight()/2-height);
-		}
 		this.position = position;
 	}
 	public void setPosition(Point2D position, boolean b)
 	{
-		setPosition(position);
+		this.position = position;
 	}
 
-
 	public double getRotation()
 	{
 		return rotation;

Objects/Path.java

@@ -10,7 +10,6 @@ import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.ArrayList;
 
 import javax.imageio.ImageIO;
@@ -24,15 +23,13 @@ import Applicatie.Waypoint;
  * @author Wesley de Hek
  * @version 1.2
  */
-public class Path implements Serializable
+public class Path
 {
 
-	private static final long serialVersionUID = 5345485798486018597L;
-	
 	private ArrayList<Point2D> points;
 	private ArrayList<Shape> lines;
 	private Point2D tempPoint;
-	public transient BufferedImage pathBackground = null;;
+	private BufferedImage pathBackground;
 	private ArrayList<Waypoint> waypoints;
 
 	/**
@@ -52,18 +49,6 @@ public class Path implements Serializable
 			e.printStackTrace();
 		}
 	}
-	
-	public void updateImage()
-	{
-		try
-		{
-			pathBackground = ImageIO.read(new File("images/newPath.png"));
-		}
-		catch (IOException e)
-		{
-			e.printStackTrace();
-		}
-	}
 
 	/**
 	 * Draws the path.

README.md

@@ -0,0 +1,2 @@
+# FestivalPlanner
+Festival Planner