#25 connect selection controller to tool bar

gyuque · Feb 3, 2014 · 7150dcb · 7150dcb
1 parent 78b385e
commit 7150dcb
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/inner/js/Mobmap2App.js b/inner/js/Mobmap2App.js
@@ -146,6 +146,10 @@ if (!window.mobmap) { window.mobmap={}; }
 			this.selectionController.clear();
 		},
 
+		getSelectionController: function() {
+			return this.selectionController;
+		},
+
 		// -----------------------------------------------------
 		// Screen builder
 		setupScreen: function() {
@@ -160,6 +164,7 @@ if (!window.mobmap) { window.mobmap={}; }
 			var targetPaneElement = this.appScreen.getToolsPaneElement();
 			this.toolPane = new mobmap.ToolPane(targetPaneElement);
 			this.toolPane.observeContainerEvents(this.appScreen);
+			this.toolPane.connectToSelectionController(this.selectionController);
 		},
 
 		setupMapPane: function() {

diff --git a/inner/js/selection/selection-controller.js b/inner/js/selection/selection-controller.js
@@ -24,12 +24,38 @@ if (!window.mobmap) { window.mobmap={}; }
 
 			this.responders.push(r);
 			return true;
+		},
+
+		startRectSelectionSession: function() {
+
+		},
+
+		fireNewSession: function() { this.callResponders('selWillStartNewSession'); },
+
+		callResponders: function(methodName, arg1, arg2) {
+			var required = SelectionControllerResponderMethodList[methodName] || false;
+			var ls = this.responders;
+			var len = ls.length;
+
+			for (var i = 0;i < len;++i) {
+				var recv = ls[i];
+				var hasMethod = !!recv[methodName];
+
+				if (!hasMethod && required) {
+					throw "Responder must implement " + methodName;
+				}
+
+				if (hasMethod) {
+					recv[methodName](arg1, arg2);
+				}
+			}
 		}
 	};
 
 	var SelectionControllerResponderMethodList = {
-		// name          | required
-		selWillStart     : false
+		// name                       | required
+		selWillDisposeCurrentSession  : false,
+		selWillStartNewSession        : false
 	};
 
 	aGlobal.mobmap.SelectionController = SelectionController;

diff --git a/inner/js/ui/tool-pane.js b/inner/js/ui/tool-pane.js
@@ -38,6 +38,10 @@ if (!window.mobmap) { window.mobmap={}; }
 			this.controlPanel.setApp(a);
 			this.editToolBar.setApp(a);
 		},
+
+		connectToSelectionController: function(selcon) {
+			selcon.addResponder(this.editToolBar);
+		},
 
 		observeContainerEvents: function(app3PanesView) {
 			app3PanesView.eventDispatcher().bind(mobmap.Mobmap3PanesScreen.RESIZE_EVENT,