Merge pull request #14 from Caleydo/add-gapminder-tracking

Add Gapminder Tracking
Caleydo · Mar 23, 2018 · 4657a51 · 4657a51
2 parents 6712606 + 43ca7be
commit 4657a51
Show file tree

Hide file tree

Showing 4 changed files with 288 additions and 125 deletions.
diff --git a/data/gapminder/gapminder.vg.json b/data/gapminder/gapminder.vg.json
@@ -70,50 +70,106 @@
       ]
     },
     {
-      "name": "trackCountries",
+      "name": "selectedCountries",
       "on": [
-        {"trigger": "active", "toggle": "{country: active.country}"}
+        {"trigger": "clear", "remove": true},
+        {"trigger": "!shift", "remove": true},
+        {"trigger": "!shift && clicked", "insert": "clicked"},
+        {"trigger": "shift && clicked", "toggle": "clicked"}
       ]
     }
   ],
 
   "signals": [
     {
-      "name": "active",
-      "value": {},
+      "name": "selectedCountries",
       "on": [
-        {"events": "@point:mousedown, @point:touchstart", "update": "datum"},
-        {"events": "window:mouseup, window:touchend", "update": "{}"}
+        {"events": {"signal": "clicked"}, "update": "null", "force": true}
+      ],
+      "track": {
+        "async": [
+          {"data": "selectedCountries", "as": "allCountries"},
+          {"signal": "clicked", "as": "lastCountry"}
+        ],
+        "title": "Selected {{lastCountry.country}} ({{allCountries.length}} Countries)",
+        "category": "selection",
+        "operation": "update"
+      }
+    },
+    {
+      "name": "clear",
+      "value": true,
+      "on": [
+        {"events": "mouseup[!event.item]", "update": "true", "force": true}
+      ],
+      "track": {
+        "async": [],
+        "title": "No Countries Selected",
+        "category": "selection",
+        "operation": "update"
+      }
+    },
+    {
+      "name": "shift",
+      "value": false,
+      "on": [
+        {"events": "@point:click", "update": "event.shiftKey", "force": true}
+      ]
+    },
+    {
+      "name": "clicked",
+      "value": null,
+      "on": [
+        {"events": "@point:click", "update": "datum", "force": true}
       ]
     },
     {
       "name": "currentYear",
       "value": 1980,
-      "on":[{
-        "events": "mousemove, touchmove",
-        "update": "currentYear"
-      }],
-      "bind": {"input": "range", "min": 1800, "max": 2015, "step": 1}
+      "bind": {"input": "range", "min": 1800, "max": 2015, "step": 1},
+      "track": {
+        "title": "Selected Year {{value}}"
+      }
     },
     {
       "name": "xField",
       "value": "fertility",
-      "bind": {"input": "select", "options": ["gdp", "child_mortality", "fertility", "life_expect", "population"]}
+      "bind": {"input": "select", "options": ["gdp", "child_mortality", "fertility", "life_expect", "population"]},
+      "track": {
+        "title": "X = {{value}}",
+        "category": "data",
+        "operation": "update"
+      }
     },
     {
       "name": "yField",
       "value": "life_expect",
-      "bind": {"input": "select", "options": ["gdp", "child_mortality", "fertility", "life_expect", "population"]}
+      "bind": {"input": "select", "options": ["gdp", "child_mortality", "fertility", "life_expect", "population"]},
+      "track": {
+        "title": "Y = {{value}}",
+        "category": "data",
+        "operation": "update"
+      }
     },
     {
       "name": "sizeField",
       "value": "population",
-      "bind": {"input": "select", "options": ["gdp", "child_mortality", "fertility", "life_expect", "population"]}
+      "bind": {"input": "select", "options": ["gdp", "child_mortality", "fertility", "life_expect", "population"]},
+      "track": {
+        "title": "Size = {{value}}",
+        "category": "data",
+        "operation": "update"
+      }
     },
     {
       "name": "colorField",
       "value": "continent",
-      "bind": {"input": "select", "options": ["continent", "main_religion"]}
+      "bind": {"input": "select", "options": ["continent", "main_religion"]},
+      "track": {
+        "title": "Color = {{value}}",
+        "category": "data",
+        "operation": "update"
+      }
     }
   ],
 
@@ -204,7 +260,7 @@
           "size": {"scale": "size", "field": "size"},
           "fillOpacity": [
             {
-              "test": "indata('trackCountries', 'country', datum.country)",
+              "test": "indata('selectedCountries', 'country', datum.country)",
               "value": 1
             },
             {"value": 0.5}
@@ -236,7 +292,7 @@
           "y": {"scale": "y", "field": "y", "offset": -7},
           "fillOpacity": [
             {
-              "test": "indata('trackCountries', 'country', datum.country)",
+              "test": "indata('selectedCountries', 'country', datum.country)",
               "value": 0.8
             },
             {"value": 0}