Changeset 2032

Timestamp:

Sep 26, 2011, 5:58:27 PM (11 years ago)

Author:

taco@…

Message:

visualizeController: fixed bug in determineFieldType function

File:

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

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

@@ -146 +146 @@
         // TODO: handle the case of multiple fields on an axis
         // Determine data types
+        println "Determining rowType: "+inputData.rowIds[0]
         def rowType = determineFieldType(inputData.studyIds[0], inputData.rowIds[0])
+        println "Determining columnType: "+inputData.columnIds[0]
         def columnType = determineFieldType(inputData.studyIds[0], inputData.columnIds[0])
 
@@ -533 +535 @@
          */
         def formatData( type, 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" ] = type
-                return_data.put("yaxis", ["title" : yName, "unit" : "" ])
-                return_data.put("xaxis", ["title" : parseFieldId( fields[ groupAxis ] ).name, "unit": "" ])
-                return_data.put("series", [[
-                        "name": yName,
-                        "x": xAxis,
-                        "y": groupedData[ valueAxis ],
-                        "error": groupedData[ errorName ]
-                ]])
-                
-                return return_data;
+        // TODO: Handle name and unit of fields correctly
+        if(type=="table"){
+            def xAxis = groupedData[ groupAxis ].collect { it.toString() };
+            def yName = parseFieldId( fields[ valueAxis ] ).name;
+
+            def return_data = [:]
+            return_data[ "type" ] = type
+            return_data.put("yaxis", ["title" : yName, "unit" : "" ])
+            return_data.put("xaxis", ["title" : parseFieldId( fields[ groupAxis ] ).name, "unit": "" ])
+            return_data.put("x", [])
+            return_data.put("y", [])
+            return_data.put("data", [])
+            return_data.put("error", [])
+
+            return return_data;
+        } else {
+            def xAxis = groupedData[ groupAxis ].collect { it.toString() };
+            def yName = parseFieldId( fields[ valueAxis ] ).name;
+
+            def return_data = [:]
+            return_data[ "type" ] = type
+            return_data.put("yaxis", ["title" : yName, "unit" : "" ])
+            return_data.put("xaxis", ["title" : parseFieldId( fields[ groupAxis ] ).name, "unit": "" ])
+            return_data.put("series", [[
+                "name": yName,
+                "x": xAxis,
+                "y": groupedData[ valueAxis ],
+                "error": groupedData[ errorName ]
+            ]])
+
+            return return_data;
+        }
         }
 
@@ -826 +844 @@
                 try{
                     TemplateField tf = TemplateField.get(parsedField.id)
-                    if(tf.type=="DOUBLE" || tf.type=="LONG" || tf.type=="DATE" || tf.type=="RELTIME"){
+                    if(tf.type==TemplateFieldType.DOUBLE || tf.type==TemplateFieldType.LONG || tf.type==TemplateFieldType.DATE || tf.type==TemplateFieldType.RELTIME){
+                        println "GSCF templatefield: NUMERICALDATA ("+NUMERICALDATA+") (based on "+tf.type+")"
                         return NUMERICALDATA
                     } else {
+                        println "GSCF templatefield: CATEGORICALDATA ("+CATEGORICALDATA+") (based on "+tf.type+")"
                         return CATEGORICALDATA
                     }