|
@@ -42,7 +42,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
@Override
|
|
@Override
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
model.getObjectsOnCanvas().remove(tempCps);
|
|
model.getObjectsOnCanvas().remove(tempCps);
|
|
- dropDelete = false;
|
|
|
|
repaint();
|
|
repaint();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -88,20 +87,21 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
// TODO Auto-generated method stub
|
|
// TODO Auto-generated method stub
|
|
x = e.getX();
|
|
x = e.getX();
|
|
y = e.getY();
|
|
y = e.getY();
|
|
- dropDelete = false;
|
|
|
|
|
|
+ tempCps = null;
|
|
for (CpsObject cps : model.getObjectsOnCanvas()) {
|
|
for (CpsObject cps : model.getObjectsOnCanvas()) {
|
|
int cx = cps.getPos().x;
|
|
int cx = cps.getPos().x;
|
|
int cy = cps.getPos().y;
|
|
int cy = cps.getPos().y;
|
|
if (x - img.getWidth(null) <= cx && y - img.getHeight(null) <= cy && x + img.getWidth(null) >= cx
|
|
if (x - img.getWidth(null) <= cx && y - img.getHeight(null) <= cy && x + img.getWidth(null) >= cx
|
|
&& y + img.getHeight(null) >= cy) {
|
|
&& y + img.getHeight(null) >= cy) {
|
|
tempCps = cps;
|
|
tempCps = cps;
|
|
- if (e.getButton() == e.BUTTON1) {
|
|
|
|
- dragging = true;
|
|
|
|
- } else {
|
|
|
|
- dropDelete = true;
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if (e.getButton() == e.BUTTON3 && tempCps != null) {
|
|
|
|
+ itemDelete.setEnabled(true);
|
|
|
|
+ }else {
|
|
|
|
+ itemDelete.setEnabled(false);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -116,7 +116,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
}
|
|
}
|
|
// Rechtsklick Liste
|
|
// Rechtsklick Liste
|
|
if (e.getButton() == e.BUTTON3) {
|
|
if (e.getButton() == e.BUTTON3) {
|
|
- if (dropDelete)itemDelete.setEnabled(true);
|
|
|
|
popmenu.show(e.getComponent(), e.getX(), e.getY());
|
|
popmenu.show(e.getComponent(), e.getX(), e.getY());
|
|
|
|
|
|
}
|
|
}
|
|
@@ -125,11 +124,14 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
@Override
|
|
@Override
|
|
public void mouseDragged(MouseEvent e) {
|
|
public void mouseDragged(MouseEvent e) {
|
|
// TODO Auto-generated method stub
|
|
// TODO Auto-generated method stub
|
|
- if (dragging) {
|
|
|
|
- tempCps.setPos(e.getX() - 15, e.getY() - 15);
|
|
|
|
- repaint();
|
|
|
|
- System.out.println("drag: " + e.getX() + " " + e.getY());
|
|
|
|
- }
|
|
|
|
|
|
+ try {
|
|
|
|
+ tempCps.setPos(e.getX() - 15, e.getY() - 15);
|
|
|
|
+ dragging = true;
|
|
|
|
+ repaint();
|
|
|
|
+ System.out.println("drag: " + e.getX() + " " + e.getY());
|
|
|
|
+ } catch (Exception e2) {
|
|
|
|
+ // TODO: handle exception
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|