Changeset 2023

Timestamp:

Sep 19, 2011, 3:50:56 PM (12 years ago)

Author:

robert@…

Message:

Added x-values for all series in visualization controller

File:

• trunk/grails-app/controllers/dbnp/visualization/VisualizeController.groovy (modified) (1 diff)

trunk/grails-app/controllers/dbnp/visualization/VisualizeController.groovy

@@ -534 +534 @@
         def formatData( groupedData, fields, groupAxis = "x", valueAxis = "y", errorName = "error" ) {
                 // TODO: Handle name and unit of fields correctly
+                def xAxis = groupedData[ groupAxis ].collect { it.toString() };
+                def yName = parseFieldId( fields[ valueAxis ] ).name;
                 
                 def return_data = [:]
                 return_data[ "type" ] = "barchart"
-                return_data[ "x" ] = groupedData[ groupAxis ].collect { it.toString() }
-                return_data.put("yaxis", ["title" : parseFieldId( fields[ valueAxis ] ).name, "unit" : "" ])
+                return_data[ "x" ] = xAxis
+                return_data.put("yaxis", ["title" : yName, "unit" : "" ])
                 return_data.put("xaxis", ["title" : parseFieldId( fields[ groupAxis ] ).name, "unit": "" ])
                 return_data.put("series", [[
-                        "name": "Y",
+                        "name": yName,
+                        "x": xAxis,
                         "y": groupedData[ valueAxis ],
                         "error": groupedData[ errorName ]