update oecd app based on latest version of rCharts

cloudly · Apr 12, 2013 · 445553b · 445553b
1 parent c6c24af
commit 445553b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/index.Rmd b/index.Rmd
@@ -81,7 +81,7 @@ p1 <- rPlot(x = list(var = "countrycode", sort = "value"), y = "value",
   color = 'gender', data = women, type = 'bar')
 
 # Step 3. add a second layer for men, displayed as points
-p1$layer2(x = "countrycode", y = "value", color = 'gender', 
+p1$layer(x = "countrycode", y = "value", color = 'gender', 
   data = men, type = 'point', size = list(const = 3))
 
 # Step 4. format the x and y axis labels

diff --git a/index.html b/index.html
@@ -87,7 +87,7 @@ <h3>Bar Plot</h3>
   color = &#39;gender&#39;, data = women, type = &#39;bar&#39;)
 
 # Step 3. add a second layer for men, displayed as points
-p1$layer2(x = &quot;countrycode&quot;, y = &quot;value&quot;, color = &#39;gender&#39;, 
+p1$layer(x = &quot;countrycode&quot;, y = &quot;value&quot;, color = &#39;gender&#39;, 
   data = men, type = &#39;point&#39;, size = list(const = 3))
 
 # Step 4. format the x and y axis labels

diff --git a/index.md b/index.md
@@ -78,7 +78,7 @@ p1 <- rPlot(x = list(var = "countrycode", sort = "value"), y = "value",
   color = 'gender', data = women, type = 'bar')
 
 # Step 3. add a second layer for men, displayed as points
-p1$layer2(x = "countrycode", y = "value", color = 'gender', 
+p1$layer(x = "countrycode", y = "value", color = 'gender', 
   data = men, type = 'point', size = list(const = 3))
 
 # Step 4. format the x and y axis labels

diff --git a/rChartOECD/server.R b/rChartOECD/server.R
@@ -5,11 +5,11 @@ shinyServer(function(input, output) {
     men <- subset(dat2m, gender == "Men" & year == YEAR)
     women <- subset(dat2m, gender == "Women" & year == YEAR)
     p1 <- rPlot(x = list(var = "countrycode", sort = "value"), y = "value", 
-                color = 'gender', data = women, type = 'bar')
-    p1$layer2(x = "countrycode", y = "value", color = 'gender', 
-              data = men, type = 'point', size = list(const = 3))
+      color = 'gender', data = women, type = 'bar')
+    p1$layer(x = "countrycode", y = "value", color = 'gender', 
+      data = men, type = 'point', size = list(const = 3))
     p1$addParams(height = 300, dom = 'chart1', 
-                 title = "Percentage of Employed who are Senior Managers")
+      title = "Percentage of Employed who are Senior Managers")
     p1$guides(x = list(title = "", ticks = unique(men$countrycode)))
     p1$guides(y = list(title = "", max = 18))
     return(p1)