Avans/FestivalPlanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed actionlisteners

Browse Source
This commit is contained in:
kennyboy55
2015-03-17 13:27:21 +01:00
parent 8bf08d4e1d
commit c21af8db1a
14 changed files with 529 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Listeners/Mouse.java
+45 -22
View File
@@ -11,31 +11,35 @@ import Applicatie.DrawObject;
import Applicatie.Panel;
import Objects.Stage;
public class Mouse extends MouseAdapter {
public class Mouse extends MouseAdapter
{
private Panel panel;
private DrawObject selectedObject;
public Mouse(Panel panel) {
public Mouse(Panel panel)
{
this.panel = panel;
selectedObject = null;
}
public void mousePressed(MouseEvent e) {
public void mousePressed(MouseEvent e)
{
Point2D clickPoint = panel.getClickPoint(e.getPoint());
panel.setLastClickPosition(clickPoint);
panel.setLastMousePosition(e.getPoint());
if (e.getY() < 150) {
if (e.getY() < 150)
{
// 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()) {
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);
@@ -45,29 +49,46 @@ public class Mouse extends MouseAdapter {
last += image.getWidth();
}
if (panel.getDragObject() != null) {
if (panel.getDragObject() != null)
{
panel.add(panel.getDragObject());
}
} else {
for (DrawObject o : panel.getObjects()) {
if (o.contains(clickPoint)) {
if (o == selectedObject) {
}
else
{
for (DrawObject o : panel.getObjects())
{
if (o.contains(clickPoint))
{
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) {
if (upperLeft)
{
panel.setClickedOption("upperLeft");
} else if (upperRight) {
}
else if (upperRight)
{
panel.setClickedOption("upperRight");
} else if (bottomLeft) {
}
else if (bottomLeft)
{
panel.setClickedOption("bottomLeft");
} else if (bottomRight) {
}
else if (bottomRight)
{
panel.setClickedOption("bottomRight");
} else if (rotate) {
}
else if (rotate)
{
panel.setClickedOption("rotate");
} else {
}
else
{
panel.setClickedOption("drag");
}
}
@@ -81,7 +102,8 @@ public class Mouse extends MouseAdapter {
}
}
}
if (panel.getDragObject() == null && selectedObject != null) {
if (panel.getDragObject() == null && selectedObject != null)
{
selectedObject.setSelected(false);
panel.getPP().clearSelected();
selectedObject = null;
@@ -89,9 +111,10 @@ public class Mouse extends MouseAdapter {
panel.repaint();
}
public void mouseReleased(MouseEvent e) {
public void mouseReleased(MouseEvent e)
{
panel.setDragObject(null);
panel.setClickedOption("drag");
panel.repaint();
}
}
}
Listeners/MouseMotion.java
+73 -61
View File
@@ -1,11 +1,13 @@
package Listeners;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter;
import java.awt.geom.Point2D;
import Applicatie.Panel;
public class MouseMotion extends MouseMotionAdapter {
public class MouseMotion extends MouseMotionAdapter
{
private Panel panel;
@@ -14,78 +16,88 @@ public class MouseMotion extends MouseMotionAdapter {
this.panel = panel;
}
public void mouseDragged(MouseEvent e) {
public void mouseDragged(MouseEvent e)
{
Point2D clickPoint = panel.getClickPoint(e.getPoint());
if(panel.getDragObject() != null) {
if (panel.getDragObject() != null)
{
Point2D objectPoint = panel.getDragObject().getObjectPoint(panel.getDragObject().getPosition());
switch(panel.getClickedOption()) {
case "drag":
if(panel.getDragObject() != null)
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;
case "upperLeft":
if(clickPoint.getX() < panel.getDragObject().getPosition().getX() && clickPoint.getY() < panel.getDragObject().getPosition().getY()) {
resizeBigger();
}
else if (clickPoint.getX() > panel.getDragObject().getPosition().getX() && clickPoint.getY() > panel.getDragObject().getPosition().getY()) {
resizeSmaller();
}
break;
case "upperRight":
if(clickPoint.getX() > panel.getDragObject().getRectangle().getX() + panel.getDragObject().getRectangle().getWidth() && clickPoint.getY() < panel.getDragObject().getRectangle().getY()) {
resizeBigger();
}
else if (clickPoint.getX() < panel.getDragObject().getRectangle().getX() + panel.getDragObject().getRectangle().getWidth() && clickPoint.getY() > panel.getDragObject().getRectangle().getY()) {
resizeSmaller();
}
break;
case "bottomLeft":
if(clickPoint.getX() < panel.getDragObject().getRectangle().getX() && clickPoint.getY() > panel.getDragObject().getRectangle().getY() + panel.getDragObject().getRectangle().getHeight()) {
resizeBigger();
}
else if (clickPoint.getX() > panel.getDragObject().getRectangle().getX() && clickPoint.getY() < panel.getDragObject().getRectangle().getY() + panel.getDragObject().getRectangle().getHeight()) {
resizeSmaller();
}
break;
case "bottomRight":
if(clickPoint.getX() > panel.getDragObject().getRectangle().getX() + panel.getDragObject().getRectangle().getWidth() && clickPoint.getY() > panel.getDragObject().getRectangle().getY() + panel.getDragObject().getRectangle().getHeight()) {
resizeBigger();
}
else if (clickPoint.getX() < panel.getDragObject().getRectangle().getX() + panel.getDragObject().getRectangle().getWidth() && clickPoint.getY() < panel.getDragObject().getRectangle().getY() + panel.getDragObject().getRectangle().getHeight()) {
resizeSmaller();
}
break;
case "rotate":
double tempval = panel.getDragObject().getRotation() + (panel.getLastClickPosition().getX() - clickPoint.getX());
panel.getDragObject().setRotation(tempval);
break;
switch (panel.getClickedOption())
{
case "drag":
if (panel.getDragObject() != null)
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;
case "upperLeft":
if (clickPoint.getX() < panel.getDragObject().getPosition().getX() && clickPoint.getY() < panel.getDragObject().getPosition().getY())
{
resizeBigger();
}
else if (clickPoint.getX() > panel.getDragObject().getPosition().getX() && clickPoint.getY() > panel.getDragObject().getPosition().getY())
{
resizeSmaller();
}
break;
case "upperRight":
if (clickPoint.getX() > panel.getDragObject().getRectangle().getX() + panel.getDragObject().getRectangle().getWidth() && clickPoint.getY() < panel.getDragObject().getRectangle().getY())
{
resizeBigger();
}
else if (clickPoint.getX() < panel.getDragObject().getRectangle().getX() + panel.getDragObject().getRectangle().getWidth() && clickPoint.getY() > panel.getDragObject().getRectangle().getY())
{
resizeSmaller();
}
break;
case "bottomLeft":
if (clickPoint.getX() < panel.getDragObject().getRectangle().getX() && clickPoint.getY() > panel.getDragObject().getRectangle().getY() + panel.getDragObject().getRectangle().getHeight())
{
resizeBigger();
}
else if (clickPoint.getX() > panel.getDragObject().getRectangle().getX() && clickPoint.getY() < panel.getDragObject().getRectangle().getY() + panel.getDragObject().getRectangle().getHeight())
{
resizeSmaller();
}
break;
case "bottomRight":
if (clickPoint.getX() > panel.getDragObject().getRectangle().getX() + panel.getDragObject().getRectangle().getWidth() && clickPoint.getY() > panel.getDragObject().getRectangle().getY() + panel.getDragObject().getRectangle().getHeight())
{
resizeBigger();
}
else if (clickPoint.getX() < panel.getDragObject().getRectangle().getX() + panel.getDragObject().getRectangle().getWidth() && clickPoint.getY() < panel.getDragObject().getRectangle().getY() + panel.getDragObject().getRectangle().getHeight())
{
resizeSmaller();
}
break;
case "rotate":
double tempval = panel.getDragObject().getRotation() + (panel.getLastClickPosition().getX() - clickPoint.getX());
panel.getDragObject().setRotation(tempval);
break;
}
}
else {
panel.setCameraPoint(new Point2D.Double(
panel.getCameraPoint().getX() + (panel.getLastMousePosition().getX() - e.getX()),
panel.getCameraPoint().getY() + (panel.getLastMousePosition().getY() - e.getY())
));
}
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();
}
private void resizeBigger() {
double scale = panel.getDragObject().getScale()*1 + 0.02;
private void resizeBigger()
{
double scale = panel.getDragObject().getScale() * 1 + 0.02;
panel.getDragObject().setScale(scale);
panel.getDragObject().setPosition(new Point2D.Double(panel.getDragObject().getPosition().getX()-2,panel.getDragObject().getPosition().getY()-2));
panel.getDragObject().setPosition(new Point2D.Double(panel.getDragObject().getPosition().getX() - 2, panel.getDragObject().getPosition().getY() - 2));
}
private void resizeSmaller() {
if(panel.getDragObject().getScale() > 0.2) {
double scale = panel.getDragObject().getScale()*1 - 0.02;
private void resizeSmaller()
{
if (panel.getDragObject().getScale() > 0.2)
{
double scale = panel.getDragObject().getScale() * 1 - 0.02;
panel.getDragObject().setScale(scale);
panel.getDragObject().setPosition(new Point2D.Double(panel.getDragObject().getPosition().getX()+2,panel.getDragObject().getPosition().getY()+2));
panel.getDragObject().setPosition(new Point2D.Double(panel.getDragObject().getPosition().getX() + 2, panel.getDragObject().getPosition().getY() + 2));
}
}
}
Listeners/MouseWheel.java
+29 -21
View File
@@ -7,21 +7,25 @@ import java.awt.geom.Point2D;
import Applicatie.DrawObject;
import Applicatie.Panel;
public class MouseWheel implements MouseWheelListener {
public class MouseWheel implements MouseWheelListener
{
private Panel panel;
private int scrollfactor;
public MouseWheel(Panel panel) {
public MouseWheel(Panel panel)
{
this.panel = panel;
scrollfactor = 20;
}
public void mouseWheelMoved(MouseWheelEvent e) {
public void mouseWheelMoved(MouseWheelEvent e)
{
Point2D clickPoint = panel.getClickPoint(e.getPoint());
for (DrawObject o : panel.getObjects()) {
if (o.contains(clickPoint)) {
double scale = o.getScale() * 1
+ (e.getPreciseWheelRotation() / 10.0);
for (DrawObject o : panel.getObjects())
{
if (o.contains(clickPoint))
{
double scale = o.getScale() * 1 + (e.getPreciseWheelRotation() / 10.0);
o.setScale(scale);
panel.getPP().update();
panel.repaint();
@@ -29,31 +33,35 @@ public class MouseWheel implements MouseWheelListener {
}
}
if (e.getY() < 150) {
if (e.getY() < 150)
{
if (e.getPreciseWheelRotation() < 0) {
if (panel.getScrollfactor() + scrollfactor
+ panel.getPanelInfoLength() < panel.getWidth()) {
panel.setScrollfactor(panel.getScrollfactor()
+ scrollfactor);
if (e.getPreciseWheelRotation() < 0)
{
if (panel.getScrollfactor() + scrollfactor + panel.getPanelInfoLength() < panel.getWidth())
{
panel.setScrollfactor(panel.getScrollfactor() + scrollfactor);
}
} else {
if (panel.getScrollfactor() - scrollfactor >= 0) {
panel.setScrollfactor(panel.getScrollfactor()
- scrollfactor);
}
else
{
if (panel.getScrollfactor() - scrollfactor >= 0)
{
panel.setScrollfactor(panel.getScrollfactor() - scrollfactor);
}
}
} else {
}
else
{
// cameraPoint
double cameraScale = panel.getCameraScale() * 1
- (e.getPreciseWheelRotation() / 10);
double cameraScale = panel.getCameraScale() * 1 - (e.getPreciseWheelRotation() / 10);
panel.setCameraScale((float) cameraScale);
}
panel.repaint();
}
}
}