Merge branch 'open1515' into open115

platform/features/plot/src/PlotController.js

@@ -65,6 +65,8 @@ define(
                 subPlotFactory = new SubPlotFactory(telemetryFormatter),
                 cachedObjects = [],
                 updater,
+                lastBounds,
+                throttledRequery,
                 handle;
 
             // Populate the scope with axis information (specifically, options
@@ -94,6 +96,17 @@ define(
                 }
             }
 
+            // Change the displayable bounds
+            function setBasePanZoom(bounds) {
+                var start = bounds.start,
+                    end = bounds.end;
+                if (updater) {
+                    updater.setDomainBounds(start, end);
+                    self.update();
+                }
+                lastBounds = bounds;
+            }
+
             // Reinstantiate the plot updater (e.g. because we have a
             // new subscription.) This will clear the plot.
             function recreateUpdater() {
@@ -107,10 +120,15 @@ define(
                     handle,
                     ($scope.axes[1].active || {}).key
                 );
+                // Keep any externally-provided bounds
+                if (lastBounds) {
+                    setBasePanZoom(lastBounds);
+                }
             }
 
             // Handle new telemetry data in this plot
             function updateValues() {
+                self.pending = false;
                 if (handle) {
                     setupModes(handle.getTelemetryObjects());
                 }
@@ -126,6 +144,7 @@ define(
 
             // Display new historical data as it becomes available
             function addHistoricalData(domainObject, series) {
+                self.pending = false;
                 updater.addHistorical(domainObject, series);
                 self.modeOptions.getModeHandler().plotTelemetry(updater);
                 self.update();
@@ -165,6 +184,19 @@ define(
                 }
             }
 
+            // Respond to a display bounds change (requery for data)
+            function changeDisplayBounds(event, bounds) {
+                self.pending = true;
+                releaseSubscription();
+                throttledRequery();
+                setBasePanZoom(bounds);
+            }
+
+            // Reestablish/reissue request for telemetry
+            throttledRequery = throttle(function () {
+                subscribe($scope.domainObject);
+            }, 250);
+
             this.modeOptions = new PlotModeOptions([], subPlotFactory);
             this.updateValues = updateValues;
 
@@ -174,12 +206,19 @@ define(
                     .forEach(updateSubplot);
             });
 
+            self.pending = true;
+
             // Subscribe to telemetry when a domain object becomes available
             $scope.$watch('domainObject', subscribe);
 
+            // Respond to external bounds changes
+            $scope.$on("telemetry:display:bounds", changeDisplayBounds);
+
             // Unsubscribe when the plot is destroyed
             $scope.$on("$destroy", releaseSubscription);
 
+            // Notify any external observers that a new telemetry view is here
+            $scope.$emit("telemetry:view");
         }
 
         /**
@@ -275,7 +314,7 @@ define(
         PlotController.prototype.isRequestPending = function () {
             // Placeholder; this should reflect request state
             // when requesting historical telemetry
-            return false;
+            return this.pending;
         };
 
         return PlotController;

platform/features/plot/src/elements/PlotPanZoomStackGroup.js

@@ -143,8 +143,7 @@ define(
         PlotPanZoomStackGroup.prototype.getDepth = function () {
             // All stacks are kept in sync, so look up depth
             // from the first one.
-            return this.stacks.length > 0 ?
-                this.stacks[0].getDepth() : 0;
+            return this.stacks.length > 0 ? this.stacks[0].getDepth() : 0;
         };
 
         /**

platform/features/plot/src/elements/PlotUpdater.js

@@ -141,10 +141,10 @@ define(
         PlotUpdater.prototype.initializeDomainOffset = function (values) {
             this.domainOffset =
                 ((this.domainOffset === undefined) && (values.length > 0)) ?
-                    (values.reduce(function (a, b) {
-                        return (a || 0) + (b || 0);
-                    }, 0) / values.length) :
-                    this.domainOffset;
+                        (values.reduce(function (a, b) {
+                            return (a || 0) + (b || 0);
+                        }, 0) / values.length) :
+                        this.domainOffset;
         };
 
         // Expand range slightly so points near edges are visible
@@ -159,7 +159,10 @@ define(
 
         // Update dimensions and origin based on extrema of plots
         PlotUpdater.prototype.updateBounds = function () {
-            var bufferArray = this.bufferArray;
+            var bufferArray = this.bufferArray,
+                priorDomainOrigin = this.origin[0],
+                priorDomainDimensions = this.dimensions[0];
+
             if (bufferArray.length > 0) {
                 this.domainExtrema = bufferArray.map(function (lineBuffer) {
                     return lineBuffer.getDomainExtrema();
@@ -178,6 +181,18 @@ define(
                 // Enforce some minimum visible area
                 this.expandRange();
 
+                // Suppress domain changes when pinned
+                if (this.hasSpecificDomainBounds) {
+                    this.origin[0] = priorDomainOrigin;
+                    this.dimensions[0] = priorDomainDimensions;
+                    if (this.following) {
+                        this.origin[0] = Math.max(
+                            this.domainExtrema[1] - this.dimensions[0],
+                            this.origin[0]
+                        );
+                    }
+                }
+
                 // ...then enforce a fixed duration if needed
                 if (this.fixedDuration !== undefined) {
                     this.origin[0] = this.origin[0] + this.dimensions[0] -
@@ -281,6 +296,21 @@ define(
             return this.bufferArray;
         };
 
+        /**
+         * Set the start and end boundaries (usually time) for the
+         * domain axis of this updater.
+         */
+        PlotUpdater.prototype.setDomainBounds = function (start, end) {
+            this.fixedDuration = end - start;
+            this.origin[0] = start;
+            this.dimensions[0] = this.fixedDuration;
+
+            // Suppress follow behavior if we have windowed in on the past
+            this.hasSpecificDomainBounds = true;
+            this.following =
+                !this.domainExtrema || (end >= this.domainExtrema[1]);
+        };
+
         /**
          * Fill in historical data.
          */

platform/features/plot/test/PlotControllerSpec.js

@@ -45,11 +45,19 @@ define(
                 };
             }
 
+            function fireEvent(name, args) {
+                mockScope.$on.calls.forEach(function (call) {
+                    if (call.args[0] === name) {
+                        call.args[1].apply(null, args || []);
+                    }
+                });
+            }
+
 
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    [ "$watch", "$on" ]
+                    [ "$watch", "$on", "$emit" ]
                 );
                 mockFormatter = jasmine.createSpyObj(
                     "formatter",
@@ -87,6 +95,7 @@ define(
                 mockHandle.getMetadata.andReturn([{}]);
                 mockHandle.getDomainValue.andReturn(123);
                 mockHandle.getRangeValue.andReturn(42);
+                mockScope.domainObject = mockDomainObject;
 
                 controller = new PlotController(
                     mockScope,
@@ -212,7 +221,12 @@ define(
             });
 
             it("indicates if a request is pending", function () {
-                // Placeholder; need to support requesting telemetry
+                mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
+                expect(controller.isRequestPending()).toBeTruthy();
+                mockHandle.request.mostRecentCall.args[1](
+                    mockDomainObject,
+                    mockSeries
+                );
                 expect(controller.isRequestPending()).toBeFalsy();
             });
 
@@ -233,10 +247,20 @@ define(
                 // Also verify precondition
                 expect(mockHandle.unsubscribe).not.toHaveBeenCalled();
                 // Destroy the scope
-                mockScope.$on.mostRecentCall.args[1]();
+                fireEvent("$destroy");
                 // Should have unsubscribed
                 expect(mockHandle.unsubscribe).toHaveBeenCalled();
             });
+
+            it("requeries when displayable bounds change", function () {
+                mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
+                expect(mockHandle.request.calls.length).toEqual(1);
+                fireEvent("telemetry:display:bounds", [
+                    {},
+                    { start: 10, end: 100 }
+                ]);
+                expect(mockHandle.request.calls.length).toEqual(2);
+            });
         });
     }
 );