GraphsViewer: update dimple version to 2.1.0

pydio · Sep 4, 2014 · f213364 · f213364
1 parent f969605
commit f213364
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4,443 deletions.
diff --git a/core/src/plugins/editor.ajxp_graphs/class.GraphsViewer.js b/core/src/plugins/editor.ajxp_graphs/class.GraphsViewer.js
@@ -131,9 +131,9 @@ Class.create("GraphsViewer", AbstractEditor, {
             if(qData["DIAGRAM"] && qData["DIAGRAM"] == "pie"){
                 chart.addMeasureAxis("p", qData['AXIS']['x']);
             }else if(qData["DIRECTION"] && qData["DIRECTION"] == "horizontal"){
+                chart.setMargins('40%', 20, 40, 80);
                 chart.addMeasureAxis("x", qData['AXIS']['x']);
                 chart.addCategoryAxis("y", qData['AXIS']['y']);
-                chart.setMargins('40%', 20, 40, 80);
             }else{
                 // Default vertical bars
                 chart.addCategoryAxis("x", qData['AXIS']['x']);
@@ -147,10 +147,11 @@ Class.create("GraphsViewer", AbstractEditor, {
                         ring.innerRadius = qData["PIE_RING"];
                     }
                 }else{
-                    chart.addSeries(null, dimple.plot[qData["DIAGRAM"]]);
+                    chart.addSeries(qData['AXIS']['y'], dimple.plot[qData["DIAGRAM"]]);
                 }
             }else{
-                chart.addSeries(null, dimple.plot.line);
+                var s = chart.addSeries(null, dimple.plot.line);
+                s.interpolation = 'cardinal';
             }
             chart.draw();
             div.insert({top:('<div class="innerTitle">'+qData['LABEL']+'</div>')});

diff --git a/core/src/plugins/editor.ajxp_graphs/manifest.xml b/core/src/plugins/editor.ajxp_graphs/manifest.xml
@@ -8,7 +8,7 @@
 	<client_settings>
         <resources>
             <js file="plugins/editor.ajxp_graphs/res/js/d3.min.js" className="d3" />
-            <js file="plugins/editor.ajxp_graphs/res/js/dimple.v1.1.5.js" className="dimple" />
+            <js file="plugins/editor.ajxp_graphs/res/js/dimple.v2.1.0.min.js" className="dimple" />
             <js file="plugins/editor.ajxp_graphs/class.GraphsViewer.js" className="GraphsViewer"/>
             <css file="plugins/editor.ajxp_role/rolesEditor.css" />
             <css file="plugins/editor.ajxp_graphs/res/css/graphsViewer.css" />