Jessey Widhalm 7 years ago
parent
commit
64c9db38b2
2 changed files with 9 additions and 4 deletions
  1. 4 0
      src/classes/HolonBody.java
  2. 5 4
      src/ui/view/HolonCanvas.java

+ 4 - 0
src/classes/HolonBody.java

@@ -16,6 +16,10 @@ public class HolonBody implements Comparable<HolonBody> {
 	public void setId(int id) {
 		this.id = id;
 	}
+	
+	public int getId(){
+		return id;
+	}
 
 	public Color getColor() {
 		return color;

+ 5 - 4
src/ui/view/HolonCanvas.java

@@ -65,7 +65,7 @@ public class HolonCanvas extends JPanel implements MouseWheelListener {
 
 	public void paintComponent(Graphics g) {
 		super.paintComponent(g);
-		
+
 		// add new colors if necessary
 		for (int i = 0; i < controller.getSimManager().getSubNets().size(); i++) {
 			if (model.getSubNetColors().size() - 1 < i) {
@@ -111,7 +111,7 @@ public class HolonCanvas extends JPanel implements MouseWheelListener {
 
 	// updates the bodies according to the changes of subnets
 	private void addNewBodies(int subCount) {
-	
+
 		ArrayList<HolonBody> newBodies = new ArrayList<>();
 		for (int i = 0; i < subCount; i++) {
 			for (int j = 0; j < bodies.size(); j++) {
@@ -157,7 +157,8 @@ public class HolonCanvas extends JPanel implements MouseWheelListener {
 
 		// Render Game Objects
 		for (int i = 0; i < subCount; i++) {
-			bodies.get(i).setRadius(bodies.get(i).getRadius()*controller.getHolonBodyScale()/100);
+			bodies.get(i).setRadius((subnets.get(bodies.get(i).getId()).getObjects().size() * 5 + 10)
+					* controller.getHolonBodyScale() / 100);
 			bodies.get(i).draw(this.g2);
 		}
 	}
@@ -230,7 +231,7 @@ public class HolonCanvas extends JPanel implements MouseWheelListener {
 
 	@Override
 	public void mouseWheelMoved(MouseWheelEvent e) {
-		controller.setHolonBodyScale(model.getHolonBodyScale()+(-e.getScrollAmount()*e.getWheelRotation()));
+		controller.setHolonBodyScale(model.getHolonBodyScale() + (-e.getScrollAmount() * e.getWheelRotation()));
 	}
 
 }