jess 7 years ago
parent
commit
09e8ca1473
2 changed files with 8 additions and 5 deletions
  1. 6 4
      src/classes/HolonBody.java
  2. 2 1
      src/ui/view/HolonCanvas.java

+ 6 - 4
src/classes/HolonBody.java

@@ -29,20 +29,22 @@ public class HolonBody implements Comparable<HolonBody> {
 		this.color = color;
 	}
 
-	
 	public void draw(Graphics2D g2) {
-		
+
 		g2.setColor(color);
 		g2.fillOval((int) (position.getX() - getRadius()), (int) (position.getY() - getRadius()),
 				(int) (2 * getRadius()), (int) (2 * getRadius()));
 		g2.setFont(new Font("TimesRoman", Font.PLAIN, (int) radius));
 		g2.setColor(Color.WHITE);
-		g2.drawString("" +id, position.getX()-radius/2+2, position.getY()+radius/2-2);
+		g2.drawString("" + id, position.getX() - radius / 2 + 2, position.getY() + radius / 2 - 2);
 
 	}
 
 	public void setRadius(float radius) {
-		this.radius = radius;
+		if (radius > 1)
+			this.radius = radius;
+		else
+			this.radius = 1;
 	}
 
 	public float getRadius() {

+ 2 - 1
src/ui/view/HolonCanvas.java

@@ -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,6 +157,7 @@ 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).draw(this.g2);
 		}
 	}