Browse Source

edit showed information

dominik.rieder 8 years ago
parent
commit
2f952f8c18
1 changed files with 8 additions and 3 deletions
  1. 8 3
      src/ui/view/MyCanvas.java

+ 8 - 3
src/ui/view/MyCanvas.java

@@ -85,7 +85,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		this.model = mod;
 		
 		showedInformation[0] = true;
-		showedInformation[1] = false;
+		showedInformation[1] = true;
 		edgeCapacity = 10000;
 
 		popmenu.add(itemCut);
@@ -278,7 +278,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 						g2.setColor(Color.GREEN);
 					}
 					if (((HolonObject) cps).getState() == 1) {
-						g2.setColor(Color.ORANGE);
+						g2.setColor(new Color(230,120,100));
 					}
 					if (((HolonObject) cps).getState() == 0) {
 						g2.setColor(Color.WHITE);
@@ -288,6 +288,12 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 							cps.getPosition().y - (controller.getScale() / 20),
 							controller.getScale() + ((controller.getScale() / 20) * 2),
 							controller.getScale() + ((controller.getScale() / 20) * 2));
+					
+					if(showedInformation[1]){
+						g2.setColor(Color.BLACK);
+						float totalEnergy = ((HolonObject) cps).getCurrentEnergyAtTimeStep(model.getCurIteration());
+						g2.drawString(Float.toString(totalEnergy), cps.getPosition().x, cps.getPosition().y - 10);
+					}
 				}
 				File checkPath = new File(cps.getImage());
 				if (checkPath.exists()) {
@@ -457,7 +463,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 
 				tempCps.setPosition(x, y); // Drag Position
 				selectRect.setLocation(x - (controller.getScale() / 20), y - (controller.getScale() / 20)); // Highlighting-Position
-
 				// TipText Position and name
 				objectTT.setTipText(tempCps.getName() + ", " + tempCps.getID());
 				objectTT.setLocation(x, y + controller.getScale());