|
@@ -395,16 +395,13 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
|
|
|
}
|
|
|
}
|
|
|
private void paintCanvasObject(Graphics2D g, DecoratedHolonObject decoratedHolonObject){
|
|
|
- //System.out.println(decoratedHolonObject.getModel().getImage());
|
|
|
Position pos = decoratedHolonObject.getModel().getPosition();
|
|
|
Color statecolor = getStateColor(decoratedHolonObject.getState());
|
|
|
g.setColor(statecolor);
|
|
|
- //System.out.println(statecolor);
|
|
|
g.fillRect(pos.x - controller.getScaleDiv2(), pos.y - controller.getScaleDiv2(), controller.getScale(), controller.getScale());
|
|
|
drawCanvasObject(g, decoratedHolonObject.getModel().getImage(), pos);
|
|
|
|
|
|
}
|
|
|
- //if(decoratedHolonObject.getState() != HolonObjectState.PRODUCER && decoratedHolonObject.getState() != HolonObjectState.NO_ENERGY)paintSupplyBar(g, decoratedHolonObject.get, statecolor, pos);
|
|
|
private void paintConsumer(Graphics2D g, Consumer con){
|
|
|
paintCanvasObject(g, con);
|
|
|
paintSupplyBar(g,con.getSupplyBarPercentage(), getStateColor(con.getState()), con.getModel().getPosition());
|