|
@@ -1,7 +1,10 @@
|
|
package ui.view;
|
|
package ui.view;
|
|
|
|
|
|
|
|
+import java.awt.Color;
|
|
import java.awt.Graphics;
|
|
import java.awt.Graphics;
|
|
import java.awt.Image;
|
|
import java.awt.Image;
|
|
|
|
+import java.awt.Paint;
|
|
|
|
+import java.awt.Rectangle;
|
|
import java.awt.event.ActionEvent;
|
|
import java.awt.event.ActionEvent;
|
|
import java.awt.event.ActionListener;
|
|
import java.awt.event.ActionListener;
|
|
import java.awt.event.MouseEvent;
|
|
import java.awt.event.MouseEvent;
|
|
@@ -29,6 +32,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
boolean dragging = false;
|
|
boolean dragging = false;
|
|
boolean dropDelete = false;
|
|
boolean dropDelete = false;
|
|
CpsObject tempCps = null;
|
|
CpsObject tempCps = null;
|
|
|
|
+ Rectangle selectRect = new Rectangle();
|
|
|
|
|
|
// PopUpMenu
|
|
// PopUpMenu
|
|
JPopupMenu popmenu = new JPopupMenu();
|
|
JPopupMenu popmenu = new JPopupMenu();
|
|
@@ -56,10 +60,12 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
public void paintComponent(Graphics g) {
|
|
public void paintComponent(Graphics g) {
|
|
// Draws the image to the canvas
|
|
// Draws the image to the canvas
|
|
super.paintComponent(g);
|
|
super.paintComponent(g);
|
|
|
|
+ if(selectRect != null){
|
|
|
|
+ g.setColor(new Color(220, 220, 220));
|
|
|
|
+ g.fillRect((int)selectRect.getX(), (int)selectRect.getY(), (int)selectRect.getWidth(), (int)selectRect.getHeight());
|
|
|
|
+ }
|
|
|
|
|
|
for (CpsObject cps : model.getObjectsOnCanvas()) {
|
|
for (CpsObject cps : model.getObjectsOnCanvas()) {
|
|
-
|
|
|
|
- // System.out.println(cps.getImage());
|
|
|
|
g.drawImage(img, cps.getPos().x, cps.getPos().y, null);
|
|
g.drawImage(img, cps.getPos().x, cps.getPos().y, null);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -67,7 +73,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
@Override
|
|
@Override
|
|
public void mouseClicked(MouseEvent e) {
|
|
public void mouseClicked(MouseEvent e) {
|
|
// TODO Auto-generated method stub
|
|
// TODO Auto-generated method stub
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -96,12 +101,19 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
tempCps = cps;
|
|
tempCps = cps;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if(tempCps != null){
|
|
|
|
+ selectRect.setBounds(tempCps.getPos().x-1, tempCps.getPos().y-1, 32, 32);
|
|
|
|
+ System.out.println("Select");
|
|
|
|
+ }else {
|
|
|
|
+ selectRect.setRect(0, 0, 0, 0);;
|
|
|
|
+ System.out.println("Unselect");
|
|
|
|
+ }
|
|
if (e.getButton() == e.BUTTON3 && tempCps != null) {
|
|
if (e.getButton() == e.BUTTON3 && tempCps != null) {
|
|
itemDelete.setEnabled(true);
|
|
itemDelete.setEnabled(true);
|
|
}else {
|
|
}else {
|
|
itemDelete.setEnabled(false);
|
|
itemDelete.setEnabled(false);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ repaint();
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -127,6 +139,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
try {
|
|
try {
|
|
tempCps.setPos(e.getX() - 15, e.getY() - 15);
|
|
tempCps.setPos(e.getX() - 15, e.getY() - 15);
|
|
dragging = true;
|
|
dragging = true;
|
|
|
|
+ selectRect.setLocation(tempCps.getPos().x-1, tempCps.getPos().y-1);
|
|
repaint();
|
|
repaint();
|
|
System.out.println("drag: " + e.getX() + " " + e.getY());
|
|
System.out.println("drag: " + e.getX() + " " + e.getY());
|
|
} catch (Exception e2) {
|
|
} catch (Exception e2) {
|