From d85c47b430ba936420860a12059f6418f4f4768d Mon Sep 17 00:00:00 2001
From: jancoow <jancokock@gmail.com>
Date: Mon, 20 Oct 2014 17:24:46 +0200
Subject: [PATCH] Displaygraph will be called 1 time, cleaner calender/period
 code

---
 Weerstation.java | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/Weerstation.java b/Weerstation.java
index a1f9f17..d6aea67 100644
--- a/Weerstation.java
+++ b/Weerstation.java
@@ -1,3 +1,4 @@
+package weerstation1;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,6 +17,7 @@ public class Weerstation {
     int currentScreen;
     boolean wait;
     boolean graph;
+    boolean currentGraph;
     boolean startup;
     boolean startupState;
     
@@ -31,33 +33,39 @@ public class Weerstation {
     	
 		calPeriod.add(Calendar.DATE, -1);
 		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));
-		
+		calPeriod = Calendar.getInstance(); 
+				
 		calPeriod.add(Calendar.MONTH, -1);
 		periods.add(new Periode(now, calPeriod));
-		
-		calPeriod.add(Calendar.MONTH, -2);
-		periods.add(new Periode(now, calPeriod));
-		
+		calPeriod = Calendar.getInstance(); 
+				
 		calPeriod.add(Calendar.MONTH, -3);
 		periods.add(new Periode(now, calPeriod));
+		calPeriod = Calendar.getInstance(); 
 		
 		calPeriod.add(Calendar.MONTH, -6);
 		periods.add(new Periode(now, calPeriod));
+		calPeriod = Calendar.getInstance(); 
 		
 		calPeriod.add(Calendar.YEAR, -1);
 		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));
 	    
         weerstation1 = new WeerstationConnector();
         meting1 = weerstation1.getMostRecentMeasurement();
         meting2 = weerstation1.getAllMeasurementsBetween(periods.get(0).getBeginPeriode(), periods.get(0).getEindePeriode());
-
+        currentGraph = false;
         startupState = false;
-        
         currentScreen = 0;
         wait = true;
         graph = false;
@@ -111,11 +119,12 @@ public class Weerstation {
                 }
                 
                 Grootheid obj = lstScreens.get(currentScreen);
-                if(graph)
+                if(graph && (graph != currentGraph))
                 {
-                    obj.displayGraph();    
+                	obj.displayGraph(); 
+                	currentGraph = true;
                 }
-                else
+                else if(!graph)
                 {
                     obj.display();      
                 }