robertvokac/time-calc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Added several improvements, changes and bug fixes

Browse Source
This commit is contained in:
Robert Vokac 2024-03-10 19:34:29 +00:00
parent 3b9b6ef07a
commit 62048feb23
No known key found for this signature in database
GPG Key ID: 693D30BEE3329055
4 changed files with 65 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/ArrivalChart.java
View File

@ -35,10 +35,11 @@ public class ArrivalChart extends JPanel {
private static final Color PURPLE = new Color(128, 0, 255);
public static final Rectangle EMPTY_RECTANGLE = new Rectangle();
public static final int MIN_CHART_WIDTH = 400;
private final boolean arrivalEnabled;
private final boolean ma7Enabled;
private final boolean ma14Enabled;
private final boolean ma28Enabled;
private final boolean ma56Enabled;
public IntegerProperty widthProperty = new IntegerProperty("widthProperty", 600);
public IntegerProperty heightProperty = new IntegerProperty("heightProperty", 400);
@ -46,6 +47,7 @@ public class ArrivalChart extends JPanel {
this(data.getDays(), data.getArrival(), data.getTarget(), data.getMa7(),
data.getMa14(), data.getMa28(), data.getMa56(),
data.getStartDate(), data.getEndDate(), width,
data.isArrivalEnabled(), data.isMa7Enabled(),
data.isMa14Enabled(), data.isMa28Enabled(),
data.isMa56Enabled());
}
@ -53,11 +55,15 @@ public class ArrivalChart extends JPanel {
public ArrivalChart(String[] days, double[] arrival, double target,
double[] ma7,
double[] ma14, double[] ma28, double[] ma56, String startDate,
String endDate, int width, boolean ma14Enabled, boolean ma28Enabled,
String endDate, int width, boolean arrivalEnabled, boolean ma7Enabled, boolean ma14Enabled, boolean ma28Enabled,
boolean ma56Enabled) {
this.setLayout(null);
this.setVisible(true);
this.arrivalEnabled = arrivalEnabled;
this.ma7Enabled = ma7Enabled;
this.ma14Enabled = ma14Enabled;
this.ma28Enabled = ma28Enabled;
this.ma56Enabled = ma56Enabled;
//
String title = "Arrivals";
@ -86,9 +92,7 @@ public class ArrivalChart extends JPanel {
widthProperty.setValue(width);
chartPanel.setBounds(10, 10, width, 400);
this.ma14Enabled = ma14Enabled;
this.ma28Enabled = ma28Enabled;
this.ma56Enabled = ma56Enabled;
}
@ -104,7 +108,14 @@ public class ArrivalChart extends JPanel {
XYPlot plot = (XYPlot) chart.getPlot();
for (int i = 0; i < 6; i++) {
if (i == 3 && this.ma14Enabled) {
if (i == 0 && !this.arrivalEnabled) {
continue;
}
if (i == 2 && !this.ma7Enabled) {
continue;
}
if (i == 3 && !this.ma14Enabled) {
continue;
}
if (i == 4 && !this.ma28Enabled) {

2
modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/ArrivalChartData.java
View File

@ -23,5 +23,5 @@ public class ArrivalChartData {
private double[] ma56;
private String startDate;
private String endDate;
private boolean ma14Enabled = true, ma28Enabled = true, ma56Enabled = true;
private boolean arrivalEnabled = true, ma7Enabled = true, ma14Enabled = true, ma28Enabled = true, ma56Enabled = true;
}

7
modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/TCheckBox.java
View File

@ -21,9 +21,14 @@ public class TCheckBox extends JCheckBox implements GetProperty {
private static final int HEIGHT = 30;
private Color originalBackground;
private Color originalForeground;
private int customWidth = 0;
public TCheckBox(String text) {
this(text, 0);
}
public TCheckBox(String text, int customWidth) {
this(text, false);
this.customWidth = customWidth;
}
public final BooleanProperty visibilitySupportedColoredProperty
= new BooleanProperty("visibilitySupportedColoredProperty", true);
@ -68,7 +73,7 @@ public class TCheckBox extends JCheckBox implements GetProperty {
public final BooleanProperty valueProperty = new BooleanProperty("");
public void setBounds(int x, int y) {
setBounds(x, y, WIDTH, HEIGHT);
setBounds(x, y, customWidth == 0 ? WIDTH : customWidth, HEIGHT);
this.originalBackground = getBackground();
this.originalForeground = getForeground();
}

54
modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/WorkingDaysWindow.java
View File

@ -49,6 +49,11 @@ public class WorkingDaysWindow extends TWindow {
private final JButton decreaseEnd;
private final TTabbedPane tp;
private final JComboBox years;
private final TCheckBox enableArrival;
private final TCheckBox enableMa7;
private final TCheckBox enableMa14;
private final TCheckBox enableMa28;
private final TCheckBox enableMa56;
private ArrivalChart arrivalChart;
private JTable table = null;
@ -133,9 +138,7 @@ public class WorkingDaysWindow extends TWindow {
TLabel startLabel = new TLabel("Start:");
add(startLabel);
startLabel.setBounds(deleteTextField.getX() + deleteTextField.getWidth()
+ 6 * SwingUtils.MARGIN, deleteTextField.getY(),
50, 30);
startLabel.setBoundsFromTop(deleteTextField);
this.startTextField = new TTextField();
add(startTextField);
startTextField.setBounds(
@ -221,6 +224,27 @@ public class WorkingDaysWindow extends TWindow {
decreaseEnd.setBounds(decreaseStart.getX() + decreaseStart.getWidth()
+ SwingUtils.MARGIN, decreaseStart.getY(), 120,
30);
this.enableArrival = new TCheckBox("Arrival", 60);
//enableArrival.setSelected(true);
this.enableMa7 = new TCheckBox("MA7", 60);
enableMa7.setSelected(true);
this.enableMa14 = new TCheckBox("MA14", 60);
this.enableMa28 = new TCheckBox("MA28", 60);
this.enableMa56 = new TCheckBox("MA56", 60);
enableArrival.setBoundsFromLeft(decreaseEnd);
enableMa7.setBoundsFromLeft(enableArrival);
enableMa14.setBoundsFromLeft(enableMa7);
enableMa28.setBoundsFromLeft(enableMa14);
enableMa56.setBoundsFromLeft(enableMa28);
this.enableArrival.addActionListener(e-> reloadButton.doClick());
this.enableMa7.addActionListener(e-> reloadButton.doClick());
this.enableMa14.addActionListener(e-> reloadButton.doClick());
this.enableMa28.addActionListener(e-> reloadButton.doClick());
this.enableMa56.addActionListener(e-> reloadButton.doClick());
addAll(enableArrival, enableMa7, enableMa14, enableMa28, enableMa56);
addKeyListener(new KeyListener() {
@Override
public void keyTyped(KeyEvent e) {
@ -248,7 +272,7 @@ public class WorkingDaysWindow extends TWindow {
ArrivalChartData acd =
new ArrivalChartData(new String[] {}, new double[] {}, 7d,
new double[] {}, new double[] {}, new double[] {},
new double[] {}, null, null, false, false, false);
new double[] {}, null, null, false, false, false, false, false);
this.arrivalChart = new ArrivalChart(acd, 1000);
Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
this.chartWidth = (int) screen.getWidth() - 60;
@ -261,8 +285,8 @@ public class WorkingDaysWindow extends TWindow {
this.scrollPane
= new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
tp.setBounds(years.getX(), years.getY() + years.getHeight() + SwingUtils.MARGIN, (int) (screen.getWidth() - 50),
(int) (screen.getHeight() - 200));
tp.setBounds(startLabel.getX(), startLabel.getY() + startLabel.getHeight() + SwingUtils.MARGIN, (int) (screen.getWidth() - 50),
(int) (screen.getHeight() - startLabel.getY() + startLabel.getHeight() -5 * SwingUtils.MARGIN));
tp.add(scrollPane, "Table");
tp.add(arrivalChart, "Chart");
add(tp);
@ -277,8 +301,7 @@ public class WorkingDaysWindow extends TWindow {
loadYear(year, time);
setSize(tp.getWidth() + 3 * SwingUtils.MARGIN,
tp.getY() + tp.getHeight()
+ 4 * SwingUtils.MARGIN);
tp.getY() + tp.getHeight() - 120);
}
public void doReloadButtonClick() {
@ -475,23 +498,26 @@ public class WorkingDaysWindow extends TWindow {
table.setBounds(30, 30, 750, 600);
this.widthProperty.addListener(e-> {
if(/*this.widthProperty.getValue() % 10 == 0 && */this.widthProperty.getValue() > 400) {
tp.setBounds(years.getX(), years.getY() + years.getHeight() + SwingUtils.MARGIN, this.widthProperty.getValue() - 50,
tp.setBounds(tp.getX(), tp.getY(), this.widthProperty.getValue() - 50,
tp.getHeight());
}
});
this.heightProperty.addListener(e-> {
if(/*this.widthProperty.getValue() % 10 == 0 && */this.heightProperty.getValue() > 400) {
tp.setBounds(years.getX(), years.getY() + years.getHeight() + SwingUtils.MARGIN, tp.getWidth(),
getHeight() - years.getHeight() * 4);
tp.setBounds(tp.getX(), tp.getY(), tp.getWidth(),
getHeight() - years.getHeight() * 5);
}
});
//table.setDefaultRenderer(Object.class, new ColorRenderer());
ArrivalChartData acd = WorkingDayForStats
.toArrivalChartData(wdfsList, 7d, startTextField.getText(),
endTextField.getText());
acd.setMa14Enabled(acd.isMa14Enabled());
acd.setMa28Enabled(acd.isMa28Enabled());
acd.setMa56Enabled(acd.isMa56Enabled());
acd.setArrivalEnabled(enableArrival.isSelected());
acd.setMa7Enabled(enableMa7.isSelected());
acd.setMa14Enabled(enableMa14.isSelected());
acd.setMa28Enabled(enableMa28.isSelected());
acd.setMa56Enabled(enableMa56.isSelected());
reloadChart(acd);
}