diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index a4ed59a..bda8f1f 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -45,6 +45,7 @@ public class StatusPanelAdder{ private static JLabel timeLabel = new JLabel("0"); private static Font emulogicheading; private static Font emulogictext; + private static Font emulogictextsmall; private static Font ttfBase; private static FontLoader fl=new FontLoader(); private static Color tempBarColor= new Color(0,0,255); @@ -124,6 +125,10 @@ public class StatusPanelAdder{ tempPlus=-1; } } + if (tempBar.getValue()<=30 && modifier==-1) { + } else { + tempBar.setValue(tempBar.getValue()+temping); + } /* * Änderung der Farbe der TempBar */ @@ -133,22 +138,6 @@ public class StatusPanelAdder{ tempBar.setForeground(tempBarColor); - - /* - * Logging von Temp - */ - - if (temping!=0){ - Logger.write("Temperatur: " + tempBar.getValue()); - } - if (tempBar.getValue()<=30 && modifier==-1) { - } else { - tempBar.setValue(tempBar.getValue()+temping); - } - if (tempBar.getValue()==110&&(ende=false)){ - Logger.write("EEENNNDDEEEE"); - ende = true; - } } @@ -163,6 +152,7 @@ public class StatusPanelAdder{ ttfBase=FontLoader.getFont(); emulogicheading = ttfBase.deriveFont(Font.PLAIN, 16); emulogictext= ttfBase.deriveFont(Font.PLAIN, 12); + emulogictextsmall=ttfBase.deriveFont(Font.PLAIN, 10); JPanel tempPanel=new JPanel(); labelTemp.setFont(emulogicheading); @@ -195,7 +185,7 @@ public class StatusPanelAdder{ labelPowerUp.setFont(emulogicheading); labelPowerUp.setForeground(Color.YELLOW); labelPowerUp.setHorizontalAlignment(SwingConstants.CENTER); - powerUpLabel.setFont(emulogictext); + powerUpLabel.setFont(emulogictextsmall); powerUpLabel.setForeground(Color.YELLOW); powerUpLabel.setHorizontalAlignment(SwingConstants.CENTER); powerUpPanel.setLayout(new BorderLayout(0,vgap));