Tutorial packages

index.html

@@ -25,16 +25,18 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title></title>
+    <script src="openmct-tutorial/lib/http.js">
+    </script>
     <script src="bower_components/requirejs/require.js">
     </script>
+    <script src="openmct-tutorial/dictionary-plugin.js">
+    </script>
+    <script src="openmct-tutorial/realtime-telemetry-plugin.js">
+    </script>
+    <script src="openmct-tutorial/historical-telemetry-plugin.js">
+    </script>
     <script>
-        require([
-            'openmct',
-            'src/plugins/conductor/plugin'
-        ], function (
-            openmct,
-            ConductorService
-        ) {
+        require(['openmct'], function (openmct) {
             [
                 'example/imagery',
                 'example/eventGenerator'
@@ -46,26 +48,9 @@
             openmct.install(openmct.plugins.Espresso());
             openmct.install(openmct.plugins.Generator());
             openmct.install(openmct.plugins.UTCTimeSystem());
-
-            /*
-                Will be installed by default...somehow
-             */
-            //openmct.install(ConductorService());
-
-            var ONE_MINUTE = 60 * 1000;
-            var ONE_YEAR = 365 * 24 * 60 * 60 * 1000;
-
-            // Will also provide a default configuration based on enabled time
-            // systems and tick sources.
-            openmct.install(openmct.plugins.Conductor({
-                menuOptions: [
-                    // Default 'fixed' configuration shows last 30 mins of data. May also provide specific bounds.
-                    {timeSystems: ['utc'], defaultDeltas: {start: 30 * ONE_MINUTE, end: 0}, zoomOutLimit: ONE_YEAR, zoomInLimit: ONE_MINUTE},
-                    // Some tick source driven menu options
-                    {tickSource: 'localClock', timeSystems: ['utc'], defaultDeltas: {start: 15 * ONE_MINUTE, end: 0}, zoomOutLimit: ONE_YEAR, zoomInLimit: ONE_MINUTE},
-                    {tickSource: 'latestAvailable', timeSystems: ['utc'], defaultDeltas: {start: 15 * 60 * 1000, end: 0}}
-                ]
-            }));
+            openmct.install(DictionaryPlugin());
+            openmct.install(RealtimeTelemetryPlugin());
+            openmct.install(HistoricalTelemetryPlugin());
             openmct.start();
         });
     </script>

platform/features/conductor/compatibility/bundle.js

@@ -21,11 +21,9 @@
  *****************************************************************************/
 
 define([
-    "./src/ConductorTelemetryDecorator",
     "./src/ConductorRepresenter",
     'legacyRegistry'
 ], function (
-    ConductorTelemetryDecorator,
     ConductorRepresenter,
     legacyRegistry
 ) {
@@ -39,16 +37,6 @@ define([
                         "openmct"
                     ]
                 }
-            ],
-            "components": [
-                {
-                    "type": "decorator",
-                    "provides": "telemetryService",
-                    "implementation": ConductorTelemetryDecorator,
-                    "depends": [
-                        "openmct"
-                    ]
-                }
             ]
         }
     });

platform/features/conductor/compatibility/src/ConductorTelemetryDecorator.js

@@ -1,87 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    function () {
-
-        /**
-         * Decorates the `telemetryService` such that requests are
-         * mediated by the time conductor. This is a modified version of the
-         * decorator used in the old TimeConductor that integrates with the
-         * new TimeConductor API.
-         *
-         * @constructor
-         * @memberof platform/features/conductor
-         * @implements {TelemetryService}
-         * @param {platform/features/conductor.TimeConductor} conductor
-         *        the service which exposes the global time conductor
-         * @param {TelemetryService} telemetryService the decorated service
-         */
-        function ConductorTelemetryDecorator(openmct, telemetryService) {
-            this.conductor = openmct.conductor;
-            this.telemetryService = telemetryService;
-
-            this.amendRequests = ConductorTelemetryDecorator.prototype.amendRequests.bind(this);
-        }
-
-        function amendRequest(request, bounds, timeSystem) {
-            request = request || {};
-            request.start = bounds.start;
-            request.end = bounds.end;
-            request.domain = timeSystem.metadata.key;
-
-            return request;
-        }
-
-        ConductorTelemetryDecorator.prototype.amendRequests = function (requests) {
-            var bounds = this.conductor.bounds(),
-                timeSystem = this.conductor.timeSystem();
-
-            return (requests || []).map(function (request) {
-                return amendRequest(request, bounds, timeSystem);
-            });
-        };
-
-        ConductorTelemetryDecorator.prototype.requestTelemetry = function (requests) {
-            return this.telemetryService
-                .requestTelemetry(this.amendRequests(requests));
-        };
-
-        ConductorTelemetryDecorator.prototype.subscribe = function (callback, requests) {
-            var unsubscribeFunc = this.telemetryService.subscribe(callback, this.amendRequests(requests)),
-                conductor = this.conductor,
-                self = this;
-
-            function amendRequests() {
-                return self.amendRequests(requests);
-            }
-
-            conductor.on('bounds', amendRequests);
-            return function () {
-                unsubscribeFunc();
-                conductor.off('bounds', amendRequests);
-            };
-        };
-
-        return ConductorTelemetryDecorator;
-    }
-);

platform/features/table/src/TelemetryCollection.js

@@ -112,6 +112,22 @@ define(
             this.lastBounds = bounds;
         };
 
+        /**
+         * Determines is a given telemetry datum is within the bounds currently
+         * defined for this telemetry collection.
+         * @private
+         * @param datum
+         * @returns {boolean}
+         */
+        TelemetryCollection.prototype.inBounds = function (datum) {
+            var noBoundsDefined = !this.lastBounds || (this.lastBounds.start === undefined && this.lastBounds.end === undefined);
+            var withinBounds =
+                _.get(datum, this.sortField) >= this.lastBounds.start &&
+                _.get(datum, this.sortField) <= this.lastBounds.end;
+
+            return noBoundsDefined || withinBounds;
+        };
+
         /**
          * Adds an individual item to the collection. Used internally only
          * @private
@@ -157,10 +173,9 @@ define(
                 // based on time stamp because the array is guaranteed ordered due
                 // to sorted insertion.
                 var startIx = _.sortedIndex(array, item, this.sortField);
-                var endIx;
 
                 if (startIx !== array.length) {
-                    endIx = _.sortedLastIndex(array, item, this.sortField);
+                    var endIx = _.sortedLastIndex(array, item, this.sortField);
 
                     // Create an array of potential dupes, based on having the
                     // same time stamp
@@ -170,7 +185,7 @@ define(
                 }
 
                 if (!isDuplicate) {
-                    array.splice(endIx || startIx, 0, item);
+                    array.splice(startIx, 0, item);
 
                     //Return true if it was added and in bounds
                     return array === this.telemetry;

platform/features/table/src/controllers/MCTTableController.js

@@ -425,38 +425,6 @@ define(
             }
         };
 
-        /**
-         * Finds the correct insertion point for a new row, which takes into
-         * account duplicates to make sure new rows are inserted in a way that
-         * maintains arrival order.
-         *
-         * @private
-         * @param {Array} searchArray
-         * @param {Object} searchElement Object to find the insertion point for
-         */
-        MCTTableController.prototype.findInsertionPoint = function (searchArray, searchElement) {
-            //First, use a binary search to find the correct insertion point
-            var index = this.binarySearch(searchArray, searchElement, 0, searchArray.length - 1);
-            var testIndex = index;
-
-            //It's possible that the insertion point is a duplicate of the element to be inserted
-            var isDupe = function () {
-                return this.sortComparator(searchElement,
-                        searchArray[testIndex][this.$scope.sortColumn].text) === 0;
-            }.bind(this);
-
-            // In the event of a duplicate, scan left or right (depending on
-            // sort order) to find an insertion point that maintains order received
-            while (testIndex >= 0 && testIndex < searchArray.length && isDupe()) {
-                if (this.$scope.sortDirection === 'asc') {
-                    index = ++testIndex;
-                } else {
-                    index = testIndex--;
-                }
-            }
-            return index;
-        };
-
         /**
          * @private
          */
@@ -471,9 +439,9 @@ define(
                 case -1:
                     return this.binarySearch(searchArray, searchElement, min,
                         sampleAt - 1);
-                case 0:
+                case 0 :
                     return sampleAt;
-                case 1:
+                case 1 :
                     return this.binarySearch(searchArray, searchElement,
                         sampleAt + 1, max);
             }
@@ -490,7 +458,7 @@ define(
                 index = array.length;
             } else {
                 //Sort is enabled, perform binary search to find insertion point
-                index = this.findInsertionPoint(array, element[this.$scope.sortColumn].text);
+                index = this.binarySearch(array, element[this.$scope.sortColumn].text, 0, array.length - 1);
             }
             if (index === -1) {
                 array.unshift(element);

platform/features/table/src/controllers/TelemetryTableController.js

@@ -72,7 +72,7 @@ define(
              * Create a new format object from legacy object, and replace it
              * when it changes
              */
-            this.domainObject = objectUtils.toNewFormat($scope.domainObject.getModel(),
+            this.newObject = objectUtils.toNewFormat($scope.domainObject.getModel(),
                 $scope.domainObject.getId());
 
             _.bindAll(this, [
@@ -144,9 +144,9 @@ define(
                 this.unobserveObject();
             }
 
-            this.unobserveObject = this.openmct.objects.observe(this.domainObject, "*",
+            this.unobserveObject = this.openmct.objects.observe(this.newObject, "*",
                     function (domainObject) {
-                        this.domainObject = domainObject;
+                        this.newObject = domainObject;
                         this.getData();
                     }.bind(this)
                 );
@@ -364,8 +364,11 @@ define(
             var telemetryApi = this.openmct.telemetry;
             var telemetryCollection = this.telemetry;
             //Set table max length to avoid unbounded growth.
+            //var maxRows = 100000;
+            var maxRows = Number.MAX_VALUE;
             var limitEvaluator;
             var added = false;
+            var scope = this.$scope;
             var table = this.table;
 
             this.subscriptions.forEach(function (subscription) {
@@ -376,6 +379,16 @@ define(
             function newData(domainObject, datum) {
                 limitEvaluator = telemetryApi.limitEvaluator(domainObject);
                 added = telemetryCollection.add([table.getRowValues(limitEvaluator, datum)]);
+
+                //Inform table that a new row has been added
+                if (scope.rows.length > maxRows) {
+                    scope.$broadcast('remove:rows', scope.rows[0]);
+                    scope.rows.shift();
+                }
+                if (!scope.loading && added) {
+                    scope.$broadcast('add:row',
+                        scope.rows.length - 1);
+                }
             }
 
             objects.forEach(function (object) {
@@ -386,42 +399,6 @@ define(
             return objects;
         };
 
-        /**
-         * Return an array of telemetry objects in this view that should be
-         * subscribed to.
-         * @private
-         * @returns {Promise<Array>} a promise that resolves with an array of
-         * telemetry objects in this view.
-         */
-        TelemetryTableController.prototype.getTelemetryObjects = function () {
-            var telemetryApi = this.openmct.telemetry;
-            var compositionApi = this.openmct.composition;
-
-            function filterForTelemetry(objects) {
-                return objects.filter(telemetryApi.canProvideTelemetry.bind(telemetryApi));
-            }
-
-            /*
-             * If parent object is a telemetry object, subscribe to it. Do not
-             * test composees.
-             */
-            if (telemetryApi.canProvideTelemetry(this.domainObject)) {
-                return Promise.resolve([this.domainObject]);
-            } else {
-                /*
-                 * If parent object is not a telemetry object, subscribe to all
-                 * composees that are telemetry producing objects.
-                 */
-                var composition = compositionApi.get(this.domainObject);
-
-                if (composition) {
-                    return composition
-                        .load()
-                        .then(filterForTelemetry);
-                }
-            }
-        };
-
         /**
          * Request historical data, and subscribe to for real-time data.
          * @private
@@ -429,7 +406,10 @@ define(
          * established, and historical telemetry is received and processed.
          */
         TelemetryTableController.prototype.getData = function () {
+            var telemetryApi = this.openmct.telemetry;
+            var compositionApi = this.openmct.composition;
             var scope = this.$scope;
+            var newObject = this.newObject;
 
             this.telemetry.clear();
             this.telemetry.bounds(this.openmct.conductor.bounds());
@@ -441,9 +421,28 @@ define(
                 console.error(e.stack);
             }
 
+            function filterForTelemetry(objects) {
+                return objects.filter(telemetryApi.canProvideTelemetry.bind(telemetryApi));
+            }
+
+            function getDomainObjects() {
+                var objects = [newObject];
+                var composition = compositionApi.get(newObject);
+
+                if (composition) {
+                    return composition
+                        .load()
+                        .then(function (children) {
+                            return objects.concat(children);
+                        });
+                } else {
+                    return Promise.resolve(objects);
+                }
+            }
             scope.rows = [];
 
-            return this.getTelemetryObjects()
+            return getDomainObjects()
+                .then(filterForTelemetry)
                 .then(this.loadColumns)
                 .then(this.subscribeToNewData)
                 .then(this.getHistoricalData)

platform/features/table/test/TelemetryCollectionSpec.js

@@ -138,27 +138,6 @@ define(
                         };
                         collection.add([addedObjectB, addedObjectA]);
 
-                        expect(collection.telemetry[11]).toBe(addedObjectB);
-                    }
-                );
-                it("maintains insertion order in the case of duplicate time stamps",
-                    function () {
-                        var addedObjectA = {
-                            timestamp: 10000,
-                            value: {
-                                integer: 10,
-                                text: integerTextMap[10]
-                            }
-                        };
-                        var addedObjectB = {
-                            timestamp: 10000,
-                            value: {
-                                integer: 11,
-                                text: integerTextMap[11]
-                            }
-                        };
-                        collection.add([addedObjectA, addedObjectB]);
-
                         expect(collection.telemetry[11]).toBe(addedObjectB);
                     }
                 );

platform/features/table/test/controllers/MCTTableControllerSpec.js

@@ -459,14 +459,14 @@ define(
 
                         beforeEach(function () {
                             row4 = {
-                                'col1': {'text': 'row4 col1'},
+                                'col1': {'text': 'row5 col1'},
                                 'col2': {'text': 'xyz'},
-                                'col3': {'text': 'row4 col3'}
+                                'col3': {'text': 'row5 col3'}
                             };
                             row5 = {
-                                'col1': {'text': 'row5 col1'},
+                                'col1': {'text': 'row6 col1'},
                                 'col2': {'text': 'aaa'},
-                                'col3': {'text': 'row5 col3'}
+                                'col3': {'text': 'row6 col3'}
                             };
                             row6 = {
                                 'col1': {'text': 'row6 col1'},
@@ -490,71 +490,6 @@ define(
                             expect(mockScope.displayRows[3].col2.text).toEqual('ggg');
                         });
 
-                        it('Inserts duplicate values for sort column in order received when sorted descending', function () {
-                            mockScope.sortColumn = 'col2';
-                            mockScope.sortDirection = 'desc';
-
-                            mockScope.displayRows = controller.sortRows(testRows.slice(0));
-
-                            var row6b = {
-                                'col1': {'text': 'row6b col1'},
-                                'col2': {'text': 'ggg'},
-                                'col3': {'text': 'row6b col3'}
-                            };
-                            var row6c = {
-                                'col1': {'text': 'row6c col1'},
-                                'col2': {'text': 'ggg'},
-                                'col3': {'text': 'row6c col3'}
-                            };
-
-                            controller.addRows(undefined, [row4, row5]);
-                            controller.addRows(undefined, [row6, row6b, row6c]);
-                            expect(mockScope.displayRows[0].col2.text).toEqual('xyz');
-                            expect(mockScope.displayRows[7].col2.text).toEqual('aaa');
-
-                            // Added duplicate rows
-                            expect(mockScope.displayRows[2].col2.text).toEqual('ggg');
-                            expect(mockScope.displayRows[3].col2.text).toEqual('ggg');
-                            expect(mockScope.displayRows[4].col2.text).toEqual('ggg');
-
-                            // Check that original order is maintained with dupes
-                            expect(mockScope.displayRows[2].col3.text).toEqual('row6c col3');
-                            expect(mockScope.displayRows[3].col3.text).toEqual('row6b col3');
-                            expect(mockScope.displayRows[4].col3.text).toEqual('row6 col3');
-                        });
-
-                        it('Inserts duplicate values for sort column in order received when sorted ascending', function () {
-                            mockScope.sortColumn = 'col2';
-                            mockScope.sortDirection = 'asc';
-
-                            mockScope.displayRows = controller.sortRows(testRows.slice(0));
-
-                            var row6b = {
-                                'col1': {'text': 'row6b col1'},
-                                'col2': {'text': 'ggg'},
-                                'col3': {'text': 'row6b col3'}
-                            };
-                            var row6c = {
-                                'col1': {'text': 'row6c col1'},
-                                'col2': {'text': 'ggg'},
-                                'col3': {'text': 'row6c col3'}
-                            };
-
-                            controller.addRows(undefined, [row4, row5, row6]);
-                            controller.addRows(undefined, [row6b, row6c]);
-                            expect(mockScope.displayRows[0].col2.text).toEqual('aaa');
-                            expect(mockScope.displayRows[7].col2.text).toEqual('xyz');
-
-                            // Added duplicate rows
-                            expect(mockScope.displayRows[3].col2.text).toEqual('ggg');
-                            expect(mockScope.displayRows[4].col2.text).toEqual('ggg');
-                            expect(mockScope.displayRows[5].col2.text).toEqual('ggg');
-                            // Check that original order is maintained with dupes
-                            expect(mockScope.displayRows[3].col3.text).toEqual('row6 col3');
-                            expect(mockScope.displayRows[4].col3.text).toEqual('row6b col3');
-                            expect(mockScope.displayRows[5].col3.text).toEqual('row6c col3');
-                        });
-
                         it('Adds new rows at the correct sort position when' +
                             ' sorted and filtered', function () {
                             mockScope.sortColumn = 'col2';

platform/features/table/test/controllers/TelemetryTableControllerSpec.js

@@ -161,7 +161,7 @@ define(
                 });
             });
 
-            describe ('when getting telemetry', function () {
+            describe ('Subscribes to new data', function () {
                 var mockComposition,
                     mockTelemetryObject,
                     mockChildren,
@@ -173,7 +173,9 @@ define(
                         "load"
                     ]);
 
-                    mockTelemetryObject = {};
+                    mockTelemetryObject = jasmine.createSpyObj("mockTelemetryObject", [
+                        "something"
+                    ]);
                     mockTelemetryObject.identifier = {
                         key: "mockTelemetryObject"
                     };
@@ -190,12 +192,22 @@ define(
                     });
 
                     done = false;
-                });
-
-                it('fetches historical data for the time period specified by the conductor bounds', function () {
                     controller.getData().then(function () {
                         done = true;
                     });
+                });
+
+                it('fetches historical data', function () {
+                    waitsFor(function () {
+                        return done;
+                    }, "getData to return", 100);
+
+                    runs(function () {
+                        expect(mockTelemetryAPI.request).toHaveBeenCalledWith(mockTelemetryObject, jasmine.any(Object));
+                    });
+                });
+
+                it('fetches historical data for the time period specified by the conductor bounds', function () {
                     waitsFor(function () {
                         return done;
                     }, "getData to return", 100);
@@ -205,11 +217,17 @@ define(
                     });
                 });
 
-                it('unsubscribes on view destruction', function () {
-                    controller.getData().then(function () {
-                        done = true;
+                it('subscribes to new data', function () {
+                    waitsFor(function () {
+                        return done;
+                    }, "getData to return", 100);
+
+                    runs(function () {
+                        expect(mockTelemetryAPI.subscribe).toHaveBeenCalledWith(mockTelemetryObject, jasmine.any(Function), {});
                     });
 
+                });
+                it('and unsubscribes on view destruction', function () {
                     waitsFor(function () {
                         return done;
                     }, "getData to return", 100);
@@ -221,87 +239,6 @@ define(
                         expect(unsubscribe).toHaveBeenCalled();
                     });
                 });
-                it('fetches historical data for the time period specified by the conductor bounds', function () {
-                    controller.getData().then(function () {
-                        done = true;
-                    });
-                    waitsFor(function () {
-                        return done;
-                    }, "getData to return", 100);
-
-                    runs(function () {
-                        expect(mockTelemetryAPI.request).toHaveBeenCalledWith(mockTelemetryObject, mockBounds);
-                    });
-                });
-
-                it('fetches data for, and subscribes to parent object if it is a telemetry object', function () {
-                    controller.getData().then(function () {
-                        done = true;
-                    });
-                    waitsFor(function () {
-                        return done;
-                    }, "getData to return", 100);
-
-                    runs(function () {
-                        expect(mockTelemetryAPI.subscribe).toHaveBeenCalledWith(mockTelemetryObject, jasmine.any(Function), {});
-                        expect(mockTelemetryAPI.request).toHaveBeenCalledWith(mockTelemetryObject, jasmine.any(Object));
-                    });
-                });
-                it('fetches data for, and subscribes to parent object if it is a telemetry object', function () {
-                    controller.getData().then(function () {
-                        done = true;
-                    });
-                    waitsFor(function () {
-                        return done;
-                    }, "getData to return", 100);
-
-                    runs(function () {
-                        expect(mockTelemetryAPI.subscribe).toHaveBeenCalledWith(mockTelemetryObject, jasmine.any(Function), {});
-                        expect(mockTelemetryAPI.request).toHaveBeenCalledWith(mockTelemetryObject, jasmine.any(Object));
-                    });
-                });
-
-                it('fetches data for, and subscribes to any composees that are telemetry objects if parent is not', function () {
-                    mockChildren = [
-                        {name: "child 1"}
-                    ];
-                    var mockTelemetryChildren = [
-                        {name: "child 2"},
-                        {name: "child 3"},
-                        {name: "child 4"}
-                    ];
-                    mockChildren = mockChildren.concat(mockTelemetryChildren);
-                    mockComposition.load.andReturn(Promise.resolve(mockChildren));
-
-                    mockTelemetryAPI.canProvideTelemetry.andCallFake(function (object) {
-                        if (object === mockTelemetryObject) {
-                            return false;
-                        } else {
-                            return mockTelemetryChildren.indexOf(object) !== -1;
-                        }
-                    });
-
-                    controller.getData().then(function () {
-                        done = true;
-                    });
-
-                    waitsFor(function () {
-                        return done;
-                    }, "getData to return", 100);
-
-                    runs(function () {
-                        mockTelemetryChildren.forEach(function (child) {
-                            expect(mockTelemetryAPI.subscribe).toHaveBeenCalledWith(child, jasmine.any(Function), {});
-                        });
-
-                        mockTelemetryChildren.forEach(function (child) {
-                            expect(mockTelemetryAPI.request).toHaveBeenCalledWith(child, jasmine.any(Object));
-                        });
-
-                        expect(mockTelemetryAPI.subscribe).not.toHaveBeenCalledWith(mockChildren[0], jasmine.any(Function), {});
-                        expect(mockTelemetryAPI.subscribe).not.toHaveBeenCalledWith(mockTelemetryObject[0], jasmine.any(Function), {});
-                    });
-                });
             });
 
             it('When in real-time mode, enables auto-scroll', function () {

platform/telemetry/src/TelemetryCapability.js

@@ -139,7 +139,8 @@ define(
                 type = domainObject.getCapability("type"),
                 typeRequest = (type && type.getDefinition().telemetry) || {},
                 modelTelemetry = domainObject.getModel().telemetry,
-                fullRequest = Object.create(typeRequest);
+                fullRequest = Object.create(typeRequest),
+                bounds;
 
             // Add properties from the telemetry field of this
             // specific domain object.
@@ -160,6 +161,12 @@ define(
                 fullRequest.key = domainObject.getId();
             }
 
+            if (request.start === undefined && request.end === undefined) {
+                bounds = this.openmct.conductor.bounds();
+                fullRequest.start = bounds.start;
+                fullRequest.end = bounds.end;
+            }
+
             return fullRequest;
         };
 

platform/telemetry/test/TelemetryCapabilitySpec.js

@@ -97,7 +97,15 @@ define(
                 });
 
                 mockAPI = {
-                    telemetry: mockTelemetryAPI
+                    telemetry: mockTelemetryAPI,
+                    conductor: {
+                        bounds: function () {
+                            return {
+                                start: 0,
+                                end: 1
+                            };
+                        }
+                    }
                 };
 
                 telemetry = new TelemetryCapability(
@@ -150,7 +158,9 @@ define(
                 expect(telemetry.getMetadata()).toEqual({
                     id: "testId", // from domain object
                     source: "testSource",
-                    key: "testKey"
+                    key: "testKey",
+                    start: 0,
+                    end: 1
                 });
             });
 
@@ -164,7 +174,9 @@ define(
                 expect(telemetry.getMetadata()).toEqual({
                     id: "testId", // from domain object
                     source: "testSource", // from model
-                    key: "testId" // from domain object
+                    key: "testId", // from domain object
+                    start: 0,
+                    end: 1
                 });
             });
 
@@ -243,7 +255,9 @@ define(
                     [{
                         id: "testId", // from domain object
                         source: "testSource",
-                        key: "testKey"
+                        key: "testKey",
+                        start: 0,
+                        end: 1
                     }]
                 );
 

src/MCT.js

@@ -83,7 +83,7 @@ define([
          * @memberof module:openmct.MCT#
          * @name conductor
          */
-        this.time = new api.Time();
+        this.conductor = new api.TimeConductor();
 
         /**
          * An interface for interacting with the composition of domain objects.

src/api/TimeConductor.js

@@ -35,7 +35,7 @@ define(['EventEmitter'], function (EventEmitter) {
      * @interface
      * @memberof module:openmct
      */
-    function TimeAPI() {
+    function TimeConductor() {
         EventEmitter.call(this);
 
         //The Time System
@@ -50,30 +50,19 @@ define(['EventEmitter'], function (EventEmitter) {
 
         //Default to fixed mode
         this.followMode = false;
-
-        this.timeSystems = {};
-        this.tickSources = {};
     }
 
-    TimeAPI.prototype = Object.create(EventEmitter.prototype);
-
-    TimeAPI.prototype.addTimeSystem = function (timeSystem) {
-        this.timeSystems[timeSystem.key] = timeSystem;
-    };
-
-    TimeAPI.prototype.addTickSource = function (tickSource) {
-        this.tickSources[tickSource.key] = tickSource;
-    };
+    TimeConductor.prototype = Object.create(EventEmitter.prototype);
 
     /**
      * Validate the given bounds. This can be used for pre-validation of
      * bounds, for example by views validating user inputs.
      * @param bounds The start and end time of the conductor.
      * @returns {string | true} A validation error, or true if valid
-     * @memberof module:openmct.TimeAPI#
+     * @memberof module:openmct.TimeConductor#
      * @method validateBounds
      */
-    TimeAPI.prototype.validateBounds = function (bounds) {
+    TimeConductor.prototype.validateBounds = function (bounds) {
         if ((bounds.start === undefined) ||
             (bounds.end === undefined) ||
             isNaN(bounds.start) ||
@@ -86,25 +75,51 @@ define(['EventEmitter'], function (EventEmitter) {
         return true;
     };
 
+    /**
+     * Get or set the follow mode of the time conductor. In follow mode the
+     * time conductor ticks, regularly updating the bounds from a timing
+     * source appropriate to the selected time system and mode of the time
+     * conductor.
+     * @fires module:openmct.TimeConductor~follow
+     * @param {boolean} followMode
+     * @returns {boolean}
+     * @memberof module:openmct.TimeConductor#
+     * @method follow
+     */
+    TimeConductor.prototype.follow = function (followMode) {
+        if (arguments.length > 0) {
+            this.followMode = followMode;
+            /**
+             * The TimeConductor has toggled into or out of follow mode.
+             * @event follow
+             * @memberof module:openmct.TimeConductor~
+             * @property {boolean} followMode true if follow mode is
+             *           enabled, otherwise false.
+             */
+            this.emit('follow', this.followMode);
+        }
+        return this.followMode;
+    };
+
     /**
      * @typedef {Object} TimeConductorBounds
      * @property {number} start The start time displayed by the time conductor in ms since epoch. Epoch determined by current time system
      * @property {number} end The end time displayed by the time conductor in ms since epoch.
-     * @memberof module:openmct.TimeAPI~
+     * @memberof module:openmct.TimeConductor~
      */
 
     /**
      * Get or set the start and end time of the time conductor. Basic validation
      * of bounds is performed.
      *
-     * @param {module:openmct.TimeAPI~TimeConductorBounds} newBounds
+     * @param {module:openmct.TimeConductorBounds~TimeConductorBounds} newBounds
      * @throws {Error} Validation error
-     * @fires module:openmct.TimeAPI~bounds
-     * @returns {module:openmct.TimeAPI~TimeConductorBounds}
-     * @memberof module:openmct.TimeAPI#
+     * @fires module:openmct.TimeConductor~bounds
+     * @returns {module:openmct.TimeConductorBounds~TimeConductorBounds}
+     * @memberof module:openmct.TimeConductor#
      * @method bounds
      */
-    TimeAPI.prototype.bounds = function (newBounds) {
+    TimeConductor.prototype.bounds = function (newBounds) {
         if (arguments.length > 0) {
             var validationResult = this.validateBounds(newBounds);
             if (validationResult !== true) {
@@ -115,12 +130,10 @@ define(['EventEmitter'], function (EventEmitter) {
             /**
              * The start time, end time, or both have been updated.
              * @event bounds
-             * @memberof module:openmct.TimeAPI~
-             * @property {TimeConductorBounds} bounds The newly updated bounds
-             * @property {boolean} [tick] `true` if the bounds update was due to
-             * a "tick" event (ie. was an automatic update), false otherwise.
+             * @memberof module:openmct.TimeConductor~
+             * @property {TimeConductorBounds} bounds
              */
-            this.emit('bounds', this.boundsVal, false);
+            this.emit('bounds', this.boundsVal);
 
             // If a bounds change results in a TOI outside of the current
             // bounds, unset it
@@ -133,17 +146,17 @@ define(['EventEmitter'], function (EventEmitter) {
     };
 
     /**
-     * Get or set the time system of the TimeAPI. Time systems determine
+     * Get or set the time system of the TimeConductor. Time systems determine
      * units, epoch, and other aspects of time representation. When changing
      * the time system in use, new valid bounds must also be provided.
      * @param {TimeSystem} newTimeSystem
-     * @param {module:openmct.TimeAPI~TimeConductorBounds} bounds
-     * @fires module:openmct.TimeAPI~timeSystem
+     * @param {module:openmct.TimeConductor~TimeConductorBounds} bounds
+     * @fires module:openmct.TimeConductor~timeSystem
      * @returns {TimeSystem} The currently applied time system
-     * @memberof module:openmct.TimeAPI#
+     * @memberof module:openmct.TimeConductor#
      * @method timeSystem
      */
-    TimeAPI.prototype.timeSystem = function (newTimeSystem, bounds) {
+    TimeConductor.prototype.timeSystem = function (newTimeSystem, bounds) {
         if (arguments.length >= 2) {
             this.system = newTimeSystem;
             /**
@@ -151,7 +164,7 @@ define(['EventEmitter'], function (EventEmitter) {
              * conductor has changed. A change in Time System will always be
              * followed by a bounds event specifying new query bounds.
              *
-             * @event module:openmct.TimeAPI~timeSystem
+             * @event module:openmct.TimeConductor~timeSystem
              * @property {TimeSystem} The value of the currently applied
              * Time System
              * */
@@ -168,19 +181,19 @@ define(['EventEmitter'], function (EventEmitter) {
      * focus of the current view. It can be manipulated by the user from the
      * time conductor or from other views.The time of interest can
      * effectively be unset by assigning a value of 'undefined'.
-     * @fires module:openmct.TimeAPI~timeOfInterest
+     * @fires module:openmct.TimeConductor~timeOfInterest
      * @param newTOI
      * @returns {number} the current time of interest
-     * @memberof module:openmct.TimeAPI#
+     * @memberof module:openmct.TimeConductor#
      * @method timeOfInterest
      */
-    TimeAPI.prototype.timeOfInterest = function (newTOI) {
+    TimeConductor.prototype.timeOfInterest = function (newTOI) {
         if (arguments.length > 0) {
             this.toi = newTOI;
             /**
              * The Time of Interest has moved.
              * @event timeOfInterest
-             * @memberof module:openmct.TimeAPI~
+             * @memberof module:openmct.TimeConductor~
              * @property {number} Current time of interest
              */
             this.emit('timeOfInterest', this.toi);
@@ -188,14 +201,5 @@ define(['EventEmitter'], function (EventEmitter) {
         return this.toi;
     };
 
-    /**
-     * Return the follow state of the Conductor.
-     * @returns {boolean} `true` if conductor is currently following a tick source.
-     * `false` otherwise.
-     */
-    TimeAPI.prototype.follow = function () {
-        return this.followMode;
-    };
-
-    return TimeAPI;
+    return TimeConductor;
 });

src/api/api.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    './time/TimeAPI',
+    './TimeConductor',
     './objects/ObjectAPI',
     './composition/CompositionAPI',
     './types/TypeRegistry',
@@ -29,7 +29,7 @@ define([
     './ui/GestureAPI',
     './telemetry/TelemetryAPI'
 ], function (
-    TimeAPI,
+    TimeConductor,
     ObjectAPI,
     CompositionAPI,
     TypeRegistry,
@@ -38,7 +38,7 @@ define([
     TelemetryAPI
 ) {
     return {
-        Time: TimeAPI,
+        TimeConductor: TimeConductor,
         ObjectAPI: ObjectAPI,
         CompositionAPI: CompositionAPI,
         Dialog: Dialog,

src/api/telemetry/TelemetryAPI.js

@@ -121,7 +121,7 @@ define([
      * @memberof module:openmct.TelemetryAPI~
      */
 
-    var cachedFormatService;
+
 
     /**
      * An interface for retrieving telemetry data associated with a domain
@@ -138,7 +138,6 @@ define([
         this.metadataCache = new WeakMap();
         this.formatMapCache = new WeakMap();
         this.valueFormatterCache = new WeakMap();
-        this.formatMap = {};
     }
 
     /**
@@ -282,13 +281,6 @@ define([
         return _.sortByAll(options, sortKeys);
     };
 
-    function getFormatService() {
-        if (cachedFormatService === undefined) {
-            cachedFormatService = this.MCT.$injector.get('formatService');
-        }
-        return cachedFormatService;
-    }
-
     /**
      * Get a value formatter for a given valueMetadata.
      *
@@ -296,10 +288,12 @@ define([
      */
     TelemetryAPI.prototype.getValueFormatter = function (valueMetadata) {
         if (!this.valueFormatterCache.has(valueMetadata)) {
-            var formatService = getFormatService.call(this);
+            if (!this.formatService) {
+                this.formatService = this.MCT.$injector.get('formatService');
+            }
             this.valueFormatterCache.set(
                 valueMetadata,
-                new TelemetryValueFormatter(valueMetadata, formatService)
+                new TelemetryValueFormatter(valueMetadata, this.formatService)
             );
         }
         return this.valueFormatterCache.get(valueMetadata);
@@ -340,17 +334,5 @@ define([
         return this.legacyProvider.limitEvaluator.apply(this.legacyProvider, arguments);
     };
 
-    TelemetryAPI.prototype.getFormat = function (formatKey) {
-        return this.formatMap[formatKey];
-    };
-
-    /**
-     * Register a new formatter
-     * @param {Format} formatter
-     */
-    TelemetryAPI.prototype.addFormat = function (format) {
-        this.formatMap[format.key] = format;
-    };
-
     return TelemetryAPI;
 });

src/plugins/conductor/TimeConductorService.js

@@ -1,170 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    [
-        'EventEmitter'
-    ],
-    function (EventEmitter) {
-
-        /**
-         * A class representing the state of the time conductor view. This
-         * exposes details of the UI that are not represented on the
-         * TimeConductor API itself such as modes and deltas.
-         *
-         * @memberof platform.features.conductor
-         * @param conductor
-         * @param timeSystems
-         * @constructor
-         */
-        function TimeConductorService(openmct) {
-
-            EventEmitter.call(this);
-
-            this.timeAPI = openmct.time;
-
-        }
-
-        TimeConductorService.prototype = Object.create(EventEmitter.prototype);
-        /**
-         * @private
-         * @param {number} time some value that is valid in the current TimeSystem
-         */
-        TimeConductorService.prototype.tick = function (time) {
-            var deltas = this.deltas();
-            var startTime = time;
-            var endTime = time;
-
-            if (deltas) {
-                startTime = time - deltas.start;
-                endTime = time + deltas.end;
-            }
-
-            var newBounds = {
-                start: startTime,
-                end: endTime
-            };
-
-            this.timeAPI.boundsVal = newBounds;
-            this.timeAPI.emit('bounds', true);
-
-            // If a bounds change results in a TOI outside of the current
-            // bounds, unset it
-            if (this.timeAPI.toi < newBounds.start || this.timeAPI.toi > newBounds.end) {
-                this.timeAPI.timeOfInterest(undefined);
-            }
-        };
-
-        TimeConductorService.prototype.configuration = function (config) {
-            this.config = config;
-        };
-
-        TimeConductorService.prototype.activeTickSource = function (key) {
-            if (arguments.length > 0) {
-                if (this.activeTickSource !== undefined) {
-                    this.activeTickSource.off('tick', this.tick);
-                }
-                var newTickSource = this.timeAPI.tickSource[key];
-                if (newTickSource) {
-                    this.activeTickSource.on('tick', this.tick);
-                    this.activeTickSource = newTickSource;
-                }
-            }
-            return this.activeTickSource;
-        };
-
-        /**
-         * @typedef {object} TimeConductorDeltas
-         * @property {number} start Used to set the start bound of the
-         * TimeConductor on tick. A positive value that will be subtracted
-         * from the value provided by a tick source to determine the start
-         * bound.
-         * @property {number} end Used to set the end bound of the
-         * TimeConductor on tick. A positive value that will be added
-         * from the value provided by a tick source to determine the start
-         * bound.
-         */
-        /**
-         * Deltas define the offset from the latest time value provided by
-         * the current tick source. Deltas are only valid in realtime or LAD
-         * modes.
-         *
-         * Realtime mode:
-         *     - start: A time in ms before now which will be used to
-         *     determine the 'start' bound on tick
-         *     - end: A time in ms after now which will be used to determine
-         *     the 'end' bound on tick
-         *
-         * LAD mode:
-         *     - start: A time in ms before the timestamp of the last data
-         *     received which will be used to determine the 'start' bound on
-         *     tick
-         *     - end: A time in ms after the timestamp of the last data received
-         *     which will be used to determine the 'end' bound on tick
-         * @returns {TimeConductorDeltas} current value of the deltas
-         */
-        TimeConductorService.prototype.deltas = function () {
-            // Get / Set deltas
-        };
-
-        /**
-         * Availability of modes depends on the time systems and tick
-         * sources available. For example, Latest Available Data mode will
-         * not be available if there are no time systems and tick sources
-         * that support LAD mode.
-         * @returns {ModeMetadata[]}
-         */
-        TimeConductorService.prototype.availableTickSources = function () {
-            var timeAPI = this.timeAPI;
-            //Return all tick sources
-            return _.uniq(this.config.map(function (option) {
-                return option.tickSource && timeAPI.tickSources(option.tickSource);
-            }.bind(this)));
-        };
-
-        TimeConductorService.prototype.availableTimeSystems = function () {
-            return Object.values(this.timeAPI.timeSystems);
-        };
-
-        /**
-         * An event to indicate that zooming is taking place
-         * @event platform.features.conductor.TimeConductorService~zoom
-         * @property {ZoomLevel} zoom the new zoom level.
-         */
-        /**
-         * Zoom to given time span. Will fire a zoom event with new zoom
-         * bounds. Zoom bounds emitted in this way are considered ephemeral
-         * and should be overridden by any time conductor bounds events. Does
-         * not set bounds globally.
-         * @param {number} zoom A time duration in ms
-         * @fires platform.features.conductor.TimeConductorService~zoom
-         * @see module:openmct.TimeConductor#bounds
-         */
-        TimeConductorService.prototype.zoom = function (timeSpan) {
-            var zoom = this.currentMode.calculateZoom(timeSpan);
-            this.emit("zoom", zoom);
-            return zoom;
-        };
-
-        return TimeConductorService;
-    }
-);

src/plugins/plugins.js

@@ -22,7 +22,7 @@
 
 define([
     'lodash',
-    './utcTimeSystem/plugin',
+    '../../platform/features/conductor/utcTimeSystem/src/UTCTimeSystem',
     '../../example/generator/plugin'
 ], function (
     _,
@@ -46,20 +46,65 @@ define([
         };
     });
 
-    plugins.UTCTimeSystem = UTCTimeSystem;
+    plugins.UTCTimeSystem = function () {
+        return function (openmct) {
+            openmct.legacyExtension("timeSystems", {
+                "implementation": UTCTimeSystem,
+                "depends": ["$timeout"]
+            });
+        };
+    };
+
+    var conductorInstalled = false;
 
     plugins.Conductor = function (options) {
         if (!options) {
             options = {};
         }
 
-        return function (openmct) {
-            openmct.legacyExtension('runs', {
-                implementation: function applyDefaults(timeConductorService) {
-                    timeConductorService.configuration(options.menuOptions);
-                },
-                depends: ["timeConductorService"]
+        function applyDefaults(openmct, timeConductorViewService) {
+            var defaults = {};
+            var timeSystem = timeConductorViewService.systems.find(function (ts) {
+                return ts.metadata.key === options.defaultTimeSystem;
             });
+            if (timeSystem !== undefined) {
+                defaults = timeSystem.defaults();
+
+                if (options.defaultTimespan !== undefined) {
+                    defaults.deltas.start = options.defaultTimespan;
+                    defaults.bounds.start = defaults.bounds.end - options.defaultTimespan;
+                    timeSystem.defaults(defaults);
+                }
+
+                openmct.conductor.timeSystem(timeSystem, defaults.bounds);
+            }
+        }
+
+        return function (openmct) {
+            openmct.legacyExtension('constants', {
+                key: 'DEFAULT_TIMECONDUCTOR_MODE',
+                value: options.showConductor ? 'fixed' : 'realtime',
+                priority: conductorInstalled ? 'mandatory' : 'fallback'
+            });
+            if (options.showConductor !== undefined) {
+                openmct.legacyExtension('constants', {
+                    key: 'SHOW_TIMECONDUCTOR',
+                    value: options.showConductor,
+                    priority: conductorInstalled ? 'mandatory' : 'fallback'
+                });
+            }
+            if (options.defaultTimeSystem !== undefined || options.defaultTimespan !== undefined) {
+                openmct.legacyExtension('runs', {
+                    implementation: applyDefaults,
+                    depends: ["openmct", "timeConductorViewService"]
+                });
+            }
+
+            if (!conductorInstalled) {
+                openmct.legacyRegistry.enable('platform/features/conductor/core');
+                openmct.legacyRegistry.enable('platform/features/conductor/compatibility');
+            }
+            conductorInstalled = true;
         };
     };
 

src/plugins/utcTimeSystem/LocalClock.js

@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
- define([], function () {
-    function LocalClock(tickPeriod) {
-        //Metadata
-        this.key = 'localClock';
-        this.name = 'A local time source';
-        this.cssClass = 'icon-clock';
-
-        //Members
-        this.listeners = {};
-        this.tickPeriod = tickPeriod;
-        this.tick = this.tick.bind(this);
-    }
-
-    LocalClock.prototype.tick = function () {
-        this.listeners['tick'].forEach(Date.now());
-        this.timeout = setTimeout(this.tick, this.tickPeriod);
-    };
-
-    LocalClock.prototype.on = function (event, listener) {
-        this.listeners[event] = this.listeners[event] || [];
-        this.listeners[event].push(listener);
-        if (timeout === undefined) {
-            setTimeout(this.tick, this.tickPeriod);
-        }
-    };
-
-    LocalClock.prototype.off = function (event, listener) {
-        if (this.listeners[event]) {
-            this.listeners[event] = this.listeners[event].filter(function (l) {
-                return l === listener;
-            });
-            var isEmpty = Object.keys(this.listeners).all(function (key){
-                return this.listeners[key] === undefined || this.listeners[key].length === 0
-            });
-
-            if (isEmpty) {
-                clearTimeout(this.timeout);
-            }
-        }
-    };
-
-    return LocalClock;
-});

src/plugins/utcTimeSystem/UTCTimeFormat.js

@@ -1,131 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    'moment'
-], function (
-    moment
-) {
-
-    var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSS",
-        DATE_FORMATS = [
-            DATE_FORMAT,
-            "YYYY-MM-DD HH:mm:ss",
-            "YYYY-MM-DD HH:mm",
-            "YYYY-MM-DD"
-        ];
-
-    /**
-     * @typedef Scale
-     * @property {number} min the minimum scale value, in ms
-     * @property {number} max the maximum scale value, in ms
-     */
-
-    /**
-     * Formatter for UTC timestamps. Interprets numeric values as
-     * milliseconds since the start of 1970.
-     *
-     * @implements {Format}
-     * @constructor
-     * @memberof platform/commonUI/formats
-     */
-    function UTCTimeFormat() {
-    }
-
-    /**
-     * Returns an appropriate time format based on the provided value and
-     * the threshold required.
-     * @private
-     */
-    function getScaledFormat(d) {
-        var momentified = moment.utc(d);
-        /**
-         * Uses logic from d3 Time-Scales, v3 of the API. See
-         * https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Scales.md
-         *
-         * Licensed
-         */
-        var format = [
-            [".SSS", function (m) {
-                return m.milliseconds();
-            }],
-            [":ss", function (m) {
-                return m.seconds();
-            }],
-            ["HH:mm", function (m) {
-                return m.minutes();
-            }],
-            ["HH", function (m) {
-                return m.hours();
-            }],
-            ["ddd DD", function (m) {
-                return m.days() &&
-                    m.date() !== 1;
-            }],
-            ["MMM DD", function (m) {
-                return m.date() !== 1;
-            }],
-            ["MMMM", function (m) {
-                return m.month();
-            }],
-            ["YYYY", function () {
-                return true;
-            }]
-        ].filter(function (row) {
-            return row[1](momentified);
-        })[0][0];
-
-        if (format !== undefined) {
-            return moment.utc(value).format(scaledFormat);
-        }
-    }
-
-    /**
-     * @param {number} value The value to format.
-     * @param {number} [minValue] Contextual information for scaled formatting used in linear scales such as conductor
-     * and plot axes. Specifies the smallest number on the scale.
-     * @param {number} [maxValue] Contextual information for scaled formatting used in linear scales such as conductor
-     * and plot axes. Specifies the largest number on the scale
-     * @param {number} [count] Contextual information for scaled formatting used in linear scales such as conductor
-     * and plot axes. The number of labels on the scale.
-     * @returns {string} the formatted date(s). If multiple values were requested, then an array of
-     * formatted values will be returned. Where a value could not be formatted, `undefined` will be returned at its position
-     * in the array.
-     */
-    UTCTimeFormat.prototype.format = function (value, minValue, maxValue, count) {
-        if (arguments.length > 1) {
-            return values.map(getScaledFormat);
-        } else {
-            return moment.utc(value).format(DATE_FORMAT) + "Z";
-        }
-    };
-
-    UTCTimeFormat.prototype.parse = function (text) {
-        return moment.utc(text, DATE_FORMATS).valueOf();
-    };
-
-    UTCTimeFormat.prototype.validate = function (text) {
-        return moment.utc(text, DATE_FORMATS).isValid();
-    };
-
-    return UTCTimeFormat;
-});

src/plugins/utcTimeSystem/plugin.js

@@ -1,21 +0,0 @@
-define([
-    './UTCTimeFormat',
-    './LocalClock'
-], function (
-    UtcTimeFormat,
-    LocalClock
-) {
-    return function UtcTimeSystemPlugin(options) {
-        return function install(openmct) {
-            openmct.telemetry.addFormat(new UtcTimeFormat());
-            openmct.conductor.addTimeSystem({
-                key: 'utc',
-                name: 'UTC',
-                timeFormat: 'utc',
-                durationFormat: 'duration',
-                utcBased: true
-            });
-            openmct.conductor.addTickSource(new LocalClock());
-        }
-    }
-});