update

try
2015-03-15 11:42:01 +01:00
parent ae35416cf9
commit dccdccb573
11 changed files with 515 additions and 123 deletions
@@ -3,71 +3,69 @@ package Listeners;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
+import java.util.Iterator;
+import java.util.Map;

 import Applicatie.DrawObject;
 import Applicatie.Panel;
 import Objects.Podium;
-import Objects.Toilet;
-import Applicatie.Panel;

 public class Mouse extends MouseAdapter {
 	
 	private Panel panel;
-	private DrawObject selectedObject;

 	public Mouse(Panel panel)
 	{
 		this.panel = panel;
-		selectedObject = null;
 	}

 	public void mousePressed(MouseEvent e) {
 		Point2D clickPoint = panel.getClickPoint(e.getPoint());
 		panel.setLastClickPosition(clickPoint);
 		panel.setLastMousePosition(e.getPoint());
-
-		if(e.getX() < 200)
+		if(e.getY() < 150)
 		{
-			if(e.getY() < 300)
-				panel.setDragObject(new Podium(clickPoint));
-			else
-				panel.setDragObject(new Toilet(clickPoint));
-			panel.add(panel.getDragObject());
+//			if(e.getX() < 51) //51 = width podium image
+//				panel.setDragObject(new Podium(clickPoint));
+//			else
+//				panel.setDragObject(new Toilet(clickPoint));
+			int i = 0;
+			int last = 0;
+			for(BufferedImage image : panel.getPanelInfo())
+			{
+				if(e.getX() >= panel.getScrollfactor() && e.getX() < last + image.getWidth() + panel.getScrollfactor())
+				{
+					DrawObject tempDrawObj = panel.createNewDrawObject(i);
+					tempDrawObj.setPosition(clickPoint);
+					panel.setDragObject(tempDrawObj);
+					break;
+				}
+				i++;
+				last += image.getWidth();
+				
+			}
+			if(panel.getDragObject() != null)
+			{
+				panel.add(panel.getDragObject());
+			}
 		}
 		else
 		{
 			for(DrawObject o : panel.getObjects())
-				if(o.contains(clickPoint)) {
-					if(o == selectedObject) {
-						boolean upperLeft = clickPoint.getX() > o.getRectangle().getX() && clickPoint.getX() < o.getRectangle().getX()+o.getRectangle().getWidth()/10
-											&& clickPoint.getY() > o.getRectangle().getY() && clickPoint.getY() < o.getRectangle().getY()+o.getRectangle().getHeight()/10;
-						if(upperLeft) {
-							System.out.println("lal");
-							panel.setClickedOption("upperLeft");
-						}
-						else {
-							panel.setClickedOption("drag");
-						}
-					}
-					if(selectedObject != null)
-						selectedObject.setSelected(false);
+			{
+				if(o.contains(clickPoint))
+				{
 					panel.setDragObject(o);
-					o.setSelected(true);
-					selectedObject = o;
-					System.out.println("selected");
+					panel.getPP().setSelected(o);
+					return;
 				}
+			}
+			panel.getPP().clearSelected();
 		}
-		if(panel.getDragObject() == null && selectedObject != null) {
-			System.out.println("deselected");
-			selectedObject.setSelected(false);
-			selectedObject = null;
-		}
-		panel.repaint();	
 	}

-
 	public void mouseReleased(MouseEvent e) {
 		panel.setDragObject(null);
-		panel.repaint();
 	}
 }
@@ -21,41 +21,33 @@ public class MouseMotion extends MouseMotionAdapter {

 	public void mouseDragged(MouseEvent e) {
 		Point2D clickPoint = panel.getClickPoint(e.getPoint());
-		switch(panel.getClickedOption()) {
-			case "drag":
-				if(panel.getDragObject() != null)
-					panel.getDragObject().setPosition(new Point2D.Double(
+		if(panel.getDragObject() != null)
+		{
+			if(SwingUtilities.isLeftMouseButton(e)){
+
+
+				panel.getDragObject().setPosition(new Point2D.Double(
 						panel.getDragObject().getPosition().getX() - (panel.getLastClickPosition().getX() - clickPoint.getX()), 
 						panel.getDragObject().getPosition().getY() - (panel.getLastClickPosition().getY() - clickPoint.getY())));
-				break;
+			}
+			else
+			{
+
+				double tempval = panel.getDragObject().getRotation() + (panel.getLastClickPosition().getX() - clickPoint.getX());
+				panel.getDragObject().setRotation(tempval);
+			}
+			panel.repaint();
+		}
+		else
+		{
+			panel.setCameraPoint(new Point2D.Double(
+					panel.getCameraPoint().getX() + (panel.getLastMousePosition().getX() - e.getX()),
+					panel.getCameraPoint().getY() + (panel.getLastMousePosition().getY() - e.getY())
+					));
+			panel.repaint();
 		}
-		panel.repaint();
-		
-		
-//		if(panel.getDragObject() != null)
-//		{
-//			if(SwingUtilities.isLeftMouseButton(e)){
-//
-//
-//			
-//			}
-//			else
-//			{
-//double tempval = panel.getDragObject().getRotation() + (panel.getLastClickPosition().getX() - clickPoint.getX());
-		//panel.getDragObject().setRotation(tempval);
-//				
-//			}
-//			panel.repaint();
-//		}
-//		else
-//		{
-//			panel.setCameraPoint(new Point2D.Double(
-//					panel.getCameraPoint().getX() + (panel.getLastMousePosition().getX() - e.getX()),
-//					panel.getCameraPoint().getY() + (panel.getLastMousePosition().getY() - e.getY())
-//					));
-//			panel.repaint();
-//		}
 		panel.setLastMousePosition(e.getPoint());
 		panel.setLastClickPosition(clickPoint);
+		panel.getPP().update();
 	}
 }
@@ -9,12 +9,14 @@ import Applicatie.Panel;

 public class MouseWheel implements MouseWheelListener {
 	private Panel panel;
-	
+	private int scrollfactor;
+
 	public MouseWheel(Panel panel)
 	{
 		this.panel = panel;
+		scrollfactor = 20;
 	}
-	
+
 	public void mouseWheelMoved(MouseWheelEvent e) {
 		Point2D clickPoint = panel.getClickPoint(e.getPoint());
 		for(DrawObject o : panel.getObjects())
@@ -23,14 +25,42 @@ public class MouseWheel implements MouseWheelListener {
 			{
 				double scale = o.getScale()* 1 + (e.getPreciseWheelRotation()/10.0);
 				o.setScale(scale);
+				panel.getPP().update();
 				panel.repaint();
 				return;
 			}
 		}
+
+		if(e.getY() < 150)
+		{
+
+			if(e.getPreciseWheelRotation() < 0)
+			{
+				if(panel.getScrollfactor() + scrollfactor + panel.getPanelInfoLength() < panel.getWidth())
+				{
+					panel.setScrollfactor(panel.getScrollfactor() + scrollfactor);
+				}
 		
-//		cameraPoint
-		double cameraScale = panel.getCameraScale() * 1 - (e.getPreciseWheelRotation()/10);
-		panel.setCameraScale((float) cameraScale);
+			}
+			else
+			{
+				if(panel.getScrollfactor() - scrollfactor >= 0)
+				{
+					panel.setScrollfactor(panel.getScrollfactor() - scrollfactor);
+				}
+				
+			}
+
+		}
+		else
+		{
+			//			cameraPoint
+			double cameraScale = panel.getCameraScale() * 1 - (e.getPreciseWheelRotation()/10);
+			panel.setCameraScale((float) cameraScale);
+
+		}
+
+
 		panel.repaint();
 	}
 }