Compatibility with new ggplotd

BlackEdder · Jun 6, 2016 · 47e9bc2 · 47e9bc2
1 parent cd74890
commit 47e9bc2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/dub.json b/dub.json
@@ -9,7 +9,7 @@
     "excludedSourceFiles": ["source/main.d"],
     "targetPath": "bin",
     "dependencies": {
-        "ggplotd": ">=0.9.0",
+        "ggplotd": ">=0.9.3",
         "dunit": "~>1.0.11",
         "docopt": ">=0.6.1-b.4"
     },

diff --git a/source/plotcli/data.d b/source/plotcli/data.d
@@ -16,12 +16,12 @@ import plotcli.options : Options, OptionRange;
 auto aesDefaults()
 {
     import ggplotd.aes : DefaultValues, merge;
-    return DefaultValues.merge(Tuple!(double, "x", double, "y",
-        string, "colour", string, "plotID", string, "type", 
+    return DefaultValues.merge(Tuple!(string, "plotID", string, "type", 
         string, "plotname", string, "format", string, "xlabel", string, "ylabel",
-        string, "colourgradient")
-        ( double.init, double.init, "black", "", "point", "plotcli", 
-        "png", "x", "y", "default") ); 
+        string, "colourgradient", double, "x", double, "y",
+        string, "colour", )
+        ( "", "point", "plotcli", 
+        "png", "x", "y", "default", double.init, double.init, "black" ) ); 
 }
 
 private int safeToIndex( string str )