Avans/weerstation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Displaygraph will be called 1 time, cleaner calender/period code

Browse Source
This commit is contained in:
jancoow
2014-10-20 17:24:46 +02:00
parent 39568e1864
commit d85c47b430
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Weerstation.java
+21 -12
View File
@@ -1,3 +1,4 @@
package weerstation1;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -16,6 +17,7 @@ public class Weerstation {
int currentScreen; int currentScreen;
boolean wait; boolean wait;
boolean graph; boolean graph;
boolean currentGraph;
boolean startup; boolean startup;
boolean startupState; boolean startupState;
@@ -31,33 +33,39 @@ public class Weerstation {
calPeriod.add(Calendar.DATE, -1); calPeriod.add(Calendar.DATE, -1);
periods.add(new Periode(now, calPeriod)); periods.add(new Periode(now, calPeriod));
calPeriod = Calendar.getInstance();
calPeriod.add(Calendar.DATE, -6); calPeriod.add(Calendar.DATE, -7);
periods.add(new Periode(now, calPeriod)); periods.add(new Periode(now, calPeriod));
calPeriod = Calendar.getInstance();
calPeriod.add(Calendar.MONTH, -1); calPeriod.add(Calendar.MONTH, -1);
periods.add(new Periode(now, calPeriod)); periods.add(new Periode(now, calPeriod));
calPeriod = Calendar.getInstance();
calPeriod.add(Calendar.MONTH, -2);
periods.add(new Periode(now, calPeriod));
calPeriod.add(Calendar.MONTH, -3); calPeriod.add(Calendar.MONTH, -3);
periods.add(new Periode(now, calPeriod)); periods.add(new Periode(now, calPeriod));
calPeriod = Calendar.getInstance();
calPeriod.add(Calendar.MONTH, -6); calPeriod.add(Calendar.MONTH, -6);
periods.add(new Periode(now, calPeriod)); periods.add(new Periode(now, calPeriod));
calPeriod = Calendar.getInstance();
calPeriod.add(Calendar.YEAR, -1); calPeriod.add(Calendar.YEAR, -1);
periods.add(new Periode(now, calPeriod)); periods.add(new Periode(now, calPeriod));
calPeriod = Calendar.getInstance();
calPeriod.add(Calendar.YEAR, -2);
periods.add(new Periode(now, calPeriod));
calPeriod = Calendar.getInstance();
System.out.println(periods.get(0)); System.out.println(periods.get(0));
weerstation1 = new WeerstationConnector(); weerstation1 = new WeerstationConnector();
meting1 = weerstation1.getMostRecentMeasurement(); meting1 = weerstation1.getMostRecentMeasurement();
meting2 = weerstation1.getAllMeasurementsBetween(periods.get(0).getBeginPeriode(), periods.get(0).getEindePeriode()); meting2 = weerstation1.getAllMeasurementsBetween(periods.get(0).getBeginPeriode(), periods.get(0).getEindePeriode());
currentGraph = false;
startupState = false; startupState = false;
currentScreen = 0; currentScreen = 0;
wait = true; wait = true;
graph = false; graph = false;
@@ -111,11 +119,12 @@ public class Weerstation {
} }
Grootheid obj = lstScreens.get(currentScreen); Grootheid obj = lstScreens.get(currentScreen);
if(graph) if(graph && (graph != currentGraph))
{ {
obj.displayGraph(); obj.displayGraph();
currentGraph = true;
} }
else else if(!graph)
{ {
obj.display(); obj.display();
} }