Changeset 2065

Timestamp:

Oct 17, 2011, 2:52:48 PM (12 years ago)

Author:

tjeerd@…

Message:

VIS-42, changed the way the valueAxis is sorted. Also made the padding in the graphs larger

Location:

trunk

Files:

• grails-app/controllers/dbnp/visualization/VisualizeController.groovy (modified) (1 diff)
• web-app/js/visualization.js (modified) (4 diffs)

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

@@ -689 +689 @@
         } else {
             groupedData[ groupAxis ].eachWithIndex { group, i ->
-                combined << [ "group": group, "value": groupedData[ valueAxis ][ i ] ]
-            }
-            combined.sort { it.group.toString() }
+                combined << [ "group": (groupAxisType==CATEGORICALDATA ? group.toString() : group), "value": groupedData[ valueAxis ][ i ] ]
+            }
+            combined.sort { it.group }
             groupedData[groupAxis] = renderTimesAndDatesHumanReadable(combined*.group, groupAxisType)
             groupedData[valueAxis] = renderTimesAndDatesHumanReadable(combined*.value, valueAxisType)

trunk/web-app/js/visualization.js

@@ -261 +261 @@
                                     labelRenderer: $.jqplot.CanvasAxisLabelRenderer
                                 }
+                            },
+                            axesDefaults: {
+                                pad: 1.4
                             }
 
@@ -294 +297 @@
                                     formatString:'%.2f'
                                 }
+                            },
+                            axesDefaults: {
+                                pad: 1.4
                             }
                         };
@@ -321 +327 @@
                                     formatString:'%.2f'
                                 }
+                            },
+                            axesDefaults: {
+                                pad: 1.4
                             }
                         };                              
@@ -357 +366 @@
                                     formatString:'%.2f'
                                 }
+                            },
+                            axesDefaults: {
+                                pad: 1.4
                             }