diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java index cd5af16..e8f1384 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/app/TimeCalcManager.java @@ -359,7 +359,7 @@ public class TimeCalcManager { // } ); window.setSize(520 + 20 + 100, exitButton.getY() + 3 * exitButton.getHeight() + MARGIN); while (true) { - time.writeString(); + //time.writeString(); if(Math.random() > 0.95) { window.requestFocus(); } diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/AnalogClock.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/AnalogClock.java index 2366036..4a0e9e0 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/AnalogClock.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/progress/AnalogClock.java @@ -21,6 +21,8 @@ import java.util.GregorianCalendar; //https://kodejava.org/how-do-i-write-a-simple-analog-clock-using-java-2d/ public class AnalogClock extends Widget { + public static final Color COLOR_FOR_MILLISECOND_HAND_STRONGLY_COLORED = new Color(246, + 152, 51); private TimeHM startTime; private TimeHM endTime; private int startAngle; @@ -86,6 +88,7 @@ public class AnalogClock extends Widget { int centerY = getHeight() / 2; GregorianCalendar time = new GregorianCalendar(); + int millisecond = time.get(Calendar.MILLISECOND); int second = time.get(Calendar.SECOND); int minute = time.get(Calendar.MINUTE); int hour = time.get(Calendar.HOUR_OF_DAY); @@ -107,6 +110,17 @@ public class AnalogClock extends Widget { // Draw clock numbers and circle drawClockFace(g2d, centerX, centerY, side / 2 - 40, visibility); + System.out.println("millisecond=" + millisecond); + // + drawHand(g2d, side / 2 - 10, millisecond / 1000.0, 1.0f, + COLOR_FOR_MILLISECOND_HAND_STRONGLY_COLORED, visibility); + + if (TimeCalcConf.getInstance().areClockHandsLong()) { + drawHand(g2d, (side / 2 - 10) / 4, + (millisecond > 500 ? millisecond - 500 : millisecond + 500) / 1000.0, 1.0f, + COLOR_FOR_MILLISECOND_HAND_STRONGLY_COLORED, visibility); + } + // drawHand(g2d, side / 2 - 10, second / 60.0, 0.5f, Color.RED, visibility); if (TimeCalcConf.getInstance().areClockHandsLong()) { diff --git a/timecalc.conf b/timecalc.conf index fbd79c4..e88d611 100644 --- a/timecalc.conf +++ b/timecalc.conf @@ -1,6 +1,9 @@ -clock.colorful=false clock.hands.long=true +clock.hands.second.enabled=true +clock.hands.millisecond.enabled=false jokes.visible=true battery.waves.enabled=true -everything-hidden=false -default-visibility=STRONGLY_COLORED \ No newline at end of file +default-visibility=STRONGLY_COLORED +visibility.only-grey-or-none.enabled=false +jokes.enabled=true +commands.enabled=true \ No newline at end of file