Succesful merge of timeline

2015-02-27 00:38:26 +00:00
parent ac9ccd1abd 9c6b2b44e4
commit 18b9510f04
7 changed files with 709 additions and 0 deletions
@@ -1,6 +1,8 @@
 import java.io.Serializable;
 import java.text.DateFormat;
+import java.text.Format;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.GregorianCalendar;

 public class Event implements Serializable {
@@ -111,6 +113,70 @@ public class Event implements Serializable {
 	public void setStage(Stage stage) {
 		this.stage = stage;
 	}
+	
+	public int getLength()
+	{
+		return getEndTime() - getStartTime();
+	}
+	
+	public int getStartTime()
+	{
+		DateFormat format = new SimpleDateFormat("kkmm");
+		format.setLenient(false);
+//		System.out.println(format.format(startDate.getTime()));
+		
+//		System.out.println(date.get(Calendar.HOUR_OF_DAY));
+		int time = Integer.valueOf(format.format(startDate.getTime()));
+		int hours = time/100;
+		int minutes = time%100;
+		int finaltime;
+		if(minutes != 0)
+		{
+			finaltime = hours*60 + minutes;
+		}
+		else
+		{
+			finaltime = hours*60;
+		}
+		return finaltime;
+	}
+	
+	public int getEndTime()
+	{
+		DateFormat format = new SimpleDateFormat("kkmm");
+		format.setLenient(false);
+//		System.out.println(format.format(endDate.getTime()));
+		int time = Integer.valueOf(format.format(endDate.getTime()));
+		int hours = time/100;
+		int minutes = time%100;
+		int finaltime;
+		if(minutes != 0)
+		{
+			finaltime = hours*60 + minutes;
+		}
+		else
+		{
+			finaltime = hours*60;
+		}
+		
+		return finaltime;
+	}
+	
+	public void setStartTime(int hours, int minutes)
+	{
+//		System.out.println("Start:" + hours + ":" + minutes);
+		startDate.set(Calendar.HOUR_OF_DAY, hours);
+		startDate.set(Calendar.MINUTE, minutes);
+//		System.out.println(startDate.getTime());
+	}
+	
+	public void setEndTime(int hours, int minutes)
+	{
+//		System.out.println("End:" + hours + ":" + minutes);
+		endDate.set(Calendar.HOUR_OF_DAY, hours);
+		endDate.set(Calendar.MINUTE, minutes);
+//		System.out.println(endDate.getTime());
+	}

 	public String toString() {
 		DateFormat format = new SimpleDateFormat("dd-MM-yyyy");
@@ -35,7 +35,10 @@ public class Main {
 		
 		agn.fillArtists();
 		agn.fillStages();
+
 		w.updatePanel();
+
+
 	}

 }
@@ -0,0 +1,95 @@
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.LayoutManager;
+import java.awt.image.BufferedImage;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+
+
+public class StagePanel extends JPanel 
+{
+	private BufferedImage image;
+	private int width, height, posX;
+	private double widthD, posXD;
+	private Event event;
+	public StagePanel(int width, int height, int posX, Event event, double widthD, double posXD) 
+	{
+		this.width = width;
+		this.height = height;
+		this.posX = posX;
+		this.event = event;
+		this.widthD = widthD;
+		this.posXD = posXD;
+		image = new BufferedImage(this.width, this.height, BufferedImage.TYPE_INT_ARGB);
+		Graphics2D g2 = image.createGraphics();
+		g2.setColor(Color.blue);
+		g2.fillRect(0, 0, image.getWidth(), image.getHeight());
+	}
+	
+	public void paint(Graphics g)
+	{
+		super.paint(g);
+		((Graphics2D)g).drawImage(image, this.posX, 0, this);
+	}
+
+	public StagePanel(LayoutManager arg0) 
+	{
+		super(arg0);
+
+	}
+
+	public StagePanel(boolean arg0) 
+	{
+		super(arg0);
+
+	}
+	
+	public void update(int posx, double posXD)
+	{
+		this.posX = posx;
+		this.posXD = posXD;
+		repaint();
+	}
+	
+
+	public StagePanel(LayoutManager arg0, boolean arg1) 
+	{
+		super(arg0, arg1);
+
+	}
+	
+	public double getPosX()
+	{
+		return this.posXD;
+	}
+	
+	public void setLength(int length, double widthD)
+	{
+		this.width = length;
+		this.widthD = widthD;
+	}
+	
+	public void setStageStartTime(int hours, int minutes)
+	{
+		event.setStartTime(hours, minutes);
+	}
+	
+	public void setStageEndTime(int hours, int minutes)
+	{
+		event.setEndTime(hours, minutes);
+	}
+	
+	public int getStageStartTime()
+	{
+		return event.getStartTime();
+	}
+	
+	public double getImageWidth()
+	{
+		return this.widthD;
+	}
+
+}
@@ -0,0 +1,455 @@
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+
+@SuppressWarnings({ "serial" })
+public class Timeline extends JPanel
+{
+	private ArrayList<Event> events = new ArrayList<Event>();
+	private JPanel frame;
+
+//	Geef dit object je JFrame mee, en zet in je JFrame de volgende code:
+//	this.setContentPane(timeline.getTimeline());
+//	this.getRootPane().addComponentListener(new ComponentAdapter() 
+//	{
+//		public void componentResized(ComponentEvent e) {
+//            timeline.refresh();
+//        }
+//	});
+	
+	
+	public Timeline(JPanel frame) 
+	{
+		super();
+		this.frame = frame;
+
+		genStages();
+		this.setSize(frame.getWidth(), frame.getHeight());
+//		refresh();
+		
+	}
+	
+	public void setEvents(ArrayList<Event> events)
+	{
+		this.events = events;
+	}
+
+	public void refresh()
+	{
+		this.removeAll();	
+		createMainPanel();
+		this.revalidate();
+	}
+	
+	public JPanel createMainPanel()
+	{
+//		this.setSize(frame.getWidth(), frame.getHeight());
+		JPanel mainPanel = new JPanel();
+		mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
+		Container topContainer = createTopPanel();
+		Dimension dim = new Dimension(this.getWidth(), 60);
+		topContainer.setMaximumSize(dim);
+		mainPanel.add(topContainer);
+		
+		Dimension centerDim = new Dimension(this.getWidth(), this.getHeight());
+		
+//		Container centerContainer = createCenterPanel();
+		JPanel centerContainer = createCenterPanel();
+		centerContainer.setPreferredSize(centerDim);
+
+		centerContainer.setMaximumSize(centerDim);
+//		System.out.println(centerDim);
+		mainPanel.add(centerContainer);
+		this.add(mainPanel, BorderLayout.CENTER);
+		return mainPanel;
+	}
+
+	private JPanel createCenterPanel()
+	{
+
+		JPanel centerPanel = new JPanel();
+		centerPanel.setBackground(Color.lightGray);
+		centerPanel.setLayout(new BoxLayout(centerPanel, BoxLayout.Y_AXIS));
+		centerPanel.add(Box.createRigidArea(new Dimension(0, 30)));
+
+		for(Event event : events)
+		{
+			StagePanel stagepanel = new StagePanel((int)calcLengthOfStage(event.getLength()), 30, (int)calcPositionOfStage(event.getStartTime()), event,calcLengthOfStage(event.getLength()),calcPositionOfStage(event.getStartTime()));
+			Container content = stagepanel;
+			content.setMaximumSize(new Dimension(this.getWidth(),30));
+			content.addMouseListener(new MouseListener() {
+				
+				@Override
+				public void mouseReleased(MouseEvent e) {
+					resizeTimeline(stagepanel);
+				}
+				
+				@Override
+				public void mousePressed(MouseEvent e) {
+					
+				}
+				
+				@Override
+				public void mouseExited(MouseEvent e) {
+					
+				}
+				
+				@Override
+				public void mouseEntered(MouseEvent e) {
+					
+				}
+				
+				@Override
+				public void mouseClicked(MouseEvent e) {
+					
+				}
+			});
+			content.addMouseMotionListener(new MouseMotionListener() {
+
+				@Override
+				public void mouseMoved(MouseEvent e) {
+
+				}
+
+				@Override
+				public void mouseDragged(MouseEvent e) {
+					int value = (int)(e.getX() - stagepanel.getImageWidth() / 2);
+					double value2 = (e.getX() - stagepanel.getImageWidth() / 2);
+//					System.out.println("Value1: " + value);
+//					System.out.println("Value2: " + value2);
+					stagepanel.update(value, value2);
+				}
+			});
+			centerPanel.add(content);
+			centerPanel.add(Box.createRigidArea(new Dimension(0,15)));
+		}
+
+//		this.add(centerPanel, BorderLayout.CENTER);
+		return centerPanel;
+	}
+
+	public void resizeTimeline(StagePanel stagepanel)
+	{
+//		System.out.println(stagepanel.getStageStartTime());
+//		System.out.println(calcStartTimeOfStagePanel(stagepanel.getPosX()));
+		stagepanel.setStageStartTime(calcStartTimeOfStagePanelHours(stagepanel.getPosX()),calcStartTimeOfStagePanelMinutes(stagepanel.getPosX()));
+		stagepanel.setStageEndTime(calcEndTimeOfStagePanelHours(stagepanel.getPosX(), stagepanel.getImageWidth()),calcEndTimeOfStagePanelMinutes(stagepanel.getPosX(), stagepanel.getImageWidth()));
+//		stagepanel.setLength(calcLengthOfStagePanel(stagepanel.getImageWidth()));
+//		System.out.println("HOURS: " + calcEndTimeOfStagePanelHours(stagepanel.getPosX(), stagepanel.getImageWidth()));
+//		System.out.println("MINUTES: " + calcEndTimeOfStagePanelMinutes(stagepanel.getPosX(), stagepanel.getImageWidth()) );
+//		TimelinePanel tempPanel = (TimelinePanel) frame;
+//		tempPanel.refresh();
+		refresh();
+//		System.out.println(stagepanel.getPosX());
+	}
+	
+	public double calcLengthOfStage(double length)
+	{
+		double lengthOfStage = 0;
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		
+		double frameWidth = this.getWidth();
+		double minmax = max-min;
+		double pixelsPerLength = frameWidth / minmax;
+		lengthOfStage =  pixelsPerLength * (double)length;
+//		System.out.println("LengthOfStage: " + lengthOfStage);
+//	
+//		System.out.println("MAX: " + max);
+//		System.out.println("MIN: " + min);
+//		System.out.println("LENGTH: " + length);
+//		System.out.println("FRAME: " + frameWidth);
+//		System.out.println("PixelsPerLEngth: " + pixelsPerLength);
+		
+		return lengthOfStage;
+	}
+	
+	public double calcLengthOfStagePanel(double length)
+	{
+		double lengthOfStagePanel = 0;
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+//		System.out.println(length);
+		double frameWidth = this.getWidth();
+		double minmax = max-min;
+		double pixelsPerLength = frameWidth / minmax;
+//		System.out.println(pixelsPerLength);
+		lengthOfStagePanel =  (double)length / pixelsPerLength;
+//		System.out.println(lengthOfStagePanel);
+		
+
+//		System.out.println("LengthOfStagePane: " + (int)lengthOfStagePanel);
+		
+		return lengthOfStagePanel;
+	}
+	
+	public double calcPositionOfStage(int startTime)
+	{
+		double posx;
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		double minmax = max-min;
+		posx = startTime - min;
+		posx = posx * this.getWidth() / minmax;
+//		System.out.println("Frame: " + this.getWidth());
+//		System.out.println("startTime: " + startTime);
+//		System.out.println("Max: " + max + " min: " + min);
+//		System.out.println("Posx: " + posx);
+		return posx;
+	}
+	
+	public int calcStartTimeOfStagePanelHours(double posx)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+//		System.out.println("MIN: " + min);
+//		System.out.println("max: " + max);
+//		double startTime = (posx / (this.getWidth() / (max - min )) ) + min;
+		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
+		double minmax = max-min;
+		double bottom = this.getWidth() / minmax;
+		double all = posx / bottom;
+		double startTime = all + min;
+//		System.out.println("STPH: " + this.getWidth());
+		
+		
+
+		
+		return ((int)startTime / 60);
+	}
+	
+	public int calcStartTimeOfStagePanelMinutes(double posx)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+//		double startTime = (posx / (this.getWidth() / (max - min )) ) + min;
+		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
+		double minmax = max-min;
+		double bottom = this.getWidth() / minmax;
+		double all = posx / bottom;
+		double startTime = all + min;
+//		System.out.println("STPM: " + this.getWidth());
+		
+		return ((int)startTime % 60);
+	}
+
+	public int calcEndTimeOfStagePanelHours(double posx, double imageWidth)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
+		double minmax = max-min;
+		double bottom = this.getWidth() / minmax;
+		double all = posx / bottom;
+		double endTime = all + min + calcLengthOfStagePanel(imageWidth);
+//		System.out.println("ETPH: " + this.getWidth());
+		return (int)endTime / 60;
+	}
+	
+	public int calcEndTimeOfStagePanelMinutes(double posx, double imageWidth)
+	{
+		int min = findMinMax(1);
+		int max = findMinMax(2);
+		//Omdat het anders onnodig afgerond wordt, alles apart in doubles.
+		double minmax = max-min;
+		double bottom = this.getWidth() / minmax;
+		double all = posx / bottom;
+		double endTime = all + min + calcLengthOfStagePanel(imageWidth);
+//		System.out.println("ETPM: " + this.getWidth());
+		return (int)endTime % 60;
+	}
+	
+	public int minutesToHours(int minutes)
+	{
+		return 10;
+	}
+	
+	public int intToTime(int time, String option)
+	{
+		if(option == "hours")
+		{
+			time = time % 24;
+		}
+		else if(option == "minutes")
+		{
+			time = time % 60;
+		}
+//		System.out.println(time);
+		return time;
+	}
+	
+	public int toHours(int minutesTot)
+	{
+		int hours = minutesTot / 60;
+		int minutes = minutesTot % 60;
+		int finaltime;
+		
+		finaltime = hours * 100 + minutes;
+		
+		return finaltime;
+	}
+	
+	public int findMinMax(int i)
+	{
+		//		Event oldevent = new Event(0, 0, null, "Base", 0);
+		//		ArrayList<Event> oldevents = new ArrayList<Event>();
+		//		oldevents.add(oldevent);
+		//		Steage oldstage = new Stage(oldevents,0,null, 0, 0);
+		ArrayList<Event> eventscopy = (ArrayList<Event>) events.clone();
+
+		Integer earliestStartTime = null;
+		Integer lastEndTime = null;
+
+		for(Event event : eventscopy)
+		{
+			if(i == 1)
+			{
+				if(earliestStartTime == null)
+				{
+
+					earliestStartTime = event.getStartTime();
+				}
+
+				else
+				{
+					if(event.getStartTime() < earliestStartTime)
+					{
+						earliestStartTime = event.getStartTime();
+					}
+				}
+			}
+			else if( i == 2)
+			{
+				if(lastEndTime == null)
+				{
+					lastEndTime = event.getEndTime();
+				}
+				else
+				{
+					if(event.getEndTime() > lastEndTime)
+					{
+						lastEndTime = event.getEndTime();
+					}
+				}
+			}
+		}
+		if(i == 1)
+		{
+			return earliestStartTime;
+		}
+		else if(i == 2)
+		{
+			return lastEndTime;
+		}
+		else
+		{
+			System.out.println("Return -1");
+			return -1;
+		}
+	}
+
+	private JPanel createTopPanel()
+	{
+		JPanel topPane = new JPanel();
+		topPane.setLayout(new BoxLayout(topPane, BoxLayout.Y_AXIS));
+		JPanel topPanel = new JPanel(new FlowLayout());
+		for(int i = 0; i <= this.getWidth() / 10; i++)
+		{
+			ImageIcon topImageIcon = new ImageIcon("src/sprites/block.png");
+			JLabel topImage = new JLabel(topImageIcon);
+			topPanel.add(topImage);
+		}
+		topPane.add(Box.createRigidArea(new Dimension(0,20)));
+		JPanel panel = new JPanel();
+		panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
+		panel.add(Box.createRigidArea(new Dimension(50, 10)));
+		panel.add(new JLabel(Integer.toString(toHours(findMinMax(1)))));
+		panel.add(Box.createHorizontalGlue());
+		panel.add(new JLabel(Integer.toString(toHours(findMinMax(2)))));
+		panel.add(Box.createRigidArea(new Dimension(50, 10)));
+		topPane.add(panel);
+		topPane.add(topPanel);
+//		this.add(topPane, BorderLayout.NORTH);
+		return topPane;
+	}
+
+	public JPanel createWestPanel()
+	{
+		this.setSize(frame.getWidth(), frame.getHeight());
+		JPanel westPanel = new JPanel();
+		westPanel.setLayout(new BoxLayout(westPanel, BoxLayout.Y_AXIS));
+		westPanel.add(Box.createRigidArea(new Dimension(0, 100)));
+//		for(int i = 0; i < events.size(); i++)
+//		{
+//			JLabel stageText = new JLabel("Stage: " + (i+1) + "    ");
+//			westPanel.add(stageText);
+//			westPanel.add(Box.createRigidArea(new Dimension(0, 30 )));
+//		}
+		for(Event event : events)
+		{
+			JLabel stageText = new JLabel(event.getStage().getName() + ": " + "    ");
+			
+			westPanel.add(stageText);
+			westPanel.add(Box.createRigidArea(new Dimension(0, 30 )));
+		}
+//		this.add(westPanel, BorderLayout.WEST);
+		return westPanel;
+	}
+
+	private void genStages()
+	{
+//		ImageIcon image = new ImageIcon();
+//		Artist artist2 = new Artist("Henk", "paul2", "kaas", image, 2);
+//		Artist artist1 = new Artist("Kaas", "Paul", "Lala", image, 1);
+//		Event event2 = new Event(1900, 2000, artist2, "hi2", 2);
+//		Event event1 = new Event(600, 1800, artist1, "hi", 1);
+//		ArrayList<Event> performances = new ArrayList<Event>();
+//		performances.add(event1);
+//		performances.add(event2);
+//		Stage stage1 = new Stage(performances, 100, null, 1800, 2100);
+//		events.add(stage1);
+//		Stage stage2 = new Stage(performances, 100, null, 1700, 1900);
+//		Stage stage3 = new Stage(performances, 100, null, 1600, 1800);
+//		Stage stage4 = new Stage(performances, 100, null, 1600, 2100);
+//		events.add(stage3);
+//		events.add(stage2);
+////		stages.add(stage4);
+
+	}
+
+	public void createNull()
+	{
+		this.removeAll();
+		this.add(new JLabel("No events for this day"));
+		this.revalidate();
+	}
+	
+	public JPanel getTimeline()
+	{
+		return this;
+	}
+
+	
+}
@@ -0,0 +1,73 @@
+import java.awt.BorderLayout;
+import java.util.ArrayList;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+
+
+public class TimelinePanel extends JPanel implements Panel {
+
+	private Timeline timeline;
+//	private WestPanel westPanel;
+	
+	public TimelinePanel() 
+	{
+		super(new BorderLayout());
+		
+		this.setSize(600, 600);
+		this.setVisible(true);
+		timeline = new Timeline(this);
+//		westPanel = new WestPanel();
+//		this.add(timeline.createMainPanel(),BorderLayout.CENTER);
+//		this.add(new JButton());
+//		this.add(timeline.createWestPanel(), BorderLayout.WEST);
+	}
+	
+	public void refresh()
+	{
+		this.removeAll();	
+		timeline.refresh();
+//		westPanel.refresh();
+		this.add(timeline,BorderLayout.CENTER);
+		this.add(timeline.createWestPanel(), BorderLayout.WEST);
+		this.revalidate();
+//		timeline.refresh();
+	}
+
+	@Override
+	public void update(ArrayList<Event> events) 
+	{
+		timeline.setEvents(events);
+//		System.out.println(events.size());
+//		westPanel.setEvents(events);
+//		refresh();
+//		this.add(timeline.createMainPanel(),BorderLayout.CENTER);
+//		this.add(new JButton());
+//		this.add(timeline.createWestPanel(), BorderLayout.WEST);
+		
+		//dit fixt het half
+		if(events.size() != 0)
+		{
+			this.removeAll();
+			timeline.refresh();
+			this.add(timeline.createWestPanel(),BorderLayout.WEST);
+			this.add(timeline, BorderLayout.CENTER);
+			this.revalidate();
+		}
+		else
+		{
+			this.removeAll();
+			timeline.createNull();
+			this.add(timeline);
+			this.revalidate();
+		}
+		
+	}
+	
+	
+	public TimelinePanel getTimelinePanel()
+	{
+		return this;
+	}
+
+}
@@ -7,6 +7,8 @@ import java.awt.FlowLayout;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.text.SimpleDateFormat;
@@ -75,6 +77,9 @@ public class Window extends JFrame {
 		Panel art_staPanel = new PanelArtSta(this);
 		panels.put("art_sta", art_staPanel);
 		
+		Panel timeline = new TimelinePanel();
+		panels.put("timeline", timeline);
+		
 		//Main Panels
 		JPanel mainPanel = new JPanel(new BorderLayout());
 		centerPanel = new JPanel(new BorderLayout());
@@ -163,6 +168,18 @@ public class Window extends JFrame {
 		
 		//Show window
 		setVisible(true);
+		this.getRootPane().addComponentListener(new ComponentAdapter() 
+		{
+			public void componentResized(ComponentEvent e) {
+                if(currentPanel == "timeline")
+                {
+                	TimelinePanel tempTimeLine = (TimelinePanel) timeline;
+                    tempTimeLine.refresh();
+                }
+				
+
+            }
+		});
 	}
 	
 	public static void changePanel(String panel)