GUI -- TopoView - Linking Oblique module in.

- updated oblique test scenario events.

Change-Id: I590f22fbbc356c564cefe8d87e73fed701d88f98

@@ -28,7 +28,7 @@
     ];
     ];
 
 
     // references to injected services etc.
     // references to injected services etc.
-    var $log, fs, ks, zs, gs, ms, sus, flash, tes, tfs, tps, tis, tss, tts;
+    var $log, fs, ks, zs, gs, ms, sus, flash, tes, tfs, tps, tis, tss, tts, tos;
 
 
     // DOM elements
     // DOM elements
     var ovtopo, svg, defs, zoomLayer, mapG, forceG, noDevsLayer;
     var ovtopo, svg, defs, zoomLayer, mapG, forceG, noDevsLayer;
@@ -52,7 +52,7 @@
             //P: togglePorts,
             //P: togglePorts,
 
 
             //X: [toggleNodeLock, 'Lock / unlock node positions'],
             //X: [toggleNodeLock, 'Lock / unlock node positions'],
-            //Z: [toggleOblique, 'Toggle oblique view (Experimental)'],
+            Z: [tos.toggleOblique, 'Toggle oblique view (Experimental)'],
             L: [tfs.cycleDeviceLabels, 'Cycle device labels'],
             L: [tfs.cycleDeviceLabels, 'Cycle device labels'],
             U: [tfs.unpin, 'Unpin node (hover mouse over)'],
             U: [tfs.unpin, 'Unpin node (hover mouse over)'],
             R: [resetZoom, 'Reset pan / zoom'],
             R: [resetZoom, 'Reset pan / zoom'],
@@ -214,10 +214,11 @@
             'GlyphService', 'MapService', 'SvgUtilService', 'FlashService',
             'GlyphService', 'MapService', 'SvgUtilService', 'FlashService',
             'TopoEventService', 'TopoForceService', 'TopoPanelService',
             'TopoEventService', 'TopoForceService', 'TopoPanelService',
             'TopoInstService', 'TopoSelectService', 'TopoTrafficService',
             'TopoInstService', 'TopoSelectService', 'TopoTrafficService',
+            'TopoObliqueService',
 
 
         function ($scope, _$log_, $loc, $timeout, _fs_, mast,
         function ($scope, _$log_, $loc, $timeout, _fs_, mast,
                   _ks_, _zs_, _gs_, _ms_, _sus_, _flash_,
                   _ks_, _zs_, _gs_, _ms_, _sus_, _flash_,
-                  _tes_, _tfs_, _tps_, _tis_, _tss_, _tts_) {
+                  _tes_, _tfs_, _tps_, _tis_, _tss_, _tts_, _tos_) {
             var self = this,
             var self = this,
                 projection,
                 projection,
                 dim,
                 dim,
@@ -238,10 +239,14 @@
             flash = _flash_;
             flash = _flash_;
             tes = _tes_;
             tes = _tes_;
             tfs = _tfs_;
             tfs = _tfs_;
+            // TODO: consider funnelling actions through TopoForceService...
+            //  rather than injecting references to these 'sub-modules',
+            //  just so we can invoke functions on them.
             tps = _tps_;
             tps = _tps_;
             tis = _tis_;
             tis = _tis_;
             tss = _tss_;
             tss = _tss_;
             tts = _tts_;
             tts = _tts_;
+            tos = _tos_;
 
 
             self.notifyResize = function () {
             self.notifyResize = function () {
                 svgResized(fs.windowSize(mast.mastHeight()));
                 svgResized(fs.windowSize(mast.mastHeight()));

@@ -23,7 +23,7 @@
     'use strict';
     'use strict';
 
 
     // injected refs
     // injected refs
-    var $log, fs, sus, is, ts, flash, tis, tms, tss, tts, fltr,
+    var $log, fs, sus, is, ts, flash, tis, tms, tss, tts, tos, fltr,
         icfg, uplink;
         icfg, uplink;
 
 
     // configuration
     // configuration
@@ -1084,6 +1084,13 @@
         }
         }
     }
     }
 
 
+    function mkObliqueApi(uplink) {
+        return {
+            node: function () { return node; },
+            link: function () { return link; }
+        };
+    }
+
     function mkFilterApi(uplink) {
     function mkFilterApi(uplink) {
         return {
         return {
             node: function () { return node; },
             node: function () { return node; },
@@ -1095,10 +1102,11 @@
     .factory('TopoForceService',
     .factory('TopoForceService',
         ['$log', 'FnService', 'SvgUtilService', 'IconService', 'ThemeService',
         ['$log', 'FnService', 'SvgUtilService', 'IconService', 'ThemeService',
             'FlashService', 'TopoInstService', 'TopoModelService',
             'FlashService', 'TopoInstService', 'TopoModelService',
-            'TopoSelectService', 'TopoTrafficService', 'TopoFilterService',
+            'TopoSelectService', 'TopoTrafficService',
+            'TopoObliqueService', 'TopoFilterService',
 
 
         function (_$log_, _fs_, _sus_, _is_, _ts_, _flash_,
         function (_$log_, _fs_, _sus_, _is_, _ts_, _flash_,
-                  _tis_, _tms_, _tss_, _tts_, _fltr_) {
+                  _tis_, _tms_, _tss_, _tts_, _tos_, _fltr_) {
             $log = _$log_;
             $log = _$log_;
             fs = _fs_;
             fs = _fs_;
             sus = _sus_;
             sus = _sus_;
@@ -1109,6 +1117,7 @@
             tms = _tms_;
             tms = _tms_;
             tss = _tss_;
             tss = _tss_;
             tts = _tts_;
             tts = _tts_;
+            tos = _tos_;
             fltr = _fltr_;
             fltr = _fltr_;
 
 
             icfg = is.iconConfig();
             icfg = is.iconConfig();
@@ -1131,6 +1140,7 @@
                 tms.initModel(mkModelApi(uplink), dim);
                 tms.initModel(mkModelApi(uplink), dim);
                 tss.initSelect(mkSelectApi(uplink));
                 tss.initSelect(mkSelectApi(uplink));
                 tts.initTraffic(mkTrafficApi(uplink));
                 tts.initTraffic(mkTrafficApi(uplink));
+                tos.initOblique(mkObliqueApi(uplink));
                 fltr.initFilter(mkFilterApi(uplink), d3.select('#mast-right'));
                 fltr.initFilter(mkFilterApi(uplink), d3.select('#mast-right'));
 
 
                 settings = angular.extend({}, defaultSettings, opts);
                 settings = angular.extend({}, defaultSettings, opts);
@@ -1167,6 +1177,7 @@
 
 
             function destroyForce() {
             function destroyForce() {
                 fltr.destroyFilter();
                 fltr.destroyFilter();
+                tos.destroyOblique();
                 tts.destroyTraffic();
                 tts.destroyTraffic();
                 tss.destroySelect();
                 tss.destroySelect();
                 tms.destroyModel();
                 tms.destroyModel();

@@ -38,6 +38,11 @@
 
 
     // ==========================
     // ==========================
 
 
+
+    function toggleOblique() {
+        $log.log("TOGGLING OBLIQUE VIEW");
+    }
+
 // === -----------------------------------------------------
 // === -----------------------------------------------------
 // === MODULE DEFINITION ===
 // === MODULE DEFINITION ===
 
 
@@ -57,7 +62,9 @@ angular.module('ovTopo')
 
 
         return {
         return {
             initOblique: initOblique,
             initOblique: initOblique,
-            destroyOblique: destroyOblique
+            destroyOblique: destroyOblique,
+
+            toggleOblique: toggleOblique
         };
         };
     }]);
     }]);
 }());
 }());

@@ -34,9 +34,10 @@ describe('factory: view/topo/topoOblique.js', function() {
 
 
     it('should define api functions', function () {
     it('should define api functions', function () {
         expect(fs.areFunctions(tos, [
         expect(fs.areFunctions(tos, [
-            'initOblique', 'destroyOblique'
+            'initOblique', 'destroyOblique', 'toggleOblique'
         ])).toBeTruthy();
         ])).toBeTruthy();
     });
     });
 
 
     // TODO: more tests...
     // TODO: more tests...
 });
 });
+

@@ -4,8 +4,6 @@
     "lastAuto": 8
     "lastAuto": 8
   },
   },
   "description": [
   "description": [
-    "Test Scenario for Oblique view",
-    "",
-    "Press '=' to load initial events."
+    "Test Scenario for Oblique view"
   ]
   ]
 }
 }