Skip to content

Commit 97f63a4

Browse files
committed
Fixed Total
Fixed total sometimes bugging out as a result of removing a row
1 parent 1ca115e commit 97f63a4

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

TemtemTracker/savedData/table.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

TemtemTracker/src/temtemTableUI/TemtemTableUI.java

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import temtemTableData.TimerData;
1616
import temtemTableData.TotalData;
1717

18+
19+
1820
public class TemtemTableUI extends JPanel {
1921

2022
/**
@@ -73,6 +75,10 @@ public void removeRow(TableDataRow row) {
7375
this.remove(rowUI);
7476
// Reduce the total
7577
temtemTable.total.encountered -= row.encountered;
78+
// Remove the row
79+
temtemTable.rows.remove(row);
80+
// Remove the row from the hash map
81+
UIRows.remove(row);
7682
// Recalculate Temtem/H
7783
huntingUI.updateCount(temtemTable.total.encountered);
7884
// Recalculate total Luma chance
@@ -82,24 +88,11 @@ public void removeRow(TableDataRow row) {
8288
tableRow.encounteredPercent = tableRow.encountered / (double) temtemTable.total.encountered;
8389
UIRows.get(tableRow).update();
8490
});
85-
// Remove the row
86-
temtemTable.rows.remove(row);
87-
// Remove the row from the hash map
88-
UIRows.remove(row);
89-
// Redraw the panel
90-
redrawPanel();
91-
}
92-
93-
private void redrawPanel() {
94-
this.removeAll();
95-
this.add(TemtemTableHeaderUIFactory.createHeaderUI(), 0);
96-
this.add(new TemtemTableTotalUI(temtemTable.total), 1);
97-
this.add(huntingUI, 2);
98-
for (TableDataRow row : temtemTable.rows) {
99-
this.add(UIRows.get(row), 1);
100-
}
91+
total.update();
10192
this.revalidate();
10293
this.repaint();
94+
// Redraw the panel
95+
//redrawPanel();
10396
}
10497

10598
private void initializeTable(TemtemDataTable table) {

0 commit comments

Comments
 (0)