Added Periode and other calculations

This commit is contained in:
Kenneth van Ewijk
2014-10-17 14:02:39 +02:00
parent 0252061bc6
commit fca071d043
2 changed files with 31 additions and 3 deletions
+22
View File
@@ -1,7 +1,29 @@
import java.util.GregorianCalendar;
public class Periode public class Periode
{ {
public GregorianCalendar beginPeriode;
public GregorianCalendar eindePeriode;
public Periode() public Periode()
{ {
}
public Periode(int jaar, int maand, int dag, int eindjaar, int eindmaand, int einddag)
{
beginPeriode = new GregorianCalendar();
eindePeriode = new GregorianCalendar();
beginPeriode.set(jaar, maand, dag,0,0,0);
eindePeriode.set(eindjaar, eindmaand, einddag,23,59,59);
}
public GregorianCalendar getBeginPeriode()
{
return beginPeriode;
}
public GregorianCalendar getEindePeriode()
{
return eindePeriode;
} }
} }
+7 -1
View File
@@ -4,10 +4,13 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.Calendar;
public class Weerstation { public class Weerstation {
WeerstationConnector weerstation1; WeerstationConnector weerstation1;
Calendar now;
Measurement meting1; Measurement meting1;
Periode periodeDag;
ArrayList<Measurement> meting2; ArrayList<Measurement> meting2;
Timer starter; Timer starter;
int currentScreen; int currentScreen;
@@ -17,13 +20,16 @@ public class Weerstation {
public Weerstation(){ public Weerstation(){
weerstation1 = new WeerstationConnector(); weerstation1 = new WeerstationConnector();
now = Calendar.getInstance();
periodeDag = new Periode(Calendar.YEAR,Calendar.MONTH,Calendar.DAY_OF_MONTH,Calendar.YEAR,Calendar.MONTH,Calendar.DAY_OF_MONTH);
GUIboard.init(); GUIboard.init();
starter = new Timer(); starter = new Timer();
startAnimatie(); startAnimatie();
meting1 = weerstation1.getMostRecentMeasurement(); meting1 = weerstation1.getMostRecentMeasurement();
meting2 = weerstation1.getAllMeasurementsLast24h(); meting2 = weerstation1.getAllMeasurementsBetween(periodeDag.getBeginPeriode(), periodeDag.getEindePeriode());
stopAnimatie(); stopAnimatie();
while(startup) while(startup)