|
@@ -34,7 +34,6 @@ import classes.HolonObject;
|
|
import classes.HolonSwitch;
|
|
import classes.HolonSwitch;
|
|
import classes.SubNet;
|
|
import classes.SubNet;
|
|
import ui.controller.Control;
|
|
import ui.controller.Control;
|
|
-import ui.controller.NodeController.MODE;
|
|
|
|
import ui.model.Model;
|
|
import ui.model.Model;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -124,7 +123,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
itemCollapse.addActionListener(new ActionListener() {
|
|
itemCollapse.addActionListener(new ActionListener() {
|
|
@Override
|
|
@Override
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
- control.addUpperNode("NodeOfNode", MODE.CANVAS);
|
|
|
|
|
|
+ control.addUpperNode("NodeOfNode", null);
|
|
repaint();
|
|
repaint();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -404,9 +403,13 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage();
|
|
img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- g2.drawImage(img, cps.getPosition().x, cps.getPosition().y, controller.getScale(), controller.getScale(),
|
|
|
|
- null);
|
|
|
|
|
|
+ if (cps instanceof CpsUpperNode) {
|
|
|
|
+ g2.drawImage(img, cps.getPosition().x, cps.getPosition().y, (int)(controller.getScale()*1.5),
|
|
|
|
+ (int)(controller.getScale()*1.5), null);
|
|
|
|
+ } else {
|
|
|
|
+ g2.drawImage(img, cps.getPosition().x, cps.getPosition().y, controller.getScale(),
|
|
|
|
+ controller.getScale(), null);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
// Dragg Highlighting
|
|
// Dragg Highlighting
|