modify simple bar script

R/simpleBar.R

@@ -2,25 +2,21 @@
 
 simpleBar <- function(data = "", value = ""){
 
-library(jsonlite)
+  library(jsonlite)
 
-data <- fromJSON(data)
+  data <- fromJSON(data)
 
-colnames(data)[1] <- "Group"
+  colnames(data)[1] <- "Group"
+  data <- sapply(data, as.character)
+  data <- as.data.frame(data)
+  l <- dim(data)[1]
+  data <- data[1:l-1, ]
 
-data <- sapply(data, as.character)
-data <- as.data.frame(data)
+  Group <- data$Group
+  data <- data[value]
+  data <- cbind(Group, data)
+  colnames(data) <- c('Group', 'value')
 
-l <- dim(data)[1]
-data <- data[1:l-1, ]
-
-data <- data[value]
-
-Group <- data$Group
-data <- cbind(Group, data)
-
-colnames(data) <- c('Group', 'value')
-
-json_string <- toJSON(data)
-list(message = paste(json_string))
+  json_string <- toJSON(data)
+  list(message = paste(json_string))
 }

inst/www/js/barplot.js

@@ -163,6 +163,8 @@ function plotGroupBar(data){
 
 function plotStackBar(data){
 
+  d3.selectAll("svg > *").remove();
+
   data = JSON.parse(data);
 
   var rowNames = d3.keys(data[0]).filter(function(key) { return key !== "Group"; });

inst/www/js/nvd3_plots.js

@@ -196,7 +196,7 @@ function makePlot(obj, props) {
 
 			var data = dataJSON, value = props.var_x;
 
-			var req = ocpu.rpc("groupBar", {data: data, value: value}, function(output){
+			var req = ocpu.rpc("simpleBar", {data: data, value: value}, function(output){
 					var simpleBarPlotData = output.message;
 						addNewPlot('Simple Bar Plot', simpleBarPlotData);
 						plotSimpleBar(simpleBarPlotData);
@@ -234,7 +234,6 @@ function makePlot(obj, props) {
 
 			var req = ocpu.rpc("groupBar", {data: data}, function(output){
 					var stackBarPlotData = output.message;
-					alert(stackBarPlotData);
 					addNewPlot('Stack Bar Plot', stackBarPlotData);
 					plotStackBar(stackBarPlotData);
 				});