From 6cfb7977259cfe738609e2c8bdeef2352c2ed78c Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Sun, 26 Oct 2014 15:44:10 +0100 Subject: [PATCH] Bugfixes --- GraadDagen.java | 19 +++++-------------- Grootheid.java | 6 +++--- LangsteHittegolfPeriode.java | 5 +---- LangsteRegenPeriode.java | 17 ++++------------- LangsteTempStijgingPeriode.java | 15 ++------------- LangsteZomerPeriode.java | 8 +++----- MaximaleRegenPeriode.java | 8 ++------ 7 files changed, 20 insertions(+), 58 deletions(-) diff --git a/GraadDagen.java b/GraadDagen.java index 6edb211..85b573a 100644 --- a/GraadDagen.java +++ b/GraadDagen.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; @@ -11,28 +11,19 @@ public class GraadDagen extends Grootheid{ public GraadDagen(Measurement measurement1, ArrayList measurement2){ list = new ArrayList(); graadDagen = 0; - updateRecent(measurement1); updatePeriod(measurement2); } - - public void updateRecent(Measurement measurement1){ - setCurrent(measurement1.getOutsideTemp()); - } public void updatePeriod(ArrayList measurement2){ - createList(measurement2); - + createList(measurement2); graadDagen = StatisticsCalculator.graadDagen(list); } - public void display(){ - GUIboard.writePageToMatrix("Aantal Graaddagen", graadDagen + "", "", true, true); + public void display(String periode, boolean knop1, boolean knop2){ + GUIboard.writePageToMatrix("Aantal Graaddagen", graadDagen + "", periode, knop1, knop2); } - public void displayGraph() - { - display(); - } + public void displayGraph(){} private void createList(ArrayList measurement2) { diff --git a/Grootheid.java b/Grootheid.java index 11c332f..0be9539 100644 --- a/Grootheid.java +++ b/Grootheid.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; @@ -124,7 +124,7 @@ public class Grootheid } - public void display(String periodname, Boolean p, Boolean s){ + public void display(String periodname, boolean p, boolean s){ GUIboard.clearLeft(); GUIboard.clearRight(); GUIboard.clearTop(); @@ -148,7 +148,7 @@ public class Grootheid GUIboard.writePageToMatrix(getName(), period.toString(), periodname, p, s); } } - + public void displayGraph() { GUIboard.writeGraphToMatrix(list, getMin(), getMax()); diff --git a/LangsteHittegolfPeriode.java b/LangsteHittegolfPeriode.java index 0af4849..e38f84b 100644 --- a/LangsteHittegolfPeriode.java +++ b/LangsteHittegolfPeriode.java @@ -12,8 +12,5 @@ public class LangsteHittegolfPeriode extends Grootheid{ setPeriod(StatisticsCalculator.langsteHittegolfPeriode(list)); } - public void displayGraph() - { - } - + public void displayGraph(){} } diff --git a/LangsteRegenPeriode.java b/LangsteRegenPeriode.java index 8f70d89..f6a7ad0 100644 --- a/LangsteRegenPeriode.java +++ b/LangsteRegenPeriode.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class LangsteRegenPeriode extends Grootheid{ @@ -9,30 +9,21 @@ public class LangsteRegenPeriode extends Grootheid{ public LangsteRegenPeriode(Measurement measurement1, ArrayList measurement2){ list = new ArrayList(); regenPeriode = new Periode("Regen"); - updateRecent(measurement1); update24Hour(measurement2); } - - public void updateRecent(Measurement measurement1){ - setCurrent(measurement1.getOutsideTemp()); - } public void update24Hour(ArrayList measurement2){ createList(measurement2); - int[] index = StatisticsCalculator.langsteRegenPeriode(list); regenPeriode = Calculator.timeStampToPeriode( measurement2.get(index[0]).getDateStamp(), measurement2.get(index[1]).getDateStamp()); } - public void display() + public void display(String periode, boolean knop1, boolean knop2) { - GUIboard.writePageToMatrix("Langste Regen Periode", regenPeriode.toString(), "", true, true); + GUIboard.writePageToMatrix("Langste Regen Periode", regenPeriode.toString(), periode, knop1, knop2); } - public void displayGraph() - { - display(); - } + public void displayGraph(){} private void createList(ArrayList measurement2) { diff --git a/LangsteTempStijgingPeriode.java b/LangsteTempStijgingPeriode.java index e80e39c..1fed849 100644 --- a/LangsteTempStijgingPeriode.java +++ b/LangsteTempStijgingPeriode.java @@ -1,4 +1,4 @@ -package weerstation; + import java.util.ArrayList; public class LangsteTempStijgingPeriode extends Grootheid @@ -11,21 +11,13 @@ public class LangsteTempStijgingPeriode extends Grootheid { list = new ArrayList(); StijgingPeriode = new Periode("TempStijgingsperiode"); - updateRecent(measurement1); updatePeriod(measurement2); } - - - public void updateRecent(Measurement measurement1) - { - setCurrent(measurement1.getOutsideTemp()); - } public void updatePeriod(ArrayList measurement2) { createList(measurement2); - int[] index = StatisticsCalculator.langsteTempStijgingPeriode(list); StijgingPeriode= Calculator.timeStampToPeriode( measurement2.get(index[0]).getDateStamp(), measurement2.get(index[1]).getDateStamp()); } @@ -35,10 +27,7 @@ public class LangsteTempStijgingPeriode extends Grootheid GUIboard.writePageToMatrix("Langste temp.stijging", StijgingPeriode.toString(), "", true, true); } - public void displayGraph() - { - display(); - } + public void displayGraph(){} private void createList(ArrayList measurement2) { diff --git a/LangsteZomerPeriode.java b/LangsteZomerPeriode.java index bdfcacd..b087031 100644 --- a/LangsteZomerPeriode.java +++ b/LangsteZomerPeriode.java @@ -5,19 +5,17 @@ public class LangsteZomerPeriode extends Grootheid{ //constructor public LangsteZomerPeriode(Measurement measurement1, ArrayList measurement2){ - setName("Langste zomerse periode"); + setName("Zomerse periode"); updatePeriod(measurement2); } public void updatePeriod(ArrayList measurement2){ createList(measurement2); - int[] index = StatisticsCalculator.langsteDroogstePeriode(list); + int[] index = StatisticsCalculator.langsteZomersePeriode(list); setPeriod(Calculator.timeStampToPeriode( measurement2.get(index[0]).getDateStamp(), measurement2.get(index[1]).getDateStamp())); } - public void displayGraph() - { - } + public void displayGraph(){} private void createList(ArrayList measurement2) { diff --git a/MaximaleRegenPeriode.java b/MaximaleRegenPeriode.java index 5ff5d49..7b2231b 100644 --- a/MaximaleRegenPeriode.java +++ b/MaximaleRegenPeriode.java @@ -1,4 +1,4 @@ -package weerstation1; + import java.util.ArrayList; public class MaximaleRegenPeriode extends Grootheid{ @@ -14,11 +14,7 @@ public class MaximaleRegenPeriode extends Grootheid{ setCustom(StatisticsCalculator.maximaleRegenPeriode(list) + " "); } - - public void displayGraph() - { - } - + public void displayGraph(){} private void createList(ArrayList measurement2) {