|
@@ -29,6 +29,7 @@ import java.awt.List;
|
|
|
|
|
|
import javax.swing.JComboBox;
|
|
import javax.swing.JComboBox;
|
|
import javax.swing.JMenuBar;
|
|
import javax.swing.JMenuBar;
|
|
|
|
+import java.awt.Label;
|
|
|
|
|
|
public class HolonCanvas extends JPanel implements MouseWheelListener, MouseListener {
|
|
public class HolonCanvas extends JPanel implements MouseWheelListener, MouseListener {
|
|
|
|
|
|
@@ -60,6 +61,7 @@ public class HolonCanvas extends JPanel implements MouseWheelListener, MouseList
|
|
private int maxX;
|
|
private int maxX;
|
|
private int maxY;
|
|
private int maxY;
|
|
private JComboBox<String> combo = new JComboBox<>();
|
|
private JComboBox<String> combo = new JComboBox<>();
|
|
|
|
+ private Label lblBodyInfo = new Label();
|
|
private int comboChoice = 0;
|
|
private int comboChoice = 0;
|
|
private String info;
|
|
private String info;
|
|
private int bodyNr;
|
|
private int bodyNr;
|
|
@@ -68,6 +70,9 @@ public class HolonCanvas extends JPanel implements MouseWheelListener, MouseList
|
|
// Wire up Events
|
|
// Wire up Events
|
|
this.controller = control;
|
|
this.controller = control;
|
|
this.model = mod;
|
|
this.model = mod;
|
|
|
|
+ lblBodyInfo.setForeground(Color.BLACK);
|
|
|
|
+ lblBodyInfo.setText("Holon Info:");
|
|
|
|
+ add(lblBodyInfo);
|
|
this.add(combo);
|
|
this.add(combo);
|
|
subnets = controller.getSimManager().getSubNets();
|
|
subnets = controller.getSimManager().getSubNets();
|
|
subCount = subnets.size();
|
|
subCount = subnets.size();
|
|
@@ -108,7 +113,6 @@ public class HolonCanvas extends JPanel implements MouseWheelListener, MouseList
|
|
maxX = center.width;
|
|
maxX = center.width;
|
|
maxY = center.height;
|
|
maxY = center.height;
|
|
addNewBodies(subCount);
|
|
addNewBodies(subCount);
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
currentTime = System.currentTimeMillis();
|
|
currentTime = System.currentTimeMillis();
|
|
@@ -160,7 +164,7 @@ public class HolonCanvas extends JPanel implements MouseWheelListener, MouseList
|
|
bodies = newBodies;
|
|
bodies = newBodies;
|
|
for (int i = bodies.size(); i < subCount; i++) {
|
|
for (int i = bodies.size(); i < subCount; i++) {
|
|
float radius = (subnets.get(i).getObjects().size() * 5 + 10) * controller.getHolonBodyScale() / 100;
|
|
float radius = (subnets.get(i).getObjects().size() * 5 + 10) * controller.getHolonBodyScale() / 100;
|
|
- HolonBody temp = new HolonBody(maxX+1, maxY+1, radius,
|
|
|
|
|
|
+ HolonBody temp = new HolonBody(maxX + 1, maxY + 1, radius,
|
|
(float) Math.pow((subnets.get(i).getObjects().size() + 1) * 5, 3), model.getSubNetColors().get(i));
|
|
(float) Math.pow((subnets.get(i).getObjects().size() + 1) * 5, 3), model.getSubNetColors().get(i));
|
|
temp.setId(i);
|
|
temp.setId(i);
|
|
bodies.add(temp);
|
|
bodies.add(temp);
|
|
@@ -302,7 +306,7 @@ public class HolonCanvas extends JPanel implements MouseWheelListener, MouseList
|
|
float cr = bodies.get(i).getRadius();
|
|
float cr = bodies.get(i).getRadius();
|
|
if (e.getX() - cr <= cx && e.getY() - cr <= cy && e.getX() + cr >= cx && e.getY() + cr >= cy) {
|
|
if (e.getX() - cr <= cx && e.getY() - cr <= cy && e.getX() + cr >= cx && e.getY() + cr >= cy) {
|
|
controller.addSelectedHolonBody(bodies.get(i).getId());
|
|
controller.addSelectedHolonBody(bodies.get(i).getId());
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
controller.addSelectedHolonBody(-1);
|
|
controller.addSelectedHolonBody(-1);
|
|
}
|
|
}
|
|
}
|
|
}
|