ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-23 01:18:57 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[imagery] fix for issue #1799 (#1814)

Browse Source 
* [imagery] fix for issue #1799
if there is no immediately new imagery incoming, forward to latest image in history on un-pause

* add test to check whether image is forwarded to latest image on un-pause
This commit is contained in:
Deep Tailor
2017-11-22 11:10:53 -08:00
committed by Pete Richards
parent 6bbdfcdfbe
commit cf15ff5c07
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/features/imagery/src/controllers/ImageryController.js
View File

@ -255,6 +255,8 @@ define(
if (this.nextDatum) { if (this.nextDatum) {
this.updateValues(this.nextDatum); this.updateValues(this.nextDatum);
delete this.nextDatum; delete this.nextDatum;
} else {
this.updateValues(this.$scope.imageHistory[this.$scope.imageHistory.length - 1]);
} }
this.autoScroll = true; this.autoScroll = true;
} }

14
platform/features/imagery/test/controllers/ImageryControllerSpec.js
View File

@ -183,6 +183,17 @@ define(
expect(controller.getImageUrl()).toEqual(newUrl); expect(controller.getImageUrl()).toEqual(newUrl);
}); });
it("forwards large image view to latest image in history on un-pause", function () {
$scope.imageHistory = [
{ utc: 1434600258122, url: 'some/url1', selected: false},
{ utc: 1434600258123, url: 'some/url2', selected: false}
];
controller.paused(true);
controller.paused(false);
expect(controller.getImageUrl()).toEqual(controller.getImageUrl($scope.imageHistory[1]));
});
it("subscribes to telemetry", function () { it("subscribes to telemetry", function () {
expect(openmct.telemetry.subscribe).toHaveBeenCalledWith( expect(openmct.telemetry.subscribe).toHaveBeenCalledWith(
newDomainObject, newDomainObject,
@ -227,7 +238,7 @@ define(
expect(controller.updateHistory(mockDatum)).toBe(false); expect(controller.updateHistory(mockDatum)).toBe(false);
}); });
describe("user clicks on imagery thumbnail", function () { describe("when user clicks on imagery thumbnail", function () {
var mockDatum = { utc: 1434600258123, url: 'some/url', selected: false}; var mockDatum = { utc: 1434600258123, url: 'some/url', selected: false};
it("pauses and adds selected class to imagery thumbnail", function () { it("pauses and adds selected class to imagery thumbnail", function () {
@ -248,6 +259,7 @@ define(
expect(controller.getTime()).toEqual(controller.timeFormat.format(mockDatum.utc)); expect(controller.getTime()).toEqual(controller.timeFormat.format(mockDatum.utc));
}); });
}); });
}); });
it("initially shows an empty string for date/time", function () { it("initially shows an empty string for date/time", function () {