Remove "not" from example specs

vega · Jun 9, 2017 · a789df8 · a789df8
1 parent 07bc048
commit a789df8
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 37 deletions.
diff --git a/examples/specs/brush.vl.json b/examples/specs/brush.vl.json
@@ -12,8 +12,8 @@
     "x": {"field": "Horsepower", "type": "quantitative"},
     "y": {"field": "Miles_per_Gallon", "type": "quantitative"},
     "color": {
-      "condition": {"selection": {"not": "brush"}, "value": "grey"},
-      "field": "Cylinders", "type": "ordinal"
+      "condition": {"selection": "brush", "field": "Cylinders", "type": "ordinal"},
+      "value": "grey"
     }
   }
 }
diff --git a/examples/specs/interactive_splom.vl.json b/examples/specs/interactive_splom.vl.json
@@ -31,10 +31,11 @@
         "type": "quantitative"
       },
       "color": {
-        "field": "Origin","type": "nominal",
         "condition": {
-          "selection": {"not": "brush"}, "value": "grey"
-        }
+          "selection": "brush",
+          "field": "Origin","type": "nominal"
+        },
+        "value": "grey"
       }
     }
   }

diff --git a/examples/specs/layered_selections.vl.json b/examples/specs/layered_selections.vl.json
@@ -36,8 +36,8 @@
       "x": {"field": "Horsepower", "type": "quantitative"},
       "y": {"field": "Miles_per_Gallon", "type": "quantitative"},
       "color": {
-        "condition": {"selection": {"not": "brush"}, "value": "grey"},
-        "field": "Cylinders", "type": "ordinal"
+        "condition": {"selection": "brush", "field": "Cylinders", "type": "ordinal"},
+        "value": "grey"
       },
       "size": {
         "value": 50,

diff --git a/examples/specs/query_widgets.vl.json b/examples/specs/query_widgets.vl.json
@@ -18,8 +18,8 @@
       "x": {"field": "Horsepower", "type": "quantitative"},
       "y": {"field": "Miles_per_Gallon", "type": "quantitative"},
       "color": {
-        "field": "Origin", "type": "nominal",
-        "condition": {"selection": {"not": "CylYr"}, "value": "grey"}
+        "condition": {"selection": "CylYr", "field": "Origin", "type": "nominal"},
+        "value": "grey"
       }
     }
   }, {

diff --git a/examples/vg-specs/brush.vg.json b/examples/vg-specs/brush.vg.json
@@ -344,12 +344,12 @@
                     },
                     "stroke": [
                         {
-                            "test": "!(vlInterval(\"brush_store\", \"\", datum, \"union\", \"all\"))",
-                            "value": "grey"
-                        },
-                        {
+                            "test": "vlInterval(\"brush_store\", \"\", datum, \"union\", \"all\")",
                             "scale": "color",
                             "field": "Cylinders"
+                        },
+                        {
+                            "value": "grey"
                         }
                     ],
                     "fill": {

diff --git a/examples/vg-specs/interactive_splom.vg.json b/examples/vg-specs/interactive_splom.vg.json
@@ -505,12 +505,12 @@
                             },
                             "stroke": [
                                 {
-                                    "test": "!(vlInterval(\"brush_store\", \"child_Horsepower_Horsepower_\", datum, \"union\", \"all\"))",
-                                    "value": "grey"
-                                },
-                                {
+                                    "test": "vlInterval(\"brush_store\", \"child_Horsepower_Horsepower_\", datum, \"union\", \"all\")",
                                     "scale": "color",
                                     "field": "Origin"
+                                },
+                                {
+                                    "value": "grey"
                                 }
                             ],
                             "fill": {
@@ -1063,12 +1063,12 @@
                             },
                             "stroke": [
                                 {
-                                    "test": "!(vlInterval(\"brush_store\", \"child_Horsepower_Miles_per_Gallon_\", datum, \"union\", \"all\"))",
-                                    "value": "grey"
-                                },
-                                {
+                                    "test": "vlInterval(\"brush_store\", \"child_Horsepower_Miles_per_Gallon_\", datum, \"union\", \"all\")",
                                     "scale": "color",
                                     "field": "Origin"
+                                },
+                                {
+                                    "value": "grey"
                                 }
                             ],
                             "fill": {
@@ -1622,12 +1622,12 @@
                             },
                             "stroke": [
                                 {
-                                    "test": "!(vlInterval(\"brush_store\", \"child_Acceleration_Horsepower_\", datum, \"union\", \"all\"))",
-                                    "value": "grey"
-                                },
-                                {
+                                    "test": "vlInterval(\"brush_store\", \"child_Acceleration_Horsepower_\", datum, \"union\", \"all\")",
                                     "scale": "color",
                                     "field": "Origin"
+                                },
+                                {
+                                    "value": "grey"
                                 }
                             ],
                             "fill": {
@@ -2181,12 +2181,12 @@
                             },
                             "stroke": [
                                 {
-                                    "test": "!(vlInterval(\"brush_store\", \"child_Acceleration_Miles_per_Gallon_\", datum, \"union\", \"all\"))",
-                                    "value": "grey"
-                                },
-                                {
+                                    "test": "vlInterval(\"brush_store\", \"child_Acceleration_Miles_per_Gallon_\", datum, \"union\", \"all\")",
                                     "scale": "color",
                                     "field": "Origin"
+                                },
+                                {
+                                    "value": "grey"
                                 }
                             ],
                             "fill": {

diff --git a/examples/vg-specs/layered_selections.vg.json b/examples/vg-specs/layered_selections.vg.json
@@ -616,12 +616,12 @@
                     },
                     "fill": [
                         {
-                            "test": "!(vlInterval(\"brush_store\", \"layer_1_\", datum, \"union\", \"all\"))",
-                            "value": "grey"
-                        },
-                        {
+                            "test": "vlInterval(\"brush_store\", \"layer_1_\", datum, \"union\", \"all\")",
                             "scale": "color",
                             "field": "Cylinders"
+                        },
+                        {
+                            "value": "grey"
                         }
                     ],
                     "size": [

diff --git a/examples/vg-specs/query_widgets.vg.json b/examples/vg-specs/query_widgets.vg.json
@@ -190,12 +190,12 @@
                     },
                     "fill": [
                         {
-                            "test": "!(vlPoint(\"CylYr_store\", \"layer_0_\", datum, \"union\", \"all\"))",
-                            "value": "grey"
-                        },
-                        {
+                            "test": "vlPoint(\"CylYr_store\", \"layer_0_\", datum, \"union\", \"all\")",
                             "scale": "color",
                             "field": "Origin"
+                        },
+                        {
+                            "value": "grey"
                         }
                     ],
                     "shape": {