Changeset 2058

Timestamp:

Oct 13, 2011, 2:46:21 PM (12 years ago)

Author:

taco@…

Message:

visualization/VisualizeController.groovy, 'formatData' function, the 'sort' closure now uses the String representations of the objects it sorts. This is good, because otherwise it doesn't actually sort the items alphabetically.

File:

• trunk/grails-app/controllers/dbnp/visualization/VisualizeController.groovy (modified) (7 diffs)

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

@@ -343 +343 @@
             returnData = formatData( inputData.visualizationType, groupedData, fields, groupAxisType, valueAxisType ); // Don't indicate axis ordering, standard <"x", "y"> will be used
         }
-        println "returnData: "+returnData
         return sendResults(returnData)
         }
@@ -672 +671 @@
          */
         def formatData( type, groupedData, fields, groupAxisType, valueAxisType, groupAxis = "x", valueAxis = "y", errorName = "error" ) {
-                // We want to sort the data based on the group-axis, but keep the values on the value-axis in sync. 
+                // We want to sort the data based on the group-axis, but keep the values on the value-axis in sync.
                 // The only way seems to be to combine data from both axes.
         def combined = []
@@ -679 +678 @@
                 combined << [ "group": group, "data": groupedData[ 'data' ][ i ] ]
             }
-            combined.sort { it.group }
+            combined.sort { it.group.toString() }
             groupedData[groupAxis] = renderTimesAndDatesHumanReadable(combined*.group, groupAxisType)
             groupedData[valueAxis] = renderTimesAndDatesHumanReadable(groupedData[valueAxis], valueAxisType)
@@ -687 +686 @@
                 combined << [ "group": group, "value": groupedData[ valueAxis ][ i ] ]
             }
-            combined.sort { it.group }
+            combined.sort { it.group.toString() }
             groupedData[groupAxis] = renderTimesAndDatesHumanReadable(combined*.group, groupAxisType)
             groupedData[valueAxis] = renderTimesAndDatesHumanReadable(combined*.value, valueAxisType)
         }
-
         // TODO: Handle name and unit of fields correctly
         def valueAxisTypeString = (valueAxisType==CATEGORICALDATA || valueAxisType==DATE || valueAxisType==RELTIME ? "categorical" : "numerical")
@@ -735 +733 @@
     def renderTimesAndDatesHumanReadable(data, axisType){
         if(axisType==RELTIME){
-            println "RELTIME"
             data = renderTimesHumanReadable(data)
         }
         if(axisType==DATE){
-            println "DATE"
            data = renderDatesHumanReadable(data)
         }
-        println "NO JOY"
         return data
     }
@@ -754 +749 @@
         def tmpTimeContainer = []
         data. each {
-            println "\t"+it
             if(it instanceof Number) {
                 try{
@@ -776 +770 @@
         def tmpDateContainer = []
         data. each {
-            println "\t"+it
             if(it instanceof Number) {
                 try{