Ver Fonte

Added Periode and other calculations

Kenneth van Ewijk há 11 anos atrás
pai
commit
fca071d043
2 ficheiros alterados com 31 adições e 3 exclusões
  1. 24 2
      Periode.java
  2. 7 1
      Weerstation.java

+ 24 - 2
Periode.java

@@ -1,7 +1,29 @@
+import java.util.GregorianCalendar;
+
 public class Periode
 {
+    public GregorianCalendar beginPeriode;
+    public GregorianCalendar eindePeriode;
+    
     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
Weerstation.java

@@ -4,10 +4,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.Calendar;
 
 public class Weerstation {
     WeerstationConnector weerstation1;
+    Calendar now;
     Measurement meting1;
+    Periode periodeDag;
     ArrayList<Measurement> meting2;
     Timer starter;
     int currentScreen;
@@ -17,13 +20,16 @@ public class Weerstation {
     
     public Weerstation(){
         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();
         starter = new Timer();
         startAnimatie();
         
         meting1 = weerstation1.getMostRecentMeasurement();
-        meting2 = weerstation1.getAllMeasurementsLast24h();
+        meting2 = weerstation1.getAllMeasurementsBetween(periodeDag.getBeginPeriode(), periodeDag.getEindePeriode());
         
         stopAnimatie();
         while(startup)