robertvokac/time-calc
1
0
Fork 0
mirror of https://github.com/robertvokac/time-calc.git synced 2025-03-25 07:27:49 +01:00
Code Issues Projects Releases Activity

New improvements

Browse Source
This commit is contained in:
Robert Vokac 2024-02-03 22:31:23 +00:00
parent 4da4b8e340
commit 95e24fa66e
No known key found for this signature in database
GPG Key ID: 693D30BEE3329055
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/rvc/timecalc/TimeCalcWindow.java
View File

@ -418,8 +418,8 @@ public class TimeCalcWindow {
if(millisecondsRemainsD > 0) { if(millisecondsRemainsD > 0) {
minutesRemainsD = minutesRemainsD - 1d/1000d; minutesRemainsD = minutesRemainsD - 1d/1000d;
} }
batteryForHour.setDonePercent(1 - ((minutesRemainsD%60d)/60d)); batteryForHour.setDonePercent(done >= 1 ? 1 :(1 - ((minutesRemainsD%60d)/60d)));
if(done < 1 && !nowIsWeekend) { if(!nowIsWeekend) {
int hoursForLabel = (minuteRemains == 0 ? minuteRemains / 60 + 1 : minuteRemains/ 60); int hoursForLabel = (minuteRemains == 0 ? minuteRemains / 60 + 1 : minuteRemains/ 60);
batteryForHour.setLabel( ((totalMinutes / 60) - hoursForLabel) + "/" + (totalMinutes / 60)); batteryForHour.setLabel( ((totalMinutes / 60) - hoursForLabel) + "/" + (totalMinutes / 60));
} }
@ -548,11 +548,11 @@ public class TimeCalcWindow {
sb.append("\n" + msg + "\n\n"); sb.append("\n" + msg + "\n\n");
int spacesTotal = 52; int spacesTotal = 48;
int spacesDone = (int) (percent * spacesTotal); int spacesDone = (int) (percent * spacesTotal);
int spacesTodo = spacesTotal - (spacesDone < 0 ? 0 : spacesDone); int spacesTodo = spacesTotal - (spacesDone < 0 ? 0 : spacesDone);
sb.append("||" + createSpaces(58 - 2) + (spacesTodo == 0 ? sb.append("||" + createSpaces(spacesTotal + 6 - 2) + (spacesTodo == 0 ?
" \n" : "||======||\n")); " \n" : "||======||\n"));
sb.append("||").append(createSpaces(spacesTotal + 4)) sb.append("||").append(createSpaces(spacesTotal + 4))
.append(spacesTodo == 0 ? "" : "| |").append("\n"); .append(spacesTodo == 0 ? "" : "| |").append("\n");
@ -571,9 +571,9 @@ public class TimeCalcWindow {
spacesTodo) + /*WALL +*/ (spacesTodo == 0 ? spacesTodo) + /*WALL +*/ (spacesTodo == 0 ?
" /☼☼☼☼\\ " : " /☼☼☼☼\\ " :
"| |") + /*WALL +*/ NEW_LINE + "| |") + /*WALL +*/ NEW_LINE +
"====================================================================" "================================================================"
+ NEW_LINE + "Steps: " + formatter3 + NEW_LINE + "Steps: " + formatter3
.format(percent * ((double) 52)) + "/" + spacesTotal .format(percent * ((double) spacesTotal)) + "/" + spacesTotal
); );
} }

3
src/main/java/rvc/timecalc/Widget.java
View File

@ -51,6 +51,9 @@ public class Widget extends JPanel {
return 100; return 100;
} }
public final void setDonePercent(double donePercent) { public final void setDonePercent(double donePercent) {
if(donePercent > 1) {
donePercent = 1;
}
this.donePercent = donePercent; this.donePercent = donePercent;
} }