added deleting object
🎯
This commit is contained in:
xrgman
@@ -45,6 +45,10 @@ public class DrawObject {
|
||||
AffineTransform tx = getTransform();
|
||||
g.drawImage(image, tx, null);
|
||||
if(selected) {
|
||||
// g.rotate(Math.toRadians(rotation), image.getWidth(null)/2, image.getHeight(null)/2);
|
||||
|
||||
AffineTransform rotate = AffineTransform.getRotateInstance(Math.toRadians(rotation), position.getX() + image.getWidth(null)/2, position.getY() +image.getHeight(null)/2);
|
||||
g.transform(rotate);
|
||||
g.setColor(Color.BLACK);
|
||||
g.setStroke(new BasicStroke(7));
|
||||
rektAngle = new Rectangle2D.Double((int) position.getX(), (int) position.getY(), image.getWidth(null), image.getHeight(null));
|
||||
@@ -63,6 +67,8 @@ public class DrawObject {
|
||||
g.setColor(Color.RED);
|
||||
rotateDot = new Ellipse2D.Double((rektAngle.getX() + (rektAngle.getWidth()/2))-8,rektAngle.getY()-8,15,15);
|
||||
g.fill(rotateDot);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+159
-55
@@ -1,10 +1,10 @@
|
||||
package Applicatie;
|
||||
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Point;
|
||||
import java.awt.TexturePaint;
|
||||
import java.awt.geom.AffineTransform;
|
||||
import java.awt.geom.Ellipse2D;
|
||||
import java.awt.geom.NoninvertibleTransformException;
|
||||
import java.awt.geom.Point2D;
|
||||
import java.awt.geom.Rectangle2D;
|
||||
@@ -12,6 +12,7 @@ import java.awt.image.BufferedImage;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.swing.JPanel;
|
||||
@@ -19,82 +20,146 @@ import javax.swing.JPanel;
|
||||
import Listeners.Mouse;
|
||||
import Listeners.MouseMotion;
|
||||
import Listeners.MouseWheel;
|
||||
import Objects.Entrance;
|
||||
import Objects.Path;
|
||||
import Objects.Podium;
|
||||
import Objects.Toilet;
|
||||
import Objects.Wall;
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
public class Panel extends JPanel {
|
||||
|
||||
|
||||
BufferedImage background;
|
||||
|
||||
BufferedImage podiumImage, toiletImage, entranceImage, pathImage,
|
||||
wallImage;
|
||||
|
||||
private int panelInfox, panelInfoy, scrollfactor;
|
||||
|
||||
private ArrayList<BufferedImage> panelInfo = new ArrayList<BufferedImage>();
|
||||
// private ArrayList<Object> panelTypes = new ArrayList<Object>();
|
||||
|
||||
ArrayList<DrawObject> objects = new ArrayList<>();
|
||||
DrawObject dragObject = null;
|
||||
private DrawObject selectedObject;
|
||||
private String clickedOption = "drag";
|
||||
|
||||
Point2D cameraPoint = new Point2D.Double(getWidth()/2,getHeight()/2);
|
||||
|
||||
Point2D cameraPoint = new Point2D.Double(getWidth() / 2, getHeight() / 2);
|
||||
float cameraScale = 1;
|
||||
|
||||
|
||||
Point2D lastClickPosition = new Point(0,0);
|
||||
Point lastMousePosition = new Point(0,0);
|
||||
|
||||
Panel()
|
||||
{
|
||||
|
||||
PropertiesPanel pp;
|
||||
|
||||
Point2D lastClickPosition = new Point(0, 0);
|
||||
Point lastMousePosition = new Point(0, 0);
|
||||
|
||||
// how to nieuwe dingen aan het panel toe te voegen:
|
||||
// maak bufferedimage global aan, voeg er een image aan toe, en voeg de
|
||||
// image aan panelInfo toe en het object aan panelTypes.
|
||||
// en maak een case statement die een new Object returnt in
|
||||
// createNewDrawObject.
|
||||
|
||||
Panel(PropertiesPanel pp) {
|
||||
this.pp = pp;
|
||||
pp.setPanel(this);
|
||||
try {
|
||||
background = ImageIO.read(new File("images/grass.jpg"));
|
||||
podiumImage = ImageIO.read(new File("images/stageIcon.png"));
|
||||
toiletImage = ImageIO.read(new File("images/wcIcon.png"));
|
||||
entranceImage = ImageIO.read(new File("images/entranceIcon.png"));
|
||||
pathImage = ImageIO.read(new File("images/pathIcon.png"));
|
||||
wallImage = ImageIO.read(new File("images/wallIcon.png"));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
objects.add(new Podium(new Point2D.Double(100, 100)));
|
||||
objects.add(new Podium(new Point2D.Double(500, 100)));
|
||||
objects.add(new Podium(new Point2D.Double(300, 400)));
|
||||
|
||||
panelInfo.add(podiumImage);
|
||||
panelInfo.add(toiletImage);
|
||||
panelInfo.add(entranceImage);
|
||||
panelInfo.add(pathImage);
|
||||
panelInfo.add(wallImage);
|
||||
|
||||
panelInfox = 0;
|
||||
panelInfoy = 0;
|
||||
scrollfactor = 0;
|
||||
|
||||
// objects.add(new Podium(new Point2D.Double(100, 100)));
|
||||
// objects.add(new Podium(new Point2D.Double(500, 100)));
|
||||
// objects.add(new Podium(new Point2D.Double(300, 400)));
|
||||
|
||||
addMouseListener(new Mouse(this));
|
||||
|
||||
|
||||
addMouseMotionListener(new MouseMotion(this));
|
||||
|
||||
|
||||
addMouseWheelListener(new MouseWheel(this));
|
||||
|
||||
}
|
||||
|
||||
|
||||
public void add(DrawObject dragObject)
|
||||
{
|
||||
|
||||
public int getPanelInfoLength() {
|
||||
int panelInfoLength = 0;
|
||||
for (BufferedImage image : panelInfo) {
|
||||
panelInfoLength += image.getWidth();
|
||||
}
|
||||
|
||||
return panelInfoLength;
|
||||
}
|
||||
|
||||
public DrawObject createNewDrawObject(int index) {
|
||||
switch (index) {
|
||||
case 0:
|
||||
return new Podium(null);
|
||||
case 1:
|
||||
return new Toilet(null);
|
||||
case 2:
|
||||
return new Entrance(null);
|
||||
case 3:
|
||||
return new Path(null);
|
||||
case 4:
|
||||
return new Wall(null);
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void add(DrawObject dragObject) {
|
||||
objects.add(dragObject);
|
||||
}
|
||||
|
||||
public void paintComponent(Graphics g)
|
||||
{
|
||||
super.paintComponent(g);
|
||||
Graphics2D g2 = (Graphics2D)g;
|
||||
g2.setClip(new Rectangle2D.Double(0,0, 200, getHeight()));
|
||||
|
||||
g2.fill(new Ellipse2D.Double(0,0,300,300));
|
||||
|
||||
|
||||
g2.setClip(new Rectangle2D.Double(200,0, getWidth()-200, getHeight()));
|
||||
public void paintComponent(Graphics g) {
|
||||
super.paintComponent(g);
|
||||
Graphics2D g2 = (Graphics2D) g;
|
||||
g2.setClip(new Rectangle2D.Double(0, 0, getWidth(), 300));
|
||||
|
||||
// g2.fill(new Ellipse2D.Double(0,0,300,300));
|
||||
|
||||
// g2.drawImage(podiumImage, 0, 0, null);
|
||||
for (BufferedImage image : panelInfo) {
|
||||
g2.drawImage(image, panelInfox + scrollfactor, panelInfoy, null);
|
||||
panelInfox += image.getWidth();
|
||||
}
|
||||
panelInfox = 0;
|
||||
|
||||
g2.setClip(new Rectangle2D.Double(0, 150, getWidth(), getHeight()));
|
||||
AffineTransform oldTransform = g2.getTransform();
|
||||
g2.setTransform(getCamera());
|
||||
|
||||
TexturePaint p = new TexturePaint(background, new Rectangle2D.Double(0, 0, 100, 100));
|
||||
|
||||
TexturePaint p = new TexturePaint(background, new Rectangle2D.Double(0,
|
||||
0, 100, 100));
|
||||
g2.setPaint(p);
|
||||
g2.fill(new Rectangle2D.Double(0,0,1920,1080));
|
||||
|
||||
for(DrawObject o : objects)
|
||||
g2.fill(new Rectangle2D.Double(-1920, -1080, 3840, 2160));
|
||||
|
||||
for (DrawObject o : objects) {
|
||||
o.draw(g2);
|
||||
|
||||
|
||||
}
|
||||
|
||||
g2.setClip(null);
|
||||
g2.setTransform(oldTransform);
|
||||
}
|
||||
|
||||
public AffineTransform getCamera() {
|
||||
AffineTransform tx = new AffineTransform();
|
||||
tx.translate(-cameraPoint.getX() + getWidth()/2, -cameraPoint.getY() + getHeight()/2);
|
||||
tx.translate(-cameraPoint.getX() + getWidth() / 2, -cameraPoint.getY()
|
||||
+ getHeight() / 2);
|
||||
tx.scale(cameraScale, cameraScale);
|
||||
return tx;
|
||||
}
|
||||
|
||||
|
||||
public Point2D getClickPoint(Point point) {
|
||||
try {
|
||||
return getCamera().inverseTransform(point, null);
|
||||
@@ -120,68 +185,107 @@ public class Panel extends JPanel {
|
||||
return dragObject;
|
||||
}
|
||||
|
||||
|
||||
public void setDragObject(DrawObject dragObject) {
|
||||
this.dragObject = dragObject;
|
||||
}
|
||||
|
||||
|
||||
public Point2D getCameraPoint() {
|
||||
return cameraPoint;
|
||||
}
|
||||
|
||||
|
||||
public void setCameraPoint(Point2D cameraPoint) {
|
||||
this.cameraPoint = cameraPoint;
|
||||
}
|
||||
|
||||
|
||||
public float getCameraScale() {
|
||||
return cameraScale;
|
||||
}
|
||||
|
||||
|
||||
public void setCameraScale(float cameraScale) {
|
||||
this.cameraScale = cameraScale;
|
||||
}
|
||||
|
||||
|
||||
public Point2D getLastClickPosition() {
|
||||
return lastClickPosition;
|
||||
}
|
||||
|
||||
|
||||
public void setLastClickPosition(Point2D lastClickPosition) {
|
||||
this.lastClickPosition = lastClickPosition;
|
||||
}
|
||||
|
||||
|
||||
public Point getLastMousePosition() {
|
||||
return lastMousePosition;
|
||||
}
|
||||
|
||||
|
||||
public void setLastMousePosition(Point lastMousePosition) {
|
||||
this.lastMousePosition = lastMousePosition;
|
||||
}
|
||||
|
||||
public BufferedImage getPodiumImage() {
|
||||
return podiumImage;
|
||||
}
|
||||
|
||||
public void setPodiumImage(BufferedImage podiumImage) {
|
||||
this.podiumImage = podiumImage;
|
||||
}
|
||||
|
||||
public ArrayList<BufferedImage> getPanelInfo() {
|
||||
return panelInfo;
|
||||
}
|
||||
|
||||
public void setPanelInfo(ArrayList<BufferedImage> panelInfo) {
|
||||
this.panelInfo = panelInfo;
|
||||
}
|
||||
|
||||
public int getScrollfactor() {
|
||||
return scrollfactor;
|
||||
}
|
||||
|
||||
public void setScrollfactor(int scrollfactor) {
|
||||
this.scrollfactor = scrollfactor;
|
||||
}
|
||||
|
||||
public int getPanelInfox() {
|
||||
return panelInfox;
|
||||
}
|
||||
|
||||
public void setPanelInfox(int panelInfox) {
|
||||
this.panelInfox = panelInfox;
|
||||
}
|
||||
|
||||
public PropertiesPanel getPP() {
|
||||
return pp;
|
||||
}
|
||||
|
||||
public void update() {
|
||||
repaint();
|
||||
}
|
||||
|
||||
public DrawObject getSelectedObject() {
|
||||
return selectedObject;
|
||||
}
|
||||
|
||||
|
||||
public void setSelectedObject(DrawObject selectedObject) {
|
||||
this.selectedObject = selectedObject;
|
||||
}
|
||||
|
||||
|
||||
public String getClickedOption() {
|
||||
return clickedOption;
|
||||
}
|
||||
|
||||
|
||||
public void setClickedOption(String clickedOption) {
|
||||
this.clickedOption = clickedOption;
|
||||
}
|
||||
|
||||
public void removeObject(DrawObject o) {
|
||||
Iterator itr = objects.iterator();
|
||||
while(itr.hasNext()) {
|
||||
DrawObject nextObject = (DrawObject) itr.next();
|
||||
if(nextObject.equals(o)) {
|
||||
pp.clearSelected();
|
||||
itr.remove();
|
||||
}
|
||||
repaint();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+134
-103
@@ -18,27 +18,25 @@ import javax.swing.JTextField;
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
public class PropertiesPanel extends JPanel {
|
||||
|
||||
|
||||
DrawObject selectedObject = null;
|
||||
Panel p = null;
|
||||
|
||||
|
||||
JTextField locationXField;
|
||||
JTextField locationYField;
|
||||
JTextField scaleField;
|
||||
JTextField rotationField;
|
||||
|
||||
PropertiesPanel()
|
||||
{
|
||||
|
||||
PropertiesPanel() {
|
||||
super();
|
||||
BoxLayout box = new BoxLayout(this, BoxLayout.PAGE_AXIS);
|
||||
setLayout(box);
|
||||
|
||||
setPreferredSize(new Dimension(200,0));
|
||||
setBorder(BorderFactory.createLineBorder(new Color(180,180,180)));
|
||||
|
||||
setPreferredSize(new Dimension(200, 0));
|
||||
setBorder(BorderFactory.createLineBorder(new Color(180, 180, 180)));
|
||||
setBackground(new Color(220, 220, 220));
|
||||
|
||||
|
||||
//NAME "PROPERTIES"
|
||||
|
||||
// NAME "PROPERTIES"
|
||||
JPanel propPanel = new JPanel();
|
||||
JLabel propLabel = new JLabel("Properties");
|
||||
propLabel.setFont(new Font("Segoe UI", Font.BOLD, 30));
|
||||
@@ -46,9 +44,8 @@ public class PropertiesPanel extends JPanel {
|
||||
propPanel.setMaximumSize(new Dimension(200, 60));
|
||||
propPanel.add(propLabel);
|
||||
add(propPanel);
|
||||
|
||||
|
||||
//LOCATION
|
||||
|
||||
// LOCATION
|
||||
JPanel locationPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
|
||||
JLabel locationLabel = new JLabel("Location");
|
||||
locationLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
|
||||
@@ -60,7 +57,7 @@ public class PropertiesPanel extends JPanel {
|
||||
JPanel locationXPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
|
||||
locationXPanel.setPreferredSize(new Dimension(200, 50));
|
||||
locationPanel.add(locationXPanel);
|
||||
|
||||
|
||||
JLabel locationXLabel = new JLabel("X");
|
||||
locationXPanel.add(locationXLabel);
|
||||
locationXField = new JTextField();
|
||||
@@ -69,17 +66,25 @@ public class PropertiesPanel extends JPanel {
|
||||
locationXField.addKeyListener(new KeyListener() {
|
||||
|
||||
public void keyTyped(KeyEvent e) {
|
||||
try{
|
||||
locationXField.setBackground(Color.WHITE);
|
||||
double xpos = Double.parseDouble(locationXField.getText());
|
||||
selectedObject.setPosition(new Point2D.Double(xpos, selectedObject.getPosition().getY()));
|
||||
p.update();
|
||||
} catch (NumberFormatException nfe) {
|
||||
locationXField.setBackground(Color.RED);
|
||||
}
|
||||
|
||||
try {
|
||||
locationXField.setBackground(Color.WHITE);
|
||||
double xpos = Double.parseDouble(locationXField
|
||||
.getText());
|
||||
selectedObject.setPosition(new Point2D.Double(xpos,
|
||||
selectedObject.getPosition().getY()));
|
||||
p.update();
|
||||
} catch (NumberFormatException nfe) {
|
||||
locationXField.setBackground(Color.RED);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void keyReleased(KeyEvent e) {
|
||||
}
|
||||
|
||||
public void keyPressed(KeyEvent e) {
|
||||
}
|
||||
public void keyReleased(KeyEvent e) {}
|
||||
public void keyPressed(KeyEvent e) {}
|
||||
});
|
||||
}
|
||||
locationXPanel.add(locationXField);
|
||||
@@ -88,7 +93,7 @@ public class PropertiesPanel extends JPanel {
|
||||
JPanel locationYPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
|
||||
locationYPanel.setPreferredSize(new Dimension(200, 50));
|
||||
locationPanel.add(locationYPanel);
|
||||
|
||||
|
||||
JLabel locationYLabel = new JLabel("Y");
|
||||
locationYPanel.add(locationYLabel);
|
||||
locationYField = new JTextField();
|
||||
@@ -97,24 +102,32 @@ public class PropertiesPanel extends JPanel {
|
||||
locationYField.addKeyListener(new KeyListener() {
|
||||
|
||||
public void keyTyped(KeyEvent e) {
|
||||
try{
|
||||
try {
|
||||
locationYField.setBackground(Color.WHITE);
|
||||
double ypos = Double.parseDouble(locationYField.getText());
|
||||
selectedObject.setPosition(new Point2D.Double(selectedObject.getPosition().getX(), ypos));;
|
||||
double ypos = Double.parseDouble(locationYField
|
||||
.getText());
|
||||
selectedObject.setPosition(new Point2D.Double(
|
||||
selectedObject.getPosition().getX(), ypos));
|
||||
;
|
||||
p.update();
|
||||
} catch (NumberFormatException nfe) {
|
||||
locationYField.setBackground(Color.RED);
|
||||
|
||||
locationYField.setBackground(Color.RED);
|
||||
|
||||
}
|
||||
}
|
||||
public void keyReleased(KeyEvent e) {}
|
||||
public void keyPressed(KeyEvent e) {}
|
||||
|
||||
public void keyReleased(KeyEvent e) {
|
||||
}
|
||||
|
||||
public void keyPressed(KeyEvent e) {
|
||||
}
|
||||
});
|
||||
}
|
||||
locationYPanel.add(locationYField);
|
||||
}
|
||||
|
||||
|
||||
//SCALE
|
||||
|
||||
// SCALE
|
||||
JPanel scalePanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
|
||||
JLabel scaleLabel = new JLabel("Scale");
|
||||
scaleLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
|
||||
@@ -126,7 +139,7 @@ public class PropertiesPanel extends JPanel {
|
||||
JPanel scalePanel2 = new JPanel(new FlowLayout(FlowLayout.LEFT));
|
||||
scalePanel2.setPreferredSize(new Dimension(200, 50));
|
||||
scalePanel.add(scalePanel2);
|
||||
|
||||
|
||||
JLabel scale2Label = new JLabel(" ");
|
||||
scalePanel2.add(scale2Label);
|
||||
scaleField = new JTextField();
|
||||
@@ -135,24 +148,30 @@ public class PropertiesPanel extends JPanel {
|
||||
scaleField.addKeyListener(new KeyListener() {
|
||||
|
||||
public void keyTyped(KeyEvent e) {
|
||||
try{
|
||||
scaleField.setBackground(Color.WHITE);
|
||||
double scale = Double.parseDouble(scaleField.getText());
|
||||
selectedObject.setScale(scale);
|
||||
p.update();
|
||||
} catch (NumberFormatException nfe) {
|
||||
scaleField.setBackground(Color.RED);
|
||||
}
|
||||
|
||||
try {
|
||||
scaleField.setBackground(Color.WHITE);
|
||||
double scale = Double.parseDouble(scaleField
|
||||
.getText());
|
||||
selectedObject.setScale(scale);
|
||||
p.update();
|
||||
} catch (NumberFormatException nfe) {
|
||||
scaleField.setBackground(Color.RED);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void keyReleased(KeyEvent e) {
|
||||
}
|
||||
|
||||
public void keyPressed(KeyEvent e) {
|
||||
}
|
||||
public void keyReleased(KeyEvent e) {}
|
||||
public void keyPressed(KeyEvent e) {}
|
||||
});
|
||||
}
|
||||
scalePanel2.add(scaleField);
|
||||
}
|
||||
|
||||
|
||||
//ROTATION
|
||||
|
||||
// ROTATION
|
||||
JPanel rotationPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
|
||||
JLabel rotationLabel = new JLabel("Rotation");
|
||||
rotationLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
|
||||
@@ -164,7 +183,7 @@ public class PropertiesPanel extends JPanel {
|
||||
JPanel rotationPanel2 = new JPanel(new FlowLayout(FlowLayout.LEFT));
|
||||
rotationPanel2.setPreferredSize(new Dimension(200, 50));
|
||||
rotationPanel.add(rotationPanel2);
|
||||
|
||||
|
||||
JLabel rotation2Label = new JLabel(" ");
|
||||
rotationPanel2.add(rotation2Label);
|
||||
rotationField = new JTextField();
|
||||
@@ -173,31 +192,38 @@ public class PropertiesPanel extends JPanel {
|
||||
rotationField.addKeyListener(new KeyListener() {
|
||||
|
||||
public void keyTyped(KeyEvent e) {
|
||||
try{
|
||||
rotationField.setBackground(Color.WHITE);
|
||||
int rotation = Integer.parseInt(rotationField.getText()) % 360;
|
||||
rotationField.setText(rotation +"");
|
||||
selectedObject.setRotation(rotation);
|
||||
p.update();
|
||||
} catch (NumberFormatException nfe) {
|
||||
rotationField.setBackground(Color.RED);
|
||||
}
|
||||
|
||||
try {
|
||||
rotationField.setBackground(Color.WHITE);
|
||||
int rotation = Integer.parseInt(rotationField
|
||||
.getText()) % 360;
|
||||
rotationField.setText(rotation + "");
|
||||
selectedObject.setRotation(rotation);
|
||||
p.update();
|
||||
} catch (NumberFormatException nfe) {
|
||||
rotationField.setBackground(Color.RED);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void keyReleased(KeyEvent e) {
|
||||
}
|
||||
|
||||
public void keyPressed(KeyEvent e) {
|
||||
}
|
||||
public void keyReleased(KeyEvent e) {}
|
||||
public void keyPressed(KeyEvent e) {}
|
||||
});
|
||||
}
|
||||
rotationPanel2.add(rotationField);
|
||||
}
|
||||
|
||||
//SPACER
|
||||
|
||||
// SPACER
|
||||
JPanel spacerPanel = new JPanel();
|
||||
spacerPanel.setPreferredSize(new Dimension(200, 50));
|
||||
spacerPanel.setMaximumSize(new Dimension(200, 50));
|
||||
spacerPanel.setBackground(new Color(220, 220, 220));
|
||||
add(spacerPanel);
|
||||
|
||||
//EXAMPLE
|
||||
|
||||
// EXAMPLE
|
||||
JPanel examplePanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
|
||||
JLabel exampleLabel = new JLabel("Example");
|
||||
exampleLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
|
||||
@@ -205,60 +231,65 @@ public class PropertiesPanel extends JPanel {
|
||||
examplePanel.setMaximumSize(new Dimension(200, 100));
|
||||
examplePanel.add(exampleLabel);
|
||||
add(examplePanel);
|
||||
|
||||
|
||||
enableComponents(this, false);
|
||||
}
|
||||
|
||||
|
||||
public void setSelected(DrawObject drOb)
|
||||
{
|
||||
|
||||
public void setSelected(DrawObject drOb) {
|
||||
selectedObject = drOb;
|
||||
fillFields();
|
||||
enableComponents(this, true);
|
||||
}
|
||||
|
||||
public void clearSelected()
|
||||
{
|
||||
|
||||
public void clearSelected() {
|
||||
enableComponents(this, false);
|
||||
clearFields(this);
|
||||
selectedObject = null;
|
||||
}
|
||||
|
||||
|
||||
public void update() {
|
||||
fillFields();
|
||||
}
|
||||
|
||||
|
||||
private void enableComponents(Container container, boolean enable) {
|
||||
Component[] components = container.getComponents();
|
||||
for (Component component : components) {
|
||||
component.setEnabled(enable);
|
||||
if (component instanceof Container) {
|
||||
enableComponents((Container)component, enable);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component[] components = container.getComponents();
|
||||
for (Component component : components) {
|
||||
component.setEnabled(enable);
|
||||
if (component instanceof Container) {
|
||||
enableComponents((Container) component, enable);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void clearFields(Container container) {
|
||||
Component[] components = container.getComponents();
|
||||
for (Component component : components) {
|
||||
if (component instanceof JTextField) {
|
||||
((JTextField) component).setText("");
|
||||
}
|
||||
if (component instanceof Container) {
|
||||
clearFields((Container)component);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component[] components = container.getComponents();
|
||||
for (Component component : components) {
|
||||
if (component instanceof JTextField) {
|
||||
((JTextField) component).setText("");
|
||||
}
|
||||
if (component instanceof Container) {
|
||||
clearFields((Container) component);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void fillFields() {
|
||||
locationXField.setText(Math.round(selectedObject.getPosition().getX()) + "");
|
||||
locationYField.setText(Math.round(selectedObject.getPosition().getY()) + "");
|
||||
scaleField.setText((double)Math.round(selectedObject.getScale()*10)/10 + "");
|
||||
rotationField.setText(Math.round(selectedObject.getRotation()%360) + "");
|
||||
}
|
||||
|
||||
public void setPanel(Panel p)
|
||||
{
|
||||
if (selectedObject != null) {
|
||||
locationXField.setText(Math.round(selectedObject.getPosition()
|
||||
.getX()) + "");
|
||||
locationYField.setText(Math.round(selectedObject.getPosition()
|
||||
.getY()) + "");
|
||||
scaleField
|
||||
.setText((double) Math.round(selectedObject.getScale() * 10)
|
||||
/ 10 + "");
|
||||
rotationField
|
||||
.setText(Math.round(selectedObject.getRotation() % 360)
|
||||
+ "");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void setPanel(Panel p) {
|
||||
this.p = p;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,8 @@ import java.awt.BorderLayout;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JPanel;
|
||||
|
||||
import Listeners.Keyboard;
|
||||
|
||||
|
||||
public class Window extends JFrame {
|
||||
private static final long serialVersionUID = -1324363758675184283L;
|
||||
@@ -17,9 +19,11 @@ public class Window extends JFrame {
|
||||
|
||||
//CONTENT PANELS
|
||||
JPanel contentPanel = new JPanel(new BorderLayout());
|
||||
Panel fp = new Panel();
|
||||
PropertiesPanel pp = new PropertiesPanel();
|
||||
Panel fp = new Panel(pp);
|
||||
contentPanel.add(fp, BorderLayout.CENTER);
|
||||
|
||||
contentPanel.add(pp, BorderLayout.EAST);
|
||||
addKeyListener(new Keyboard(fp));
|
||||
setContentPane(contentPanel);
|
||||
//END CONTENT PANELS
|
||||
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
package Listeners;
|
||||
|
||||
import java.awt.event.KeyEvent;
|
||||
import java.awt.event.KeyListener;
|
||||
|
||||
import Applicatie.Panel;
|
||||
|
||||
public class Keyboard implements KeyListener {
|
||||
|
||||
private Panel panel;
|
||||
|
||||
public Keyboard(Panel panel) {
|
||||
this.panel = panel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void keyPressed(KeyEvent e) {
|
||||
if(e.getKeyCode() == e.VK_DELETE ) {
|
||||
if(panel.getSelectedObject() != null) {
|
||||
System.out.println("lala");
|
||||
panel.removeObject(panel.getSelectedObject());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void keyReleased(KeyEvent e) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void keyTyped(KeyEvent e) {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+50
-41
@@ -3,20 +3,20 @@ 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)
|
||||
{
|
||||
public Mouse(Panel panel) {
|
||||
this.panel = panel;
|
||||
selectedObject = null;
|
||||
}
|
||||
@@ -25,63 +25,72 @@ public class Mouse extends MouseAdapter {
|
||||
Point2D clickPoint = panel.getClickPoint(e.getPoint());
|
||||
panel.setLastClickPosition(clickPoint);
|
||||
panel.setLastMousePosition(e.getPoint());
|
||||
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()) {
|
||||
DrawObject tempDrawObj = panel.createNewDrawObject(i);
|
||||
tempDrawObj.setPosition(clickPoint);
|
||||
panel.setDragObject(tempDrawObj);
|
||||
break;
|
||||
}
|
||||
i++;
|
||||
last += image.getWidth();
|
||||
|
||||
if(e.getX() < 200)
|
||||
{
|
||||
if(e.getY() < 300)
|
||||
panel.setDragObject(new Podium(clickPoint));
|
||||
else
|
||||
panel.setDragObject(new Toilet(clickPoint));
|
||||
panel.add(panel.getDragObject());
|
||||
}
|
||||
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 (panel.getDragObject() != null) {
|
||||
panel.add(panel.getDragObject());
|
||||
}
|
||||
} 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) {
|
||||
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");
|
||||
}
|
||||
}
|
||||
if(selectedObject != null)
|
||||
if (selectedObject != null)
|
||||
selectedObject.setSelected(false);
|
||||
panel.setDragObject(o);
|
||||
o.setSelected(true);
|
||||
selectedObject = o;
|
||||
panel.setDragObject(o);
|
||||
panel.getPP().setSelected(o);
|
||||
panel.setSelectedObject(o);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(panel.getDragObject() == null && selectedObject != null) {
|
||||
System.out.println("deselected");
|
||||
if (panel.getDragObject() == null && selectedObject != null) {
|
||||
selectedObject.setSelected(false);
|
||||
selectedObject = null;
|
||||
}
|
||||
panel.repaint();
|
||||
panel.repaint();
|
||||
}
|
||||
|
||||
|
||||
public void mouseReleased(MouseEvent e) {
|
||||
panel.setDragObject(null);
|
||||
panel.setClickedOption("drag");
|
||||
panel.repaint();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -22,7 +22,7 @@ public class MouseMotion extends MouseMotionAdapter {
|
||||
case "drag":
|
||||
if(panel.getDragObject() != null)
|
||||
panel.getDragObject().setPosition(new Point2D.Double(
|
||||
(panel.getDragObject().getPosition().getX() ) - ((panel.getLastClickPosition().getX() - clickPoint.getX()) ),
|
||||
(panel.getDragObject().getPosition().getX() ) - ((panel.getLastClickPosition().getX() - clickPoint.getX()) ),
|
||||
(panel.getDragObject().getPosition().getY()) - (panel.getLastClickPosition().getY() - clickPoint.getY()) ));
|
||||
break;
|
||||
case "upperLeft":
|
||||
@@ -31,7 +31,7 @@ public class MouseMotion extends MouseMotionAdapter {
|
||||
}
|
||||
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()) {
|
||||
@@ -58,7 +58,7 @@ public class MouseMotion extends MouseMotionAdapter {
|
||||
}
|
||||
break;
|
||||
case "rotate":
|
||||
double tempval = panel.getDragObject().getRotation() + (panel.getLastClickPosition().getX() - clickPoint.getX());
|
||||
double tempval = panel.getDragObject().getRotation() - (panel.getLastClickPosition().getX() - clickPoint.getX());
|
||||
panel.getDragObject().setRotation(tempval);
|
||||
break;
|
||||
}
|
||||
@@ -72,6 +72,7 @@ public class MouseMotion extends MouseMotionAdapter {
|
||||
panel.repaint();
|
||||
panel.setLastMousePosition(e.getPoint());
|
||||
panel.setLastClickPosition(clickPoint);
|
||||
panel.getPP().update();
|
||||
}
|
||||
|
||||
private void resizeBigger() {
|
||||
|
||||
@@ -9,16 +9,39 @@ import Applicatie.Panel;
|
||||
|
||||
public class MouseWheel implements MouseWheelListener {
|
||||
private Panel panel;
|
||||
|
||||
public MouseWheel(Panel panel)
|
||||
{
|
||||
private int scrollfactor;
|
||||
|
||||
public MouseWheel(Panel panel) {
|
||||
this.panel = panel;
|
||||
scrollfactor = 20;
|
||||
}
|
||||
|
||||
public void mouseWheelMoved(MouseWheelEvent e) {
|
||||
// cameraPoint
|
||||
double cameraScale = panel.getCameraScale() * 1 - (e.getPreciseWheelRotation()/10);
|
||||
panel.setCameraScale((float) cameraScale);
|
||||
|
||||
public void mouseWheelMoved(MouseWheelEvent e) {
|
||||
if (e.getY() < 150) {
|
||||
|
||||
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 {
|
||||
// cameraPoint
|
||||
double cameraScale = panel.getCameraScale() * 1
|
||||
- (e.getPreciseWheelRotation() / 10);
|
||||
panel.setCameraScale((float) cameraScale);
|
||||
|
||||
}
|
||||
|
||||
panel.repaint();
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -7,7 +7,7 @@ import Applicatie.DrawObject;
|
||||
public class Toilet extends DrawObject {
|
||||
|
||||
public Toilet(Point2D position) {
|
||||
super("images/toilet.png", position);
|
||||
super("images/wc.png", position);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user