Supermaniac101 10 жил өмнө
parent
commit
286ad94e48

+ 13 - 2
src/gui/simulator/Topbar.java

@@ -32,6 +32,7 @@ public class Topbar implements MouseListener {
 		this.simulator = simulator;
 		this.simulator = simulator;
 	}
 	}
 	
 	
+	
 	public void draw(Graphics2D g2, int screenwidth){
 	public void draw(Graphics2D g2, int screenwidth){
 		screenwidth += 100;
 		screenwidth += 100;
 		if(oldwidth != screenwidth){
 		if(oldwidth != screenwidth){
@@ -61,7 +62,7 @@ public class Topbar implements MouseListener {
 		g2.drawImage(Images.getImage(Images.ImageType.TopbarFasterButton), screenwidth/4 + 130, 7, null );
 		g2.drawImage(Images.getImage(Images.ImageType.TopbarFasterButton), screenwidth/4 + 130, 7, null );
 		
 		
         g2.setFont(new Font("Sans-serif", Font.BOLD, 22));
         g2.setFont(new Font("Sans-serif", Font.BOLD, 22));
-		g2.drawString(time.get(Calendar.HOUR_OF_DAY) + ":" + time.get(Calendar.MINUTE), screenwidth/2-10 , 28);		
+		g2.drawString(time.get(Calendar.HOUR_OF_DAY) + ":" + getMins(), screenwidth/2-10 , 28);		
 
 
 		g2.drawImage(Images.getImage(Images.ImageType.TopbarGridButton), screenwidth/4*3 -60, 7, null );
 		g2.drawImage(Images.getImage(Images.ImageType.TopbarGridButton), screenwidth/4*3 -60, 7, null );
 		
 		
@@ -75,6 +76,16 @@ public class Topbar implements MouseListener {
 	public Rectangle[] getButtons(){
 	public Rectangle[] getButtons(){
 		return buttons;
 		return buttons;
 	}
 	}
+	
+	public String getMins(){
+		String minutesString = ""+time.get(Calendar.MINUTE);
+		
+        if(Integer.parseInt(minutesString) < 10){
+        	minutesString = "0" + time.get(Calendar.MINUTE);
+        }
+        return minutesString;
+	}
+
 
 
 	@Override
 	@Override
 	public void mouseClicked(MouseEvent e) {
 	public void mouseClicked(MouseEvent e) {
@@ -130,4 +141,4 @@ public class Topbar implements MouseListener {
 	public void recalculate(){
 	public void recalculate(){
 		time.setTimeInMillis(time.getTimeInMillis()+10000);
 		time.setTimeInMillis(time.getTimeInMillis()+10000);
 	}
 	}
-}
+}

+ 3 - 2
src/gui/simulator/WalkingPath.java

@@ -1,6 +1,7 @@
 package gui.simulator;
 package gui.simulator;
 
 
 import gui.simulator.Images.ImageType;
 import gui.simulator.Images.ImageType;
+import gui.simulator.facilities.Stage;
 
 
 import java.awt.BasicStroke;
 import java.awt.BasicStroke;
 import java.awt.Graphics2D;
 import java.awt.Graphics2D;
@@ -50,8 +51,8 @@ public class WalkingPath implements Serializable {
 	}
 	}
 	public void reCalculate(){
 	public void reCalculate(){
 		if(object1 != null && object2 != null){
 		if(object1 != null && object2 != null){
-			path.get(0).setLocation(new Point((int)object1.getCenter().getX(), (int)object1.getCenter().getY()));
-			path.get(path.size()-1).setLocation(new Point((int)object2.getCenter().getX(), (int)object2.getCenter().getY()));
+					path.get(0).setLocation(new Point((int)object1.getCenter().getX(), (int)object1.getCenter().getY()));
+					path.get(path.size()-1).setLocation(new Point((int)object2.getCenter().getX(), (int)object2.getCenter().getY()));
 		}
 		}
 	}
 	}
 	public void paint(Graphics2D g2){
 	public void paint(Graphics2D g2){