gered/Llanfair
Archived
1
0
Fork 0
Code Issues 9 Pull requests Packages Projects Releases 5 Wiki Activity

add sum of best display and setting to toggle on/off. resolves #16

Browse source
This commit is contained in:
Gered 2017-01-28 13:54:09 -05:00
parent 5e774934a4
commit 51edfed385
6 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/fenix/llanfair/Language.java
View file

@ -106,6 +106,7 @@ public enum Language {
setting_footer_bestTime,
setting_footer_multiline,
setting_footer_deltaLabels,
setting_footer_sumOfBest,
// Accuracy
accuracy_seconds,
@ -190,6 +191,7 @@ public enum Language {
LB_FT_LIVE,
LB_FT_SEGMENT,
LB_FT_SPLIT,
LB_FT_SUM_OF_BEST,
/*
* Messages.

17
src/main/java/org/fenix/llanfair/Run.java
View file

@ -503,6 +503,23 @@ public class Run implements TableModel, Serializable {
// ------------------------------------------------------ INHERITED GETTERS
public Time getSumOfBest() {
long sum = 0;
for (int i = 0; i < segments.size(); ++i) {
Segment segment = segments.get(i);
Time best = segment.getTime(Segment.BEST);
Time live = segment.getTime(Segment.LIVE);
if (best != null || live != null) {
long bestMs = (best == null ? Long.MAX_VALUE : best.getMilliseconds());
long liveMs = (live == null ? Long.MAX_VALUE : live.getMilliseconds());
sum += Math.min(bestMs, liveMs);
}
}
return new Time(sum);
}
/**
* As specified by {@code TableModel}.
*/

2
src/main/java/org/fenix/llanfair/config/Settings.java
View file

@ -121,6 +121,7 @@ public class Settings {
public static final Property<Boolean> footerShowBestTime = new Property<>( "footer.bestTime" );
public static final Property<Boolean> footerMultiline = new Property<>( "footer.multiline" );
public static final Property<Boolean> footerShowDeltaLabels = new Property<>( "footer.deltaLabels" );
public static final Property<Boolean> footerShowSumOfBest = new Property<>( "footer.sumOfBest" );
private static Configuration global = null;
private static Run run = null;
@ -288,6 +289,7 @@ public class Settings {
setDefault( footerShowBestTime.key, true, force );
setDefault( footerMultiline.key, true, force );
setDefault( footerShowDeltaLabels.key, true, force );
setDefault( footerShowSumOfBest.key, false, force );
}
/**

2
src/main/java/org/fenix/llanfair/dialog/TabComponents.java
View file

@ -30,6 +30,7 @@ public class TabComponents extends SettingsTab
SCB_SETTINGS.add(Settings.footerShowBestTime);
SCB_SETTINGS.add(Settings.footerMultiline);
SCB_SETTINGS.add(Settings.footerVerbose);
SCB_SETTINGS.add(Settings.footerShowSumOfBest);
SCB_SETTINGS.add(Settings.coreShowSegmentName);
SCB_SETTINGS.add(Settings.coreShowSplitTime);
SCB_SETTINGS.add(Settings.coreShowSegmentTime);
@ -430,6 +431,7 @@ public class TabComponents extends SettingsTab
footerPanel.add(checkBoxes.get(Settings.footerShowDeltaLabels.getKey()), GBC.grid(1, 0).anchor(GBC.LINE_START));
footerPanel.add(checkBoxes.get(Settings.footerShowBestTime.getKey()), GBC.grid(1, 1).anchor(GBC.LINE_START));
footerPanel.add(checkBoxes.get(Settings.footerMultiline.getKey()), GBC.grid(1, 2).anchor(GBC.LINE_START));
footerPanel.add(checkBoxes.get(Settings.footerShowSumOfBest.getKey()), GBC.grid(0, 3).anchor(GBC.LINE_START));
footerPanel.setBorder(
BorderFactory.createTitledBorder("" + Language.FOOTER)
);

42
src/main/java/org/fenix/llanfair/gui/Footer.java
View file

@ -56,6 +56,9 @@ class Footer extends JPanel {
private JPanel panelBest; // labelBest + best
private JPanel panelDeltaBest; // labelDeltaBest + deltaBest
private JLabel labelSumOfBest;
private JLabel sumOfBest;
private boolean resize;
private Dimension preferredSize;
@ -73,12 +76,14 @@ class Footer extends JPanel {
deltaBest = new JLabel();
inlineBest = new JLabel();
inlineDeltaBest = new JLabel();
sumOfBest = new JLabel();
labelLive = new JLabel();
labelPrev = new JLabel();
labelBest = new JLabel();
labelDelta = new JLabel();
labelDeltaBest = new JLabel();
labelSumOfBest = new JLabel();
preferredSize = null;
resize = false;
@ -124,6 +129,7 @@ class Footer extends JPanel {
boolean ftLabels = Settings.footerShowDeltaLabels.get();
boolean ftVerbose = Settings.footerVerbose.get();
boolean ftTwoLines = Settings.footerMultiline.get();
boolean ftSumOfBest = Settings.footerShowSumOfBest.get();
int height = Math.max(timeH, labelH);
int width = prevW + timeW + smtmW + INSET * 2;
@ -146,6 +152,9 @@ class Footer extends JPanel {
width += 5;
}
}
if (ftSumOfBest) {
height += labelH;
}
preferredSize = new Dimension(width, height);
setMinimumSize(new Dimension(50, height));
resize = false;
@ -224,7 +233,13 @@ class Footer extends JPanel {
} else if (Settings.coreOtherTimeFont.equals(property)) {
updateFonts(TIME | DELTA);
forceResize();
} else if (Settings.windowUserResizable.equals(property) || Settings.windowWidth.equals(property)) {
} else if (Settings.windowUserResizable.equals(property)
|| Settings.windowWidth.equals(property)) {
updateSize();
forceResize();
} else if (Settings.footerShowSumOfBest.equals(property)) {
updateVisibility(BEST | TEXT);
updateValues(TIME | TEXT);
updateSize();
forceResize();
}
@ -301,10 +316,23 @@ class Footer extends JPanel {
panelDeltaBest.add(deltaBest, GBC.grid(1, 0).anchor(GBC.LINE_END));
panelDeltaBest.setOpaque(false);
}
JPanel panelSumOfBest = new JPanel(new GridBagLayout());
{
panelSumOfBest.add(
labelSumOfBest,
GBC.grid(0, 0).anchor(GBC.LINE_START).insets(0, 0, 0, INSET)
);
panelSumOfBest.add(
sumOfBest,
GBC.grid(1, 0).anchor(GBC.LINE_END).insets(0, 0, 0, INSET)
);
panelSumOfBest.setOpaque(false);
}
add(timePanel, GBC.grid(0, 0).anchor(GBC.LINE_START).weight(0.5, 0.0));
add(deltaPanel, GBC.grid(1, 0).anchor(GBC.LINE_END).weight(0.5, 0.0));
add(panelBest, GBC.grid(0, 1).anchor(GBC.LINE_START).weight(0.5, 0.0));
add(panelDeltaBest, GBC.grid(1, 1).anchor(GBC.LINE_END).weight(0.5, 0.0));
add(panelSumOfBest, GBC.grid(0, 2).anchor(GBC.LINE_START).weight(0.5, 0.0));
}
private void updateVisibility(int identifier) {
@ -315,6 +343,7 @@ class Footer extends JPanel {
panelDeltaBest.setVisible(ftTwoLines);
inlineBest.setVisible(!ftTwoLines && ftBest);
inlineDeltaBest.setVisible(!ftTwoLines && ftBest);
sumOfBest.setVisible(Settings.footerShowSumOfBest.get());
}
if ((identifier & TEXT) == TEXT) {
boolean ftLabels = Settings.footerShowDeltaLabels.get();
@ -322,6 +351,7 @@ class Footer extends JPanel {
labelLive.setVisible(ftLabels && ftVerbose);
labelDelta.setVisible(ftLabels && !ftVerbose);
labelDeltaBest.setVisible(ftLabels);
labelSumOfBest.setVisible(Settings.footerShowSumOfBest.get());
}
if ((identifier & VERBOSE) == VERBOSE) {
boolean ftVerbose = Settings.footerVerbose.get();
@ -354,6 +384,7 @@ class Footer extends JPanel {
time.setForeground(colorTM);
best.setForeground(colorTM);
inlineBest.setForeground(colorTM);
sumOfBest.setForeground(colorTM);
}
if ((identifier & DELTA) == DELTA) {
if (run.hasPreviousSegment()) {
@ -384,6 +415,7 @@ class Footer extends JPanel {
labelLive.setForeground(color);
labelBest.setForeground(color);
labelDeltaBest.setForeground(color);
labelSumOfBest.setForeground(color);
}
}
@ -399,6 +431,7 @@ class Footer extends JPanel {
time.setFont(Settings.coreOtherTimeFont.get());
best.setFont(Settings.coreOtherTimeFont.get());
inlineBest.setFont(Settings.coreOtherTimeFont.get());
sumOfBest.setFont(Settings.coreOtherTimeFont.get());
}
if ((identifier & DELTA) == DELTA) {
delta.setFont(Settings.coreOtherTimeFont.get());
@ -411,6 +444,7 @@ class Footer extends JPanel {
labelLive.setFont(Settings.coreFont.get());
labelBest.setFont(Settings.coreFont.get());
labelDeltaBest.setFont(Settings.coreFont.get());
labelSumOfBest.setFont(Settings.coreFont.get());
}
}
@ -453,6 +487,11 @@ class Footer extends JPanel {
best.setText("");
inlineBest.setText("");
}
Time sumOfBestTime = run.getSumOfBest();
if (sumOfBestTime.getMilliseconds() > 0)
sumOfBest.setText(sumOfBestTime.toString());
else
sumOfBest.setText("");
}
if ((identifier & DELTA) == DELTA) {
if (hasPrevious) {
@ -522,6 +561,7 @@ class Footer extends JPanel {
labelBest.setText("" + Language.LB_FT_BEST);
labelDelta.setText("" + Language.LB_FT_DELTA);
labelDeltaBest.setText("" + Language.LB_FT_DELTA_BEST);
labelSumOfBest.setText("" + Language.LB_FT_SUM_OF_BEST);
}
}

2
src/main/resources/language.properties
View file

@ -87,6 +87,7 @@ setting_footer_verbose = Show More Info
setting_footer_bestTime = Best Time
setting_footer_multiline = Display on Two Lines
setting_footer_deltaLabels = Delta Labels
setting_footer_sumOfBest = Sum of Best
# Accuracy
accuracy_seconds = Seconds
@ -171,6 +172,7 @@ LB_FT_DELTA_BEST = vs Best:
LB_FT_LIVE = Live:
LB_FT_SEGMENT = Prev. Segment:
LB_FT_SPLIT = Prev. Split:
LB_FT_SUM_OF_BEST = Sum of Best:
# Messages
ICON_TOO_BIG =