Adds support for explore box plots (no SOM support yet). One bug in d…

…c.js: dc-js/dc.js#1120
amergin · Mar 18, 2016 · 9ede0c5 · 9ede0c5
1 parent 48d38ef
commit 9ede0c5
Show file tree

Hide file tree

Showing 7 changed files with 504 additions and 6 deletions.
diff --git a/src/app/vis/menucomponents/new-graphmenu.js b/src/app/vis/menucomponents/new-graphmenu.js
@@ -32,6 +32,9 @@ angular.module('plotter.vis.menucomponents.new-graphmenu',
 
         case 2:
         return { 'type': 'heatmap', 'data': $scope.heatmap.selection };
+
+        case 3:
+        return { 'type': 'boxplot', 'data': $scope.boxplot.selection };
       }
     }
 
@@ -54,6 +57,10 @@ angular.module('plotter.vis.menucomponents.new-graphmenu',
       selection: []
     };
 
+    $scope.boxplot = {
+      selection: []
+    };
+
     // controllers of the menu dialog:
     $scope.canSubmit = function() {
       var selection = getSelection();
@@ -63,7 +70,11 @@ angular.module('plotter.vis.menucomponents.new-graphmenu',
       else if($scope.tab.ind === 1) {
         return _.size(selection.data.x) > 0 &&
         _.size(selection.data.y) > 0;
-      } else if($scope.tab.ind === 2) {
+      } 
+      else if($scope.tab.ind === 2) {
+        return selection.data.length > 0;
+      }
+      else if($scope.tab.ind === 3) {
         return selection.data.length > 0;
       }
     };
@@ -100,6 +111,15 @@ angular.module('plotter.vis.menucomponents.new-graphmenu',
             error = true;
           }
         }
+
+        else if(selection.type == 'boxplot') {
+          dimensionCount = DimensionService.getPrimary().availableDimensionsCount();
+          if(dimensionCount < selection.data.length) {
+            NotifyService.addSticky('Too many selected variables', 'Please select a maximum of ' + dimensionCount + ' variables. You can free variables by first closing unnecessary figure windows on this tab.', 
+              'error', { referenceId: 'graphinfo' });
+            error = true;
+          }
+        }        
         return error;
       }
 
@@ -134,6 +154,9 @@ angular.module('plotter.vis.menucomponents.new-graphmenu',
       },
       {
         label: 'Heatmap'
+      },
+      {
+        label: 'Boxplot'
       }
     ];
 

diff --git a/src/app/vis/menucomponents/new.graphmenu.tpl.html b/src/app/vis/menucomponents/new.graphmenu.tpl.html
@@ -3,7 +3,7 @@
 		<tab select="selectTab(0)">
 			<tab-heading>Histogram</tab-heading>
 			<h1>Histogram</h1>
-			<div class="multiple-variable-selection" re-selection="histogram.selection" re-mode="'multi'"></div>		
+			<div class="multiple-variable-selection" re-selection="histogram.selection" re-mode="'multi'"></div>	
 		</tab>
 		<tab select="selectTab(1)">
 			<tab-heading>Scatterplot</tab-heading>
@@ -23,6 +23,11 @@ <h1>Heatmap</h1>
 				</div>
 			</div>
 		</tab>
+		<tab select="selectTab(3)">
+			<tab-heading>Box plot</tab-heading>
+			<h1>Box plot</h1>
+			<div class="multiple-variable-selection" re-selection="boxplot.selection" re-mode="'multi'"></div>	
+		</tab>
 	</tabset>
 	<div class="row col-sm-12 text-center">
 		<div growl inline="true" limit-messages="4" reference="graphinfo" class="am-fade"></div>