ready to load csv

1 files changed, 13 insertions, 5 deletions

diff --git a/vodaviz.pde b/vodaviz.pde
index f95ee14..9a4272f 100644
--- a/vodaviz.pde
+++ b/vodaviz.pde
@@ -88,24 +88,30 @@ int whichChild,numChildren;
 
 String mode;
 
+csvloader data;
+calldata calls;
+
 void setup(){
   println("vodaviz v0.11");
   RG.init(this);
-  
-  mode="PDF";
+
+  //mode="PDF";
   size(832,220); //,PDF, "testoutput.pdf"); //P3D); //832,220); //nb pdf is 800x600
   
   smooth();
   float m = millis();
   
-  shp = RG.loadShape("world_countries_outlines_culled.svg"); //test_drawing.svg"); //world_countries_outlines_split.svg");
-  
+  shp = RG.loadShape("countries_named_mercator.svg"); //test_drawing.svg"); //world_countries_outlines_split.svg");
   
   shpmap = new pointMapper(26,736,90,390); 
   RG.ignoreStyles();
   println("loaded svg in "+((millis()-m)*.001)+" seconds");
   numChildren=shp.children.length;
   whichChild=0;
+
+  data=new csvloader("calls.csv");
+  calls=new calldata(data.data);
+ 
 }
 
 void draw() {
@@ -129,6 +135,7 @@ void draw() {
       
       //public boolean contains(RPoint p)
       
+      
       /*
       //find a random point inside shape
       RPoint tl=shp.children[i].getTopLeft();
@@ -142,6 +149,8 @@ void draw() {
       }
       */
       
+      
+      
       beginShape();
       for (int k=0;k<shp.children[i].paths[j].commands.length;k++) {
         RPoint sp=shp.children[i].paths[j].commands[k].startPoint;
@@ -165,4 +174,3 @@ void mousePressed() {
 
 
 
-