WIP

.jshintrc

@@ -21,6 +21,5 @@
     "shadow": "outer",
     "strict": "implied",
     "undef": true,
-    "unused": "vars",
-    "latedef": "nofunc"
+    "unused": "vars"
 }

API.md

@@ -1,57 +1,3 @@
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents** 
-
-- [Building Applications With Open MCT](#building-applications-with-open-mct)
-  - [Scope and purpose of this document](#scope-and-purpose-of-this-document)
-  - [Building From Source](#building-from-source)
-  - [Starting an Open MCT application](#starting-an-open-mct-application)
-  - [Plugins](#plugins)
-    - [Defining and Installing a New Plugin](#defining-and-installing-a-new-plugin)
-  - [Domain Objects and Identifiers](#domain-objects-and-identifiers)
-    - [Object Attributes](#object-attributes)
-    - [Domain Object Types](#domain-object-types)
-  - [Root Objects](#root-objects)
-  - [Object Providers](#object-providers)
-  - [Composition Providers](#composition-providers)
-    - [Adding Composition Providers](#adding-composition-providers)
-    - [Default Composition Provider](#default-composition-provider)
-  - [Telemetry API](#telemetry-api)
-    - [Integrating Telemetry Sources](#integrating-telemetry-sources)
-      - [Telemetry Metadata](#telemetry-metadata)
-        - [Values](#values)
-          - [Value Hints](#value-hints)
-        - [The Time Conductor and Telemetry](#the-time-conductor-and-telemetry)
-      - [Telemetry Providers](#telemetry-providers)
-      - [Telemetry Requests](#telemetry-requests)
-      - [Request Strategies **draft**](#request-strategies-draft)
-        - [`latest` request strategy](#latest-request-strategy)
-        - [`minmax` request strategy](#minmax-request-strategy)
-      - [Telemetry Formats **draft**](#telemetry-formats-draft)
-        - [Registering Formats](#registering-formats)
-      - [Telemetry Data](#telemetry-data)
-        - [Telemetry Datums](#telemetry-datums)
-      - [Limit Evaluators **draft**](#limit-evaluators-draft)
-    - [Telemetry Visualization APIs **draft**](#telemetry-visualization-apis-draft)
-  - [Time API](#time-api)
-    - [Time Systems and Bounds](#time-systems-and-bounds)
-      - [Defining and Registering Time Systems](#defining-and-registering-time-systems)
-      - [Getting and Setting the Active Time System](#getting-and-setting-the-active-time-system)
-    - [Time Bounds](#time-bounds)
-    - [Clocks](#clocks)
-      - [Defining and registering clocks](#defining-and-registering-clocks)
-      - [Getting and setting active clock](#getting-and-setting-active-clock)
-      - [Stopping an active clock](#stopping-an-active-clock)
-      - [Clock Offsets](#clock-offsets)
-    - [Time Events](#time-events)
-      - [List of Time Events](#list-of-time-events)
-    - [The Time Conductor](#the-time-conductor)
-      - [Time Conductor Configuration](#time-conductor-configuration)
-      - [Example conductor configuration](#example-conductor-configuration)
-  - [Included Plugins](#included-plugins)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
 # Building Applications With Open MCT
 
 ## Scope and purpose of this document
@@ -208,7 +154,7 @@ registry.
 
 eg.
 ```javascript
-openmct.types.addType('example.my-type', {
+openmct.types.addType('my-type', {
     name: "My Type",
     description: "This is a type that I added!",
     creatable: true
@@ -216,9 +162,8 @@ openmct.types.addType('example.my-type', {
 ```
 
 The `addType` function accepts two arguments:
-* A `string` key identifying the type. This key is used when specifying a type
-for an object.  We recommend prefixing your types with a namespace to avoid
-conflicts with other plugins.
+* A `string` key identifying the type. This key is used when specifying a type 
+for an object.
 * An object type specification. An object type definition supports the following 
 attributes      
     * `name`: a `string` naming this object type
@@ -249,7 +194,7 @@ To do so, use the `addRoot` method of the object API.
 eg.
 ```javascript
 openmct.objects.addRoot({
-        namespace: "example.namespace",
+        namespace: "my-namespace",
         key: "my-key"
     });
 ```
@@ -290,12 +235,13 @@ It is expected that the `get` function will return a
 [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) 
 that resolves with the object being requested.
 
-In future, object providers will support other methods to enable other operations with persistence stores, such as creating, updating, and deleting objects.
+In future, object providers will support other methods to enable other operations 
+with persistence stores, such as creating, updating, and deleting objects.
 
 ## Composition Providers
 
-The _composition_ of a domain object is the list of objects it contains, as
-shown (for example) in the tree for browsing. Open MCT provides a
+The _composition_ of a domain object is the list of objects it contains, as shown 
+(for example) in the tree for browsing. Open MCT provides a
 [default solution](#default-composition-provider) for composition, but there
 may be cases where you want to provide the composition of a certain object
 (or type of object) dynamically.
@@ -309,7 +255,7 @@ Composition Provider:
 ```javascript
 openmct.composition.addProvider({
     appliesTo: function (domainObject) {
-        return domainObject.type === 'example.my-type';
+        return domainObject.type === 'my-type';
     },
     load: function (domainObject) {
         return Promise.resolve(myDomainObjects);
@@ -327,9 +273,8 @@ These identifiers will be used to fetch Domain Objects from an [Object Provider]
 
 ### Default Composition Provider
 
-The default composition provider applies to any domain object with a 
-`composition` property. The value of `composition` should be an array of 
-identifiers, e.g.:
+The default composition provider applies to any domain object with a `composition` 
+property. The value of `composition` should be an array of identifiers, e.g.:
 
 ```javascript
 var domainObject = {
@@ -350,17 +295,13 @@ var domainObject = {
 
 ## Telemetry API
 
-The Open MCT telemetry API provides two main sets of interfaces-- one for
-integrating telemetry data into Open MCT, and another for developing Open MCT
-visualization plugins utilizing the telemetry API.  
+The Open MCT telemetry API provides two main sets of interfaces-- one for integrating telemetry data into Open MCT, and another for developing Open MCT visualization plugins utilizing telemetry API.  
 
-The APIs for visualization plugins are still a work in progress and docs may
-change at any time.  However, the APIs for integrating telemetry metadata into
-Open MCT are stable and documentation is included below.
+The APIs for visualization plugins are still a work in progress and docs may change at any time.  However, the APIs for integrating telemetry metadata into Open MCT are stable and documentation is included below.
 
 ### Integrating Telemetry Sources
 
-There are two main tasks for integrating telemetry sources-- describing telemetry objects with relevant metadata, and then providing telemetry data for those objects.  You'll use an [Object Provider](#object-providers) to provide objects with the necessary [Telemetry Metadata](#telemetry-metadata), and then register a [Telemetry Provider](#telemetry-providers) to retrieve telemetry data for those objects.  Alternatively, you can register a telemetry metadata provider to provide the necessary telemetry metadata.
+There are two main tasks for integrating telemetry sources-- describing telemetry objects with relevant metadata, and then providing telemetry data for those objects.  You'll use an [Object Provider](#object-providers) to provide objects with the necessary [Telemetry Metadata](#telemetry-metadata), and then register a [Telemetry Provider](#telemetry-providers) to retrieve telemetry data for those objects.
 
 For a step-by-step guide to building a telemetry adapter, please see the 
 [Open MCT Tutorials](https://github.com/nasa/openmct-tutorial).
@@ -414,7 +355,7 @@ attribute      | type   | flags    | notes
 ---            |  ---   |  ---     | ---
 `key`          | string | required | unique identifier for this field.  
 `hints`        | object | required | Hints allow views to intelligently select relevant attributes for display, and are required for most views to function.  See section on "Value Hints" below.
-`name`         | string | optional | a human readable label for this field.  If omitted, defaults to `key`.
+`name`         | string | optional | a human readible label for this field.  If omitted, defaults to `key`.
 `source`       | string | optional | identifies the property of a datum where this value is stored.  If omitted, defaults to `key`.
 `format`       | string | optional | a specific format identifier, mapping to a formatter.  If omitted, uses a default formatter.  For enumerations, use `enum`.  For timestamps, use `utc` if you are using utc dates, otherwise use a key mapping to your custom date format.  
 `units`        | string | optional | the units of this value, e.g. `km`, `seconds`, `parsecs`
@@ -442,7 +383,7 @@ In order for the time conductor to work, there will always be an active "time sy
 
 #### Telemetry Providers
 
-Telemetry providers are responsible for providing historical and real-time telemetry data for telemetry objects.  Each telemetry provider determines which objects it can provide telemetry for, and then must implement methods to provide telemetry for those objects.
+Telemetry providers are responsible for providing historical and real time telemetry data for telemetry objects.  Each telemetry provider determines which objects it can provide telemetry for, and then must implement methods to provide telemetry for those objects.
 
 A telemetry provider is a javascript object with up to four methods:
 
@@ -450,10 +391,6 @@ A telemetry provider is a javascript object with up to four methods:
 * `subscribe(domainObject, callback, options)` required if `supportsSubscribe` is implemented.  Establish a subscription for realtime data for the given domain object.  Should invoke `callback` with a single telemetry datum every time data is received.  Must return an unsubscribe function.  Multiple views can subscribe to the same telemetry object, so it should always return a new unsubscribe function.
 * `supportsRequest(domainObject, options)` optional.  Must be implemented to provide historical telemetry.  Should return `true` if the provider supports historical requests for the given domain object.
 * `request(domainObject, options)` required if `supportsRequest` is implemented.  Must return a promise for an array of telemetry datums that fulfills the request.  The `options` argument will include a `start`, `end`, and `domain` attribute representing the query bounds.  For more request properties, see Request Properties below.
-* `supportsMetadata(domainObject)` optional.  Implement and return `true` for objects that you want to provide dynamic metadata for.
-* `getMetadata(domainObject)` required if `supportsMetadata` is implemented.  Must return a valid telemetry metadata definition that includes at least one valueMetadata definition.
-* `supportsLimits(domainObject)` optional.  Implement and return `true` for domain objects that you want to provide a limit evaluator for.
-* `getLimitEvaluator(domainObject)` required if `supportsLimits` is implemented.  Must return a valid LimitEvaluator for a given domain object.
 
 Telemetry providers are registered by calling `openmct.telemetry.addProvider(provider)`, e.g.
 
@@ -461,15 +398,14 @@ Telemetry providers are registered by calling `openmct.telemetry.addProvider(pro
 openmct.telemetry.addProvider({
     supportsRequest: function (domainObject, options) { /*...*/ },
     request: function (domainObject, options) { /*...*/ },
+    supportsSubscribe: function (domainObject, callback, options) { /*...*/ },
+    subscribe: function (domainObject, callback, options) { /*...*/ }
 })
 ```
 
-Note: it is not required to implement all of the methods on every provider.  Depending on the complexity of your implementation, it may be helpful to instantiate and register your realtime, historical, and metadata providers separately.
-
 #### Telemetry Requests
 
 Telemetry requests support time bounded queries. A call to a _Telemetry Provider_'s `request` function will include an `options` argument. These are simply javascript objects with attributes for the request parameters. An example of a telemetry request object with a start and end time is included below:
-
 ```javascript
 {
     start: 1487981997240,
@@ -478,54 +414,7 @@ Telemetry requests support time bounded queries. A call to a _Telemetry Provider
 }
 ```
 
-In this case, the `domain` is the currently selected time-system, and the start and end dates are valid dates in that time system.
-
-The response to a telemetry request is an array of telemetry datums.  
-These datums must be sorted by `domain` in ascending order.
-
-#### Request Strategies **draft**
-
-To improve performance views may request a certain strategy for data reduction.  These are intended to improve visualization performance by reducing the amount of data needed to be sent to the client.  These strategies will be indicated by additional parameters in the request options.  You may choose to handle them or ignore them.  
-
-Note: these strategies are currently being tested in core plugins and may change based on developer feedback.
-
-##### `latest` request strategy
-
-This request is a "depth based" strategy.  When a view is only capable of
-displaying a single value (or perhaps the last ten values), then it can
-use the `latest` request strategy with a `size` parameter that specifies
-the number of results it desires.  The `size` parameter is a hint; views
-must not assume the response will have the exact number of results requested.
-
-example:
-```javascript
-{
-    start: 1487981997240,
-    end: 1487982897240,
-    domain: 'utc',
-    strategy: 'latest',
-    size: 1
-}
-```
-
-This strategy says "I want the lastest data point in this time range".  A provider which recognizes this request should return only one value-- the latest-- in the requested time range.  Depending on your back-end implementation, performing these queries in bulk can be a large performance increase.  These are generally issued by views that are only capable of displaying a single value and only need to show the latest value.
-
-##### `minmax` request strategy
-
-example:
-```javascript
-{
-    start: 1487981997240,
-    end: 1487982897240,
-    domain: 'utc',
-    strategy: 'minmax',
-    size: 720
-}
-```
-
-MinMax queries are issued by plots, and may be issued by other types as well.  The aim is to reduce the amount of data returned but still faithfully represent the full extent of the data.  In order to do this, the view calculates the maximum data resolution it can display (i.e. the number of horizontal pixels in a plot) and sends that as the `size`.  The response should include at least one minimum and one maximum value per point of resolution.
-
-#### Telemetry Formats **draft**
+#### Telemetry Formats
 
 Telemetry format objects define how to interpret and display telemetry data. 
 They have a simple structure:
@@ -595,17 +484,6 @@ The key-value pairs of this object are described by the telemetry metadata of
 a domain object, as discussed in the [Telemetry Metadata](#telemetry-metadata)
 section.
 
-#### Limit Evaluators **draft**
-
-Limit evaluators allow a telemetry integrator to define how limits should be 
-applied to telemetry from a given domain object.  For an example of a limit 
-evaluator, take a look at `examples/generator/SinewaveLimitProvider.js`.
-
-### Telemetry Consumer APIs **draft**
-
-The APIs for requesting telemetry from Open MCT -- e.g. for use in custom views -- are currently in draft state and are being revised.  If you'd like to experiement with them before they are finalized, please contact the team via the contact-us link on our website.
-
-
 ## Time API
 
 Open MCT provides API for managing the temporal state of the application.
@@ -713,7 +591,7 @@ openmct.time.bounds({start: now - ONE_HOUR, now);
 To respond to bounds change events, listen for the [`'bounds'`](#time-events)
 event.
 
-### Clocks
+## Clocks
 
 The Time API can be set to follow a clock source which will cause the bounds
 to be updated automatically whenever the clock source "ticks". A clock is simply
@@ -732,7 +610,7 @@ be defined to tick on some remote timing source.
 The values provided by clocks are simple `number`s, which are interpreted in the
 context of the active [Time System](#defining-and-registering-time-systems).
 
-#### Defining and registering clocks
+### Defining and registering clocks
 
 A clock is an object that defines certain required metadata and functions:
 
@@ -846,7 +724,7 @@ __Note:__ Setting the clock offsets will trigger an immediate bounds change, as
 new bounds will be calculated based on the `currentValue()` of the active clock. 
 Clock offsets are only relevant when a clock source is active.
 
-### Time Events
+## Time Events
 
 The Time API is a standard event emitter; you can register callbacks for events using the `on` method and remove callbacks for events with the `off` method.
 
@@ -888,7 +766,7 @@ The events emitted by the Time API are:
   * `clockOffsets`: The new [clock offsets](#clock-offsets).
 
 
-### The Time Conductor
+## The Time Conductor
 
 The Time Conductor provides a user interface for managing time bounds in Open 
 MCT. It allows a user to select from configured time systems and clocks, and to set bounds and clock offsets.

README.md

@@ -88,7 +88,7 @@ and [`gulp`](http://gulpjs.com/).
 
 To build Open MCT for deployment:
 
-`npm run prepare`
+`npm run prepublish`
 
 This will compile and minify JavaScript sources, as well as copy over assets.
 The contents of the `dist` folder will contain a runnable Open MCT

bower.json

@@ -17,7 +17,7 @@
     "screenfull": "^3.0.0",
     "node-uuid": "^1.4.7",
     "comma-separated-values": "^3.6.4",
-    "file-saver": "1.3.3",
+    "file-saver": "^1.3.3",
     "zepto": "^1.1.6",
     "eventemitter3": "^1.2.0",
     "lodash": "3.10.1",

circle.yml

@@ -1,11 +1,3 @@
-machine:
-  node:
-    version: 4.7.0
-
-dependencies:
-  pre:
-    - npm install -g npm@latest
-
 deployment:
   production:
     branch: master
@@ -24,4 +16,4 @@ test:
 general:
   branches:
     ignore:
-      - gh-pages
+      - gh-pages

docs/src/guide/index.md

@@ -2283,7 +2283,7 @@ To install build dependencies (only needs to be run once):
 
 To build:
 
-`npm run prepare`
+`npm run prepublish`
 
 This will compile and minify JavaScript sources, as well as copy over assets.
 The contents of the `dist` folder will contain a runnable Open MCT

docs/src/guide/security.md

@@ -1,121 +0,0 @@
-# Security Guide
-
-Open MCT is a rich client with plugin support that executes as a single page
-web application in a browser environment. Security concerns and
-vulnerabilities associated with the web as a platform should be considered
-before deploying Open MCT (or any other web application) for mission or
-production usage.
-
-This document describes several important points to consider when developing
-for or deploying Open MCT securely. Other resources such as
-[Open Web Application Security Project (OWASP)](https://www.owasp.org)
-provide a deeper and more general overview of security for web applications.
-
-
-## Security Model
-
-Open MCT has been architected assuming the following deployment pattern:
-
-* A tagged, tested Open MCT version will be used.
-* Externally authored plugins will be installed.
-* A server will provide persistent storage, telemetry, and other shared data.
-* Authorization, authentication, and auditing will be handled by a server.
-
-
-## Security Procedures
-
-The Open MCT team secures our code base using a combination of code review,
-dependency review, and periodic security reviews. Static analysis performed 
-during automated verification additionally safeguards against common 
-coding errors which may result in vulnerabilities.
-
-
-### Code Review
-
-All contributions are reviewed by internal team members. External
-contributors receive increased scrutiny for security and quality,
-and must sign a licensing agreement.
-
-### Dependency Review
-
-Before integrating third-party dependencies, they are reviewed for security
-and quality, with consideration given to authors and users of these
-dependencies, as well as review of open source code.
-
-### Periodic Security Reviews
-
-Open MCT's code, design, and architecture are periodically reviewed
-(approximately annually) for common security issues, such as the
-[OWASP Top Ten](https://www.owasp.org/index.php/Category:OWASP_Top_Ten_Project).
-
-
-## Security Concerns
-
-Certain security concerns deserve special attention when deploying Open MCT,
-or when authoring plugins.
-
-### Identity Spoofing
-
-Open MCT issues calls to web services with the privileges of a logged in user.
-Compromised sources (either for Open MCT itself or a plugin) could
-therefore allow malicious code to execute with those privileges.
-
-To avoid this:
-
-* Serve Open MCT and other scripts over SSL (https rather than http)
-  to prevent man-in-the-middle attacks.
-* Exercise precautions such as security reviews for any plugins or
-  applications built for or with Open MCT to reject malicious changes.
-
-### Information Disclosure
-
-If Open MCT is used to handle or display sensitive data, any components
-(such as adapter plugins) must take care to avoid leaking or disclosing
-this information. For example, avoid sending sensitive data to third-party
-servers or insecure APIs.
-
-### Data Tampering
-
-The web application architecture leaves open the possibility that direct
-calls will be made to back-end services, circumventing Open MCT entirely.
-As such, Open MCT assumes that server components will perform any necessary
-data validation during calls issues to the server.
-
-Additionally, plugins which serialize and write data to the server must
-escape that data to avoid database injection attacks, and similar.
-
-### Repudiation
-
-Open MCT assumes that servers log any relevant interactions and associates
-these with a user identity; the specific user actions taken within the
-application are assumed not to be of concern for auditing.
-
-In the absence of server-side logging, users may disclaim (maliciously,
-mistakenly, or otherwise) actions taken within the system without any
-way to prove otherwise.
-
-If keeping client-level interactions is important, this will need to be
-implemented via a plugin.
-
-### Denial-of-service
-
-Open MCT assumes that server-side components will be insulated against
-denial-of-service attacks. Services should only permit resource-intensive
-tasks to be initiated by known or trusted users.
-
-### Elevation of Privilege
-
-Corollary to the assumption that servers guide against identity spoofing,
-Open MCT assumes that services do not allow a user to act with
-inappropriately escalated privileges. Open MCT cannot protect against
-such escalation; in the clearest case, a malicious actor could interact
-with web services directly to exploit such a vulnerability.
-
-## Additional Reading
-
-The following resources have been used as a basis for identifying potential
-security threats to Open MCT deployments in preparation of this document:
-
-* [STRIDE model](https://www.owasp.org/index.php/Threat_Risk_Modeling#STRIDE)
-* [Attack Surface Analysis Cheat Sheet](https://www.owasp.org/index.php/Attack_Surface_Analysis_Cheat_Sheet)
-* [XSS Prevention Cheat Sheet](https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet)

example/generator/GeneratorMetadataProvider.js

@@ -1,108 +0,0 @@
-define([
-    'lodash'
-], function (
-    _
-) {
-
-    var METADATA_BY_TYPE = {
-        'generator': {
-            values: [
-                {
-                    key: "name",
-                    name: "Name"
-                },
-                {
-                    key: "utc",
-                    name: "Time",
-                    format: "utc",
-                    hints: {
-                        domain: 1
-                    }
-                },
-                {
-                    key: "yesterday",
-                    name: "Yesterday",
-                    format: "utc",
-                    hints: {
-                        domain: 2
-                    }
-                },
-                {
-                    key: "sin",
-                    name: "Sine",
-                    hints: {
-                        range: 1
-                    }
-                },
-                {
-                    key: "cos",
-                    name: "Cosine",
-                    hints: {
-                        range: 2
-                    }
-                }
-            ]
-        },
-        'example.state-generator': {
-            values: [
-                {
-                    key: "name",
-                    name: "Name"
-                },
-                {
-                    key: "utc",
-                    name: "Time",
-                    format: "utc",
-                    hints: {
-                        domain: 1
-                    }
-                },
-                {
-                    key: "state",
-                    source: "value",
-                    name: "State",
-                    format: "enum",
-                    enumerations: [
-                        {
-                            value: 0,
-                            string: "OFF"
-                        },
-                        {
-                            value: 1,
-                            string: "ON"
-                        }
-                    ],
-                    hints: {
-                        range: 1
-                    }
-                },
-                {
-                    key: "value",
-                    name: "Value",
-                    hints: {
-                        range: 2
-                    }
-                }
-            ]
-        }
-    }
-
-    function GeneratorMetadataProvider() {
-
-    }
-
-    GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
-        return METADATA_BY_TYPE.hasOwnProperty(domainObject.type);
-    };
-
-    GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
-        return _.extend(
-                {},
-                domainObject.telemetry,
-                METADATA_BY_TYPE[domainObject.type]
-            );
-    };
-
-    return GeneratorMetadataProvider;
-
-});

example/generator/GeneratorProvider.js

@@ -30,8 +30,7 @@ define([
         amplitude: 1,
         period: 10,
         offset: 0,
-        dataRateInHz: 1,
-        phase: 0
+        dataRateInHz: 1
     };
 
     function GeneratorProvider() {
@@ -51,12 +50,9 @@ define([
             'amplitude',
             'period',
             'offset',
-            'dataRateInHz',
-            'phase',
+            'dataRateInHz'
         ];
 
-        request = request || {};
-
         var workerRequest = {};
 
         props.forEach(function (prop) {
@@ -66,12 +62,12 @@ define([
             if (request && request.hasOwnProperty(prop)) {
                 workerRequest[prop] = request[prop];
             }
-            if (!workerRequest.hasOwnProperty(prop)) {
+            if (!workerRequest[prop]) {
                 workerRequest[prop] = REQUEST_DEFAULTS[prop];
             }
             workerRequest[prop] = Number(workerRequest[prop]);
         });
-        workerRequest.name = domainObject.name;
+
         return workerRequest;
     };
 

example/generator/SinewaveLimitCapability.js

@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+/*global define*/
+
+define(
+    [],
+    function () {
+        "use strict";
+
+        var RED = 0.9,
+            YELLOW = 0.5,
+            LIMITS = {
+                rh: {
+                    cssClass: "s-limit-upr s-limit-red",
+                    low: RED,
+                    high: Number.POSITIVE_INFINITY,
+                    name: "Red High"
+                },
+                rl: {
+                    cssClass: "s-limit-lwr s-limit-red",
+                    high: -RED,
+                    low: Number.NEGATIVE_INFINITY,
+                    name: "Red Low"
+                },
+                yh: {
+                    cssClass: "s-limit-upr s-limit-yellow",
+                    low: YELLOW,
+                    high: RED,
+                    name: "Yellow High"
+                },
+                yl: {
+                    cssClass: "s-limit-lwr s-limit-yellow",
+                    low: -RED,
+                    high: -YELLOW,
+                    name: "Yellow Low"
+                }
+            };
+
+        function SinewaveLimitCapability(domainObject) {
+            return {
+                limits: function (range) {
+                    return LIMITS;
+                },
+                evaluate: function (datum, range) {
+                    range = range || 'sin';
+                    if (datum[range] > RED) {
+                        return LIMITS.rh;
+                    }
+                    if (datum[range] < -RED) {
+                        return LIMITS.rl;
+                    }
+                    if (datum[range] > YELLOW) {
+                        return LIMITS.yh;
+                    }
+                    if (datum[range] < -YELLOW) {
+                        return LIMITS.yl;
+                    }
+                }
+            };
+        }
+
+        SinewaveLimitCapability.appliesTo = function (model) {
+            return model.type === 'generator';
+        };
+
+        return SinewaveLimitCapability;
+    }
+);

example/generator/SinewaveLimitProvider.js

@@ -1,88 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, 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.
- *****************************************************************************/
-/*global define*/
-
-define([
-
-], function (
-
-) {
-
-    var RED = 0.9,
-        YELLOW = 0.5,
-        LIMITS = {
-            rh: {
-                cssClass: "s-limit-upr s-limit-red",
-                low: RED,
-                high: Number.POSITIVE_INFINITY,
-                name: "Red High"
-            },
-            rl: {
-                cssClass: "s-limit-lwr s-limit-red",
-                high: -RED,
-                low: Number.NEGATIVE_INFINITY,
-                name: "Red Low"
-            },
-            yh: {
-                cssClass: "s-limit-upr s-limit-yellow",
-                low: YELLOW,
-                high: RED,
-                name: "Yellow High"
-            },
-            yl: {
-                cssClass: "s-limit-lwr s-limit-yellow",
-                low: -RED,
-                high: -YELLOW,
-                name: "Yellow Low"
-            }
-        };
-
-    function SinewaveLimitProvider() {
-
-    }
-
-    SinewaveLimitProvider.prototype.supportsLimits = function (domainObject) {
-        return domainObject.type === 'generator';
-    };
-
-    SinewaveLimitProvider.prototype.getLimitEvaluator = function (domainObject) {
-        return {
-            evaluate: function (datum, valueMetadata) {
-                var range = valueMetadata ? valueMetadata.key : 'sin'
-                if (datum[range] > RED) {
-                    return LIMITS.rh;
-                }
-                if (datum[range] < -RED) {
-                    return LIMITS.rl;
-                }
-                if (datum[range] > YELLOW) {
-                    return LIMITS.yh;
-                }
-                if (datum[range] < -YELLOW) {
-                    return LIMITS.yl;
-                }
-            }
-        };
-    };
-
-    return SinewaveLimitProvider;
-});

example/generator/StateGeneratorProvider.js

@@ -1,80 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, 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 StateGeneratorProvider() {
-
-    }
-
-    function pointForTimestamp(timestamp, duration, name) {
-        return {
-            name: name,
-            utc: Math.floor(timestamp / duration) * duration,
-            value: Math.floor(timestamp / duration) % 2
-        };
-    }
-
-    StateGeneratorProvider.prototype.supportsSubscribe = function (domainObject) {
-        return domainObject.type === 'example.state-generator';
-    };
-
-    StateGeneratorProvider.prototype.subscribe = function (domainObject, callback) {
-        var duration = domainObject.telemetry.duration * 1000;
-
-        var interval = setInterval(function () {
-            var now = Date.now();
-            callback(pointForTimestamp(now, duration, domainObject.name));
-        }, duration);
-
-        return function () {
-            clearInterval(interval);
-        };
-    };
-
-
-    StateGeneratorProvider.prototype.supportsRequest = function (domainObject, options) {
-        return domainObject.type === 'example.state-generator';
-    };
-
-    StateGeneratorProvider.prototype.request = function (domainObject, options) {
-        var start = options.start;
-        var end = options.end;
-        var duration = domainObject.telemetry.duration * 1000;
-        if (options.strategy === 'latest' || options.size === 1) {
-            start = end;
-        }
-        var data = [];
-        while (start <= end && data.length < 5000) {
-            data.push(pointForTimestamp(start, duration, domainObject.name));
-            start += 5000;
-        }
-        return Promise.resolve(data);
-    };
-
-    return StateGeneratorProvider;
-
-});

example/generator/generatorWorker.js

@@ -62,11 +62,10 @@
                 self.postMessage({
                     id: message.id,
                     data: {
-                        name: data.name,
                         utc: nextStep,
                         yesterday: nextStep - 60*60*24*1000,
-                        sin: sin(nextStep, data.period, data.amplitude, data.offset, data.phase),
-                        cos: cos(nextStep, data.period, data.amplitude, data.offset, data.phase)
+                        sin: sin(nextStep, data.period, data.amplitude, data.offset),
+                        cos: cos(nextStep, data.period, data.amplitude, data.offset)
                     }
                 });
                 nextStep += step;
@@ -83,22 +82,21 @@
     }
 
     function onRequest(message) {
-        var request = message.data;
-        if (request.end == undefined) {
-            request.end = Date.now();
+        var data = message.data;
+        if (data.end == undefined) {
+            data.end = Date.now();
         }
-        if (request.start == undefined){
-            request.start = request.end - FIFTEEN_MINUTES;
+        if (data.start == undefined){
+            data.start = data.end - FIFTEEN_MINUTES;
         }
 
         var now = Date.now();
-        var start = request.start;
-        var end = request.end > now ? now : request.end;
-        var amplitude = request.amplitude;
-        var period = request.period;
-        var offset = request.offset;
-        var dataRateInHz = request.dataRateInHz;
-        var phase = request.phase;
+        var start = data.start;
+        var end = data.end > now ? now : data.end;
+        var amplitude = data.amplitude;
+        var period = data.period;
+        var offset = data.offset;
+        var dataRateInHz = data.dataRateInHz;
 
         var step = 1000 / dataRateInHz;
         var nextStep = start - (start % step) + step;
@@ -107,11 +105,10 @@
 
         for (; nextStep < end && data.length < 5000; nextStep += step) {
             data.push({
-                name: request.name,
                 utc: nextStep,
                 yesterday: nextStep - 60*60*24*1000,
-                sin: sin(nextStep, period, amplitude, offset, phase),
-                cos: cos(nextStep, period, amplitude, offset, phase)
+                sin: sin(nextStep, period, amplitude, offset),
+                cos: cos(nextStep, period, amplitude, offset)
             });
         }
         self.postMessage({
@@ -120,14 +117,14 @@
         });
     }
 
-    function cos(timestamp, period, amplitude, offset, phase) {
+    function cos(timestamp, period, amplitude, offset) {
         return amplitude *
-            Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + offset;
+            Math.cos(timestamp / period / 1000 * Math.PI * 2) + offset;
     }
 
-    function sin(timestamp, period, amplitude, offset, phase) {
+    function sin(timestamp, period, amplitude, offset) {
         return amplitude *
-            Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + offset;
+            Math.sin(timestamp / period / 1000 * Math.PI * 2) + offset;
     }
 
     function sendError(error, message) {

example/generator/plugin.js

@@ -23,46 +23,29 @@
 
 define([
     "./GeneratorProvider",
-    "./SinewaveLimitProvider",
-    "./StateGeneratorProvider",
-    "./GeneratorMetadataProvider"
+    "./SinewaveLimitCapability"
 ], function (
     GeneratorProvider,
-    SinewaveLimitProvider,
-    StateGeneratorProvider,
-    GeneratorMetadataProvider
+    SinewaveLimitCapability
 ) {
 
-    return function(openmct){
-
-        openmct.types.addType("example.state-generator", {
-            name: "State Generator",
-            description: "For development use.  Generates test enumerated telemetry by cycling through a given set of states",
-            cssClass: "icon-telemetry",
-            creatable: true,
-            form: [
-                {
-                    name: "State Duration (seconds)",
-                    control: "textfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "duration",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "duration"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
-                }
-            ],
-            initialize: function (object) {
-                object.telemetry = {
-                    duration: 5
-                }
+    var legacyExtensions = {
+        "capabilities": [
+            {
+                "key": "limit",
+                "implementation": SinewaveLimitCapability
             }
+        ]
+    };
+
+    return function(openmct){
+        //Register legacy extensions for things not yet supported by the new API
+        Object.keys(legacyExtensions).forEach(function (type){
+            var extensionsOfType = legacyExtensions[type];
+            extensionsOfType.forEach(function (extension) {
+                openmct.legacyExtension(type, extension)
+            })
         });
-
-        openmct.telemetry.addProvider(new StateGeneratorProvider());
-
         openmct.types.addType("generator", {
             name: "Sine Wave Generator",
             description: "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
@@ -71,58 +54,51 @@ define([
             form: [
                 {
                     name: "Period",
-                    control: "numberfield",
+                    control: "textfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "period",
                     required: true,
                     property: [
                         "telemetry",
                         "period"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                 },
                 {
                     name: "Amplitude",
-                    control: "numberfield",
+                    control: "textfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "amplitude",
                     required: true,
                     property: [
                         "telemetry",
                         "amplitude"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                 },
                 {
                     name: "Offset",
-                    control: "numberfield",
+                    control: "textfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "offset",
                     required: true,
                     property: [
                         "telemetry",
                         "offset"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                 },
                 {
                     name: "Data Rate (hz)",
-                    control: "numberfield",
+                    control: "textfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "dataRateInHz",
                     required: true,
                     property: [
                         "telemetry",
                         "dataRateInHz"
-                    ]
-                },
-                {
-                    name: "Phase (radians)",
-                    control: "numberfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "phase",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "phase"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                 }
             ],
             initialize: function (object) {
@@ -131,14 +107,42 @@ define([
                     amplitude: 1,
                     offset: 0,
                     dataRateInHz: 1,
-                    phase: 0
+                    values: [
+                        {
+                            key: "utc",
+                            name: "Time",
+                            format: "utc",
+                            hints: {
+                                domain: 1
+                            }
+                        },
+                        {
+                            key: "yesterday",
+                            name: "Yesterday",
+                            format: "utc",
+                            hints: {
+                                domain: 2
+                            }
+                        },
+                        {
+                            key: "sin",
+                            name: "Sine",
+                            hints: {
+                                range: 1
+                            }
+                        },
+                        {
+                            key: "cos",
+                            name: "Cosine",
+                            hints: {
+                                range: 2
+                            }
+                        }
+                    ]
                 };
             }
         });
-
         openmct.telemetry.addProvider(new GeneratorProvider());
-        openmct.telemetry.addProvider(new GeneratorMetadataProvider());
-        openmct.telemetry.addProvider(new SinewaveLimitProvider());
     };
 
 });

example/identity/bundle.js

@@ -38,7 +38,8 @@ define([
                     "provides": "identityService",
                     "type": "provider",
                     "depends": [
-                        "dialogService"
+                        "dialogService",
+                        "$q"
                     ]
                 }
             ]

example/identity/src/ExampleIdentityService.js

@@ -55,21 +55,37 @@ define(
          * @implements {IdentityService}
          * @memberof platform/identity
          */
-        function ExampleIdentityProvider(dialogService) {
-            // Handle rejected dialog messages by treating the
-            // current user as undefined.
-            function echo(v) { return v; }
-            function giveUndefined() { return undefined; }
+        function ExampleIdentityProvider(dialogService, $q) {
+            this.dialogService = dialogService;
+            this.$q = $q;
 
-            this.userPromise =
-                dialogService.getUserInput(DIALOG_STRUCTURE, DEFAULT_IDENTITY)
-                    .then(echo, giveUndefined);
+            this.returnUser = this.returnUser.bind(this);
+            this.returnUndefined = this.returnUndefined.bind(this);
         }
 
         ExampleIdentityProvider.prototype.getUser = function () {
-            return this.userPromise;
+            if (this.user) {
+                return this.$q.when(this.user);
+            } else {
+                return this.dialogService.getUserInput(DIALOG_STRUCTURE, DEFAULT_IDENTITY)
+                    .then(this.returnUser, this.returnUndefined);
+            }
         };
 
+        /**
+         * @private
+         */
+        ExampleIdentityProvider.prototype.returnUser = function (user) {
+            return this.user = user;
+        }
+
+        /**
+         * @private
+         */
+        ExampleIdentityProvider.prototype.returnUndefined = function () {
+            return undefined;
+        }
+
         return ExampleIdentityProvider;
     }
 );

example/imagery/plugin.js

@@ -48,9 +48,8 @@ define([
                 "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
             ];
 
-        function pointForTimestamp(timestamp, name) {
+        function pointForTimestamp(timestamp) {
             return {
-                name: name,
                 utc: Math.floor(timestamp / 5000) * 5000,
                 url: IMAGE_SAMPLES[Math.floor(timestamp / 5000) % IMAGE_SAMPLES.length]
             };
@@ -62,7 +61,7 @@ define([
             },
             subscribe: function (domainObject, callback) {
                 var interval = setInterval(function () {
-                    callback(pointForTimestamp(Date.now(), domainObject.name));
+                    callback(pointForTimestamp(Date.now()));
                 }, 5000);
 
                 return function (interval) {
@@ -80,8 +79,8 @@ define([
                 var start = options.start;
                 var end = options.end;
                 var data = [];
-                while (start <= end && data.length < 5000) {
-                    data.push(pointForTimestamp(start, domainObject.name));
+                while (start < end && data.length < 5000) {
+                    data.push(pointForTimestamp(start));
                     start += 5000;
                 }
                 return Promise.resolve(data);
@@ -94,7 +93,7 @@ define([
                     options.strategy === 'latest';
             },
             request: function (domainObject, options) {
-                return Promise.resolve([pointForTimestamp(Date.now(), domainObject.name)]);
+                return Promise.resolve([pointForTimestamp(Date.now())]);
             }
         };
 
@@ -110,10 +109,6 @@ define([
                 initialize: function (object) {
                     object.telemetry = {
                         values: [
-                            {
-                                name: 'Name',
-                                key: 'name'
-                            },
                             {
                                 name: 'Time',
                                 key: 'utc',

example/plotOptions/bundle.js

@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    'legacyRegistry',
+    '../../platform/commonUI/browse/src/InspectorRegion',
+    '../../platform/commonUI/regions/src/Region'
+], function (
+    legacyRegistry,
+    InspectorRegion,
+    Region
+) {
+    "use strict";
+
+    /**
+     * Add a 'plot options' region part to the inspector region for the
+     * Telemetry Plot type only. {@link InspectorRegion} is a default region
+     * implementation that is added automatically to all types. In order to
+     * customize what appears in the inspector region, you can start from a
+     * blank slate by using Region, or customize the default inspector
+     * region by using {@link InspectorRegion}.
+     */
+    var plotInspector = new InspectorRegion(),
+     /**
+      * Two region parts are defined here. One that appears only in browse
+      * mode, and one that appears only in edit mode. For not they both point
+      * to the same representation, but a different key could be used here to
+      * include a customized representation for edit mode.
+      */
+        plotOptionsBrowseRegion = new Region({
+            name: "plot-options",
+            title: "Plot Options",
+            modes: ['browse'],
+            content: {
+                key: "plot-options-browse"
+            }
+        }),
+        plotOptionsEditRegion = new Region({
+            name: "plot-options",
+            title: "Plot Options",
+            modes: ['edit'],
+            content: {
+                key: "plot-options-browse"
+            }
+        });
+
+    /**
+     * Both parts are added, and policies of type 'region' will determine
+     * which is shown based on domain object state. A default policy is
+     * provided which will check the 'modes' attribute of the region part
+     * definition.
+     */
+    plotInspector.addRegion(plotOptionsBrowseRegion);
+    plotInspector.addRegion(plotOptionsEditRegion);
+
+    legacyRegistry.register("example/plotType", {
+        "name": "Plot Type",
+        "description": "Example illustrating registration of a new object type",
+        "extensions": {
+            "types": [
+                {
+                    "key": "plot",
+                    "name": "Example Telemetry Plot",
+                    "cssClass": "icon-telemetry-panel",
+                    "description": "For development use. A plot for displaying telemetry.",
+                    "priority": 10,
+                    "delegates": [
+                        "telemetry"
+                    ],
+                    "features": "creation",
+                    "contains": [
+                        {
+                            "has": "telemetry"
+                        }
+                    ],
+                    "model": {
+                        "composition": []
+                    },
+                    "inspector": plotInspector,
+                    "telemetry": {
+                        "source": "generator",
+                        "domains": [
+                            {
+                                "key": "time",
+                                "name": "Time"
+                            },
+                            {
+                                "key": "yesterday",
+                                "name": "Yesterday"
+                            },
+                            {
+                                "key": "delta",
+                                "name": "Delta",
+                                "format": "example.delta"
+                            }
+                        ],
+                        "ranges": [
+                            {
+                                "key": "sin",
+                                "name": "Sine"
+                            },
+                            {
+                                "key": "cos",
+                                "name": "Cosine"
+                            }
+                        ]
+                    },
+                    "properties": [
+                        {
+                            "name": "Period",
+                            "control": "textfield",
+                            "cssClass": "l-input-sm l-numeric",
+                            "key": "period",
+                            "required": true,
+                            "property": [
+                                "telemetry",
+                                "period"
+                            ],
+                            "pattern": "^\\d*(\\.\\d*)?$"
+                        }
+                    ]
+                }
+            ]
+        }
+    });
+});

example/styleguide/res/sass/_style-guide-base.scss

@@ -58,7 +58,11 @@
         position: relative;
     }
 
-    .w-mct-example > div { margin-bottom: $interiorMarginLg; }
+    .w-mct-example {
+        div {
+            margin-bottom: $interiorMarginLg;
+        }
+    }
 
     code,
     pre {

example/worker/src/FibonacciIndicator.js

@@ -54,7 +54,7 @@ define(
                     return "icon-object-unknown";
                 },
                 getText: function () {
-                    return latest;
+                    return "" + latest;
                 },
                 getDescription: function () {
                     return "";

gulpfile.js

@@ -22,8 +22,6 @@
 
 /*global require,__dirname*/
 
-require("v8-compile-cache");
-
 var gulp = require('gulp'),
     sourcemaps = require('gulp-sourcemaps'),
     path = require('path'),
@@ -179,4 +177,4 @@ gulp.task('install', [ 'assets', 'scripts' ]);
 
 gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
 
-gulp.task('build', [ 'verify', 'install' ]);
+gulp.task('build', [ 'verify', 'install' ]);

karma.conf.js

@@ -37,13 +37,14 @@ module.exports = function(config) {
             {pattern: 'bower_components/**/*.js', included: false},
             {pattern: 'node_modules/d3-*/**/*.js', included: false},
             {pattern: 'node_modules/vue/**/*.js', included: false},
-            {pattern: 'src/**/*', included: false},
+            {pattern: 'src/**/*.js', included: false},
             {pattern: 'example/**/*.html', included: false},
             {pattern: 'example/**/*.js', included: false},
             {pattern: 'example/**/*.json', included: false},
             {pattern: 'platform/**/*.js', included: false},
             {pattern: 'warp/**/*.js', included: false},
             {pattern: 'platform/**/*.html', included: false},
+            {pattern: 'src/**/*.html', included: false},
             'test-main.js'
         ],
 
@@ -88,8 +89,7 @@ module.exports = function(config) {
                 "dist/reports/coverage",
             check: {
                 global: {
-                    lines: 80,
-                    excludes: ['src/plugins/plot/**/*.js']
+                    lines: 80
                 }
             }
         },

openmct.js

@@ -40,7 +40,7 @@ requirejs.config({
         "vue": "node_modules/vue/dist/vue.min",
         "zepto": "bower_components/zepto/zepto.min",
         "lodash": "bower_components/lodash/lodash",
-        "d3-selection": "node_modules/d3-selection/dist/d3-selection.min",
+        "d3-selection": "node_modules/d3-selection/build/d3-selection.min",
         "d3-scale": "node_modules/d3-scale/build/d3-scale.min",
         "d3-axis": "node_modules/d3-axis/build/d3-axis.min",
         "d3-array": "node_modules/d3-array/build/d3-array.min",
@@ -101,7 +101,6 @@ define([
     var openmct = new MCT();
 
     openmct.legacyRegistry = defaultRegistry;
-    openmct.install(openmct.plugins.Plot());
 
     if (typeof BUILD_CONSTANTS !== 'undefined') {
         openmct.install(buildInfo(BUILD_CONSTANTS));

package.json

@@ -1,18 +1,18 @@
 {
   "name": "openmct",
-  "version": "0.13.3-SNAPSHOT",
+  "version": "0.12.1-SNAPSHOT",
   "description": "The Open MCT core platform",
   "dependencies": {
-    "d3-array": "1.2.x",
-    "d3-axis": "1.0.x",
-    "d3-collection": "1.0.x",
-    "d3-color": "1.0.x",
-    "d3-format": "1.2.x",
-    "d3-interpolate": "1.1.x",
-    "d3-scale": "1.0.x",
-    "d3-selection": "1.3.x",
-    "d3-time": "1.0.x",
-    "d3-time-format": "2.1.x",
+    "d3-array": "^1.0.2",
+    "d3-axis": "^1.0.4",
+    "d3-collection": "^1.0.2",
+    "d3-color": "^1.0.2",
+    "d3-format": "^1.0.2",
+    "d3-interpolate": "^1.1.3",
+    "d3-scale": "^1.0.4",
+    "d3-selection": "^1.0.3",
+    "d3-time": "^1.0.4",
+    "d3-time-format": "^2.0.3",
     "express": "^4.13.1",
     "minimist": "^1.1.1",
     "request": "^2.69.0",
@@ -28,7 +28,7 @@
     "gulp-jshint-html-reporter": "^0.1.3",
     "gulp-rename": "^1.2.2",
     "gulp-requirejs-optimize": "^0.3.1",
-    "gulp-sass": "^3.1.0",
+    "gulp-sass": "^2.2.0",
     "gulp-sourcemaps": "^1.6.0",
     "jasmine-core": "^2.3.0",
     "jscs-html-reporter": "^0.1.0",
@@ -50,8 +50,7 @@
     "moment": "^2.11.1",
     "node-bourbon": "^4.2.3",
     "requirejs": "2.1.x",
-    "split": "^1.0.0",
-    "v8-compile-cache": "^1.1.0"
+    "split": "^1.0.0"
   },
   "scripts": {
     "start": "node app.js",
@@ -61,7 +60,7 @@
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
     "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
     "docs": "npm run jsdoc ; npm run otherdoc",
-    "prepare": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
+    "prepublish": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
   },
   "repository": {
     "type": "git",

platform/commonUI/browse/res/templates/browse/object-properties.html

@@ -38,7 +38,6 @@
                   ng-class="{ last:($index + 1) === contextualParents.length }">
                 <mct-representation key="'label'"
                                     mct-object="parent"
-                                    ng-click="parent.getCapability('action').perform('navigate')"
                                     class="location-item">
                 </mct-representation>
             </span>
@@ -50,7 +49,6 @@
                   ng-class="{ last:($index + 1) === primaryParents.length }">
                 <mct-representation key="'label'"
                                     mct-object="parent"
-                                    ng-click="parent.getCapability('action').perform('navigate')"
                                     class="location-item">
                 </mct-representation>
             </span>

platform/commonUI/edit/src/controllers/EditObjectController.js

@@ -28,6 +28,16 @@ define(
     [],
     function () {
 
+        function isDirty(domainObject) {
+            var navigatedObject = domainObject,
+                editorCapability = navigatedObject &&
+                    navigatedObject.getCapability("editor");
+
+            return editorCapability &&
+                editorCapability.isEditContextRoot() &&
+                editorCapability.dirty();
+        }
+
         function cancelEditing(domainObject) {
             var navigatedObject = domainObject,
                 editorCapability = navigatedObject &&
@@ -49,7 +59,10 @@ define(
 
             var removeCheck = navigationService
                 .checkBeforeNavigation(function () {
-                    return "Continuing will cause the loss of any unsaved changes.";
+                    if (isDirty(domainObject)) {
+                        return "Continuing will cause the loss of any unsaved changes.";
+                    }
+                    return false;
                 });
 
             $scope.$on('$destroy', function () {

platform/commonUI/edit/src/controllers/ElementsController.js

@@ -52,22 +52,8 @@ define(
             }
 
             function setSelection(selection) {
-                if (!selection[0]) {
-                    return;
-                }
-
-                if (self.mutationListener) {
-                    self.mutationListener();
-                    delete self.mutationListener;
-                }
-
-                var domainObject = selection[0].context.oldItem;
-                self.refreshComposition(domainObject);
-
-                if (domainObject) {
-                    self.mutationListener = domainObject.getCapability('mutation')
-                        .listen(self.refreshComposition.bind(self, domainObject));
-                }
+                self.scope.selection = selection;
+                self.refreshComposition(selection);
             }
 
             $scope.filterBy = filterBy;
@@ -84,19 +70,19 @@ define(
         /**
          * Gets the composition for the selected object and populates the scope with it.
          *
-         * @param domainObject the selected object
+         * @param selection the selection object
          * @private
          */
-        ElementsController.prototype.refreshComposition = function (domainObject) {
-            var refreshTracker = {};
-            this.currentRefresh = refreshTracker;
+        ElementsController.prototype.refreshComposition = function (selection) {
+            if (!selection[0]) {
+                return;
+            }
+
+            var selectedObjectComposition = selection[0].context.oldItem.useCapability('composition');
 
-            var selectedObjectComposition = domainObject && domainObject.useCapability('composition');
             if (selectedObjectComposition) {
                 selectedObjectComposition.then(function (composition) {
-                    if (this.currentRefresh === refreshTracker) {
-                        this.scope.composition = composition;
-                    }
+                    this.scope.composition = composition;
                 }.bind(this));
             } else {
                 this.scope.composition = [];

platform/commonUI/edit/src/representers/EditToolbarSelection.js

@@ -44,17 +44,11 @@ define(
             this.selectedObj = undefined;
 
             openmct.selection.on('change', function (selection) {
-                var selected = selection[0];
-
-                if (selected && selected.context.toolbar) {
-                    this.select(selected.context.toolbar);
+                if (selection[0] && selection[0].context.toolbar) {
+                    this.select(selection[0].context.toolbar);
                 } else {
                     this.deselect();
                 }
-
-                if (selected && selected.context.viewProxy) {
-                    this.proxy(selected.context.viewProxy);
-                }
             }.bind(this));
         }
 

platform/commonUI/edit/test/controllers/EditObjectControllerSpec.js

@@ -104,10 +104,10 @@ define(
                 mockEditorCapability.isEditContextRoot.andReturn(false);
                 mockEditorCapability.dirty.andReturn(false);
 
-                expect(checkFn()).toBe("Continuing will cause the loss of any unsaved changes.");
+                expect(checkFn()).toBe(false);
 
                 mockEditorCapability.isEditContextRoot.andReturn(true);
-                expect(checkFn()).toBe("Continuing will cause the loss of any unsaved changes.");
+                expect(checkFn()).toBe(false);
 
                 mockEditorCapability.dirty.andReturn(true);
                 expect(checkFn())

platform/commonUI/edit/test/controllers/ElementsControllerSpec.js

@@ -29,48 +29,9 @@ define(
             var mockScope,
                 mockOpenMCT,
                 mockSelection,
-                mockDomainObject,
-                mockMutationCapability,
-                mockCompositionCapability,
-                mockCompositionObjects,
-                mockComposition,
-                mockUnlisten,
-                selectable = [],
                 controller;
 
-            function mockPromise(value) {
-                return {
-                    then: function (thenFunc) {
-                        return mockPromise(thenFunc(value));
-                    }
-                };
-            }
-
-            function createDomainObject() {
-                return {
-                    useCapability: function () {
-                        return mockCompositionCapability;
-                    }
-                };
-            }
-
             beforeEach(function () {
-                mockComposition = ["a", "b"];
-                mockCompositionObjects = mockComposition.map(createDomainObject);
-                mockCompositionCapability = mockPromise(mockCompositionObjects);
-
-                mockUnlisten = jasmine.createSpy('unlisten');
-                mockMutationCapability = jasmine.createSpyObj("mutationCapability", [
-                    "listen"
-                ]);
-                mockMutationCapability.listen.andReturn(mockUnlisten);
-                mockDomainObject = jasmine.createSpyObj("domainObject", [
-                    "getCapability",
-                    "useCapability"
-                ]);
-                mockDomainObject.useCapability.andReturn(mockCompositionCapability);
-                mockDomainObject.getCapability.andReturn(mockMutationCapability);
-
                 mockScope = jasmine.createSpyObj("$scope", ['$on']);
                 mockSelection = jasmine.createSpyObj("selection", [
                     'on',
@@ -82,14 +43,6 @@ define(
                     selection: mockSelection
                 };
 
-                selectable[0] = {
-                    context: {
-                        oldItem: mockDomainObject
-                    }
-                };
-
-                spyOn(ElementsController.prototype, 'refreshComposition').andCallThrough();
-
                 controller = new ElementsController(mockScope, mockOpenMCT);
             });
 
@@ -122,63 +75,6 @@ define(
                 expect(objects.filter(mockScope.searchElements).length).toBe(4);
             });
 
-            it("refreshes composition on selection", function () {
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
-
-                expect(ElementsController.prototype.refreshComposition).toHaveBeenCalledWith(mockDomainObject);
-            });
-
-            it("listens on mutation and refreshes composition", function () {
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
-
-                expect(mockDomainObject.getCapability).toHaveBeenCalledWith('mutation');
-                expect(mockMutationCapability.listen).toHaveBeenCalled();
-                expect(ElementsController.prototype.refreshComposition.calls.length).toBe(1);
-
-                mockMutationCapability.listen.mostRecentCall.args[0](mockDomainObject);
-
-                expect(ElementsController.prototype.refreshComposition.calls.length).toBe(2);
-            });
-
-            it("cleans up mutation listener when selection changes", function () {
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
-
-                expect(mockMutationCapability.listen).toHaveBeenCalled();
-
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
-
-                expect(mockUnlisten).toHaveBeenCalled();
-            });
-
-            it("does not listen on mutation for element proxy selectable", function () {
-                selectable[0] = {
-                    context: {
-                        elementProxy: {}
-                    }
-                };
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
-
-                expect(mockDomainObject.getCapability).not.toHaveBeenCalledWith('mutation');
-            });
-
-            it("checks concurrent changes to composition", function () {
-                var secondMockComposition = ["a", "b", "c"],
-                    secondMockCompositionObjects = secondMockComposition.map(createDomainObject),
-                    firstCompositionCallback,
-                    secondCompositionCallback;
-
-                spyOn(mockCompositionCapability, "then").andCallThrough();
-
-                controller.refreshComposition(mockDomainObject);
-                controller.refreshComposition(mockDomainObject);
-
-                firstCompositionCallback = mockCompositionCapability.then.calls[0].args[0];
-                secondCompositionCallback = mockCompositionCapability.then.calls[1].args[0];
-                secondCompositionCallback(secondMockCompositionObjects);
-                firstCompositionCallback(mockCompositionObjects);
-
-                expect(mockScope.composition).toBe(secondMockCompositionObjects);
-            });
         });
     }
 );

platform/commonUI/general/bundle.js

@@ -34,7 +34,6 @@ define([
     "./src/controllers/ContextMenuController",
     "./src/controllers/ClickAwayController",
     "./src/controllers/ViewSwitcherController",
-    "./src/controllers/BottomBarController",
     "./src/controllers/GetterSetterController",
     "./src/controllers/SelectorController",
     "./src/controllers/ObjectInspectorController",
@@ -49,6 +48,7 @@ define([
     "./src/directives/MCTSplitPane",
     "./src/directives/MCTSplitter",
     "./src/directives/MCTTree",
+    "./src/directives/MCTIndicators",
     "./src/filters/ReverseFilter",
     "text!./res/templates/bottombar.html",
     "text!./res/templates/controls/action-button.html",
@@ -84,7 +84,6 @@ define([
     ContextMenuController,
     ClickAwayController,
     ViewSwitcherController,
-    BottomBarController,
     GetterSetterController,
     SelectorController,
     ObjectInspectorController,
@@ -99,6 +98,7 @@ define([
     MCTSplitPane,
     MCTSplitter,
     MCTTree,
+    MCTIndicators,
     ReverseFilter,
     bottombarTemplate,
     actionButtonTemplate,
@@ -275,13 +275,6 @@ define([
                         "$timeout"
                     ]
                 },
-                {
-                    "key": "BottomBarController",
-                    "implementation": BottomBarController,
-                    "depends": [
-                        "indicators[]"
-                    ]
-                },
                 {
                     "key": "GetterSetterController",
                     "implementation": GetterSetterController,
@@ -395,6 +388,11 @@ define([
                     "key": "mctTree",
                     "implementation": MCTTree,
                     "depends": ['gestureService']
+                },
+                {
+                    "key": "mctIndicators",
+                    "implementation": MCTIndicators,
+                    "depends": ['openmct']
                 }
             ],
             "constants": [

platform/commonUI/general/res/sass/_constants.scss

@@ -99,7 +99,7 @@ $plotXBarH: 32px;
 $plotLegendH: 20px;
 $plotSwatchD: 8px;
 // 1: Top, 2: right, 3: bottom, 4: left
-$plotDisplayArea: (0, 0, $plotXBarH, $plotYBarW);
+$plotDisplayArea: ($plotLegendH + $interiorMargin, 0, $plotXBarH, $plotYBarW);
 /* min plot height is based on user testing to find minimum useful height */
 $plotMinH: 95px;
 /*************** Bubbles */

platform/commonUI/general/res/sass/_global.scss

@@ -40,7 +40,7 @@
     * Use https://icomoon.io/app with icomoon-project-openmct-symbols-12px.json
     * to generate font files
     */
-    font-family: 'symbolsfont-12px';
+    font-family: 'symbolsfont 12px';
     src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.eot');
     src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.eot?#iefix') format('embedded-opentype'),
     url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.woff') format('woff'),
@@ -248,12 +248,6 @@ a.disabled {
     color: rgba(#fff, 0.2);
 }
 
-.comma-list span {
-    &:not(:first-child) {
-        &:before { content: ', '; }
-    }
-}
-
 .test-stripes {
     @include bgDiagonalStripes();
 }

platform/commonUI/general/res/sass/_icons.scss

@@ -44,12 +44,6 @@
     }
 }
 
-
-.t-alert-unsynced {
-    @extend .icon-alert-triangle;
-    color: $colorPausedBg;
-}
-
 .bar .ui-symbol {
 	display: inline-block;
 }
@@ -87,5 +81,18 @@
             @include transform(scale(0.3));
             z-index: 2;
         }
+
+/*        .t-item-icon-glyph {
+            &:after {
+                color: $colorIconLink;
+                content: '\e921'; //$glyph-icon-link;
+                height: auto; width: auto;
+                position: absolute;
+                left: 0; top: 0; right: 0; bottom: 20%;
+                @include transform-origin(bottom left);
+                @include transform(scale(0.3));
+                z-index: 2;
+            }
+        }*/
     }
 }

platform/commonUI/general/res/sass/_inspector.scss

@@ -53,7 +53,6 @@
     .l-inspector-part {
         box-sizing: border-box;
         padding-right: $interiorMargin;
-
         .tree .form {
             margin-left: $treeVCW + $interiorMarginLg;
         }
@@ -79,7 +78,6 @@
                 }
             }
             .form-row {
-                // To be replaced with .inspector-config, see below.
                 @include align-items(center);
                 border: none !important;
                 margin-bottom: 0 !important;
@@ -101,12 +99,15 @@
         position: relative;
     }
 
+    ul li {
+        margin-bottom: $interiorMarginLg;
+    }
+
     em.t-inspector-part-header {
         border-radius: $basicCr;
         background-color: $colorInspectorSectionHeaderBg;
         color: $colorInspectorSectionHeaderFg;
-        margin-top: $interiorMarginLg;
-        //margin-bottom: $interiorMargin;
+        margin-bottom: $interiorMargin;
         padding: floor($formTBPad * .75) $formLRPad;
         text-transform: uppercase;
     }
@@ -200,102 +201,3 @@ mct-representation:not(.s-status-editing) .l-inspect {
         pointer-events: inherit;
     }
 }
-
-// NEW COMPACT FORM, FOR USE IN INSPECTOR
-// ul > li > label, control
-// Make a new UL for each form section
-// Allow control-first, controls-below
-
-.l-inspect .tree ul li,
-.inspector-config ul li {
-    padding: 2px 0;
-}
-
-
-.inspector-config {
-    $labelW: 40%;
-    $minW: $labelW;
-    ul {
-        margin-bottom: $interiorMarginLg;
-        li {
-            @include display(flex);
-            @include flex-wrap(wrap);
-            @include align-items(center);
-            label,
-            .control {
-                @include display(flex);
-                min-width: $minW;
-            }
-            label {
-                line-height: inherit;
-                padding: $interiorMarginSm 0;
-                width: $labelW;
-            }
-            .control {
-                @include flex-grow(1);
-            }
-
-            &:not(.section-header) {
-                &:not(.connects-to-previous) {
-                    //border-top: 1px solid $colorFormLines;
-                }
-            }
-
-            &.connects-to-previous {
-                padding-top: 0 !important;
-            }
-
-            &.section-header {
-                margin-top: $interiorMarginLg;
-                border-top: 1px solid $colorFormLines;
-            }
-
-            &.controls-first {
-                .control {
-                    @include flex-grow(0);
-                    margin-right: $interiorMargin;
-                    min-width: 0;
-                    order: 1;
-                    width: auto;
-                }
-                label {
-                    @include flex-grow(1);
-                    order: 2;
-                    width: auto;
-                }
-            }
-            &.controls-under {
-                display: block;
-                .control, label {
-                    display: block;
-                    width: auto;
-                }
-
-                ul li {
-                    border-top: none !important;
-                    padding: 0;
-                }
-            }
-        }
-    }
-
-    .form-error {
-        // Block element that visually flags an error and contains a message
-        background-color: $colorFormFieldErrorBg;
-        color: $colorFormFieldErrorFg;
-        border-radius: $basicCr;
-        display: block;
-        padding: 1px 6px;
-        &:before {
-            content: $glyph-icon-alert-triangle;
-            display: inline;
-            font-family: symbolsfont;
-            margin-right: $interiorMarginSm;
-        }
-    }
-}
-
-.tree .inspector-config {
-    margin-left: $treeVCW + $interiorMarginLg;
-}
-

platform/commonUI/general/res/sass/_main.scss

@@ -70,7 +70,6 @@
 @import "fixed-position";
 @import "lists/tabular";
 @import "plots/plots-main";
-@import "plots/legend";
 @import "iframe";
 @import "views";
 @import "items/item";

platform/commonUI/general/res/sass/_views.scss

@@ -5,7 +5,6 @@
 }
 
 .l-view-section {
-    //@include test(orange, 0.1);
 	@include absPosDefault(0);
 	h2 {
 		color: #fff;

platform/commonUI/general/res/sass/controls/_controls.scss

@@ -150,26 +150,6 @@
     }
 }
 
-/******************************************************** VIEW CONTROLS */
-// Expand/collapse > and v arrows, used in tree and plot legend
-// Moved this over from a tree-only context 5/18/17
-
-.view-control {
-    @extend .ui-symbol;
-    cursor: pointer;
-    height: 1em; width: 1em;
-    line-height: inherit;
-    &:before {
-        position: absolute;
-        @include trans-prop-nice(transform, 100ms);
-        content: $glyph-icon-arrow-right;
-        @include transform-origin(center);
-    }
-    &.expanded:before {
-        @include transform(rotate(90deg));
-    }
-}
-
 /******************************************************** CUSTOM CHECKBOXES */
 label.checkbox.custom,
 label.radio.custom {

platform/commonUI/general/res/sass/controls/_menus.scss

@@ -77,14 +77,6 @@
     position: relative;
 }
 
-.s-menu {
-    border-radius: $basicCr;
-    @include containerSubtle($colorMenuBg, $colorMenuFg);
-    @include boxShdw($shdwMenu);
-    @include txtShdw($shdwMenuText);
-    padding: $interiorMarginSm 0;
-}
-
 .menu {
     border-radius: $basicCr;
     @include containerSubtle($colorMenuBg, $colorMenuFg);

platform/commonUI/general/res/sass/controls/_messages.scss

@@ -398,6 +398,10 @@ body.desktop .t-message-list {
     .object-header {
         .t-object-alert {
             display: inline;
+            &.t-alert-unsynced {
+                @extend .icon-alert-triangle;
+                color: $colorPausedBg;
+            }
         }
     }
 }

platform/commonUI/general/res/sass/controls/_palette.scss

@@ -20,70 +20,53 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 .l-palette {
+	$d: 16px;
+	$colorsPerRow: 10;
+	$m: 1;
+
 	box-sizing: border-box;
 	padding: $interiorMargin !important;
-}
 
-.l-palette-row {
-    $d: 16px;
-    $m: 1;
-    $colorsPerRow: 10;
-    display: flex;
-    flex-wrap: wrap;
-    line-height: $d;
-    width: ($d * $colorsPerRow) + ($m * $colorsPerRow);
+	.l-palette-row {
+		@include clearfix;
+		line-height: $d;
+		width: ($d * $colorsPerRow) + ($m * $colorsPerRow);
 
-    &.l-option-row {
-        margin-bottom: $interiorMargin;
-        .s-palette-item {
-            border-color: $colorPaletteFg;
-        }
-    }
-
-    .l-palette-item {
-        box-sizing: border-box;
-        display: block;
-        height: $d; width: $d;
-        min-width: $d;
-        line-height: $d * 0.9;
-        margin: 0 ($m * 1px) ($m * 1px) 0;
-        position: relative;
-        text-align: center;
-    }
-}
-
-.s-palette-item {
-    border: 1px solid transparent;
-    color: $colorPaletteFg;
-    text-shadow: $shdwPaletteFg;
-    @include trans-prop-nice-fade(0.25s);
-    &:hover {
-        @include trans-prop-nice-fade(0);
-        border-color: $colorPaletteSelected !important;
-    }
-    &.selected {
-        border-color: $colorPaletteSelected;
-        box-shadow: $shdwPaletteSelected; //Needed to see selection rect on light colored swatches
-    }
-}
-
-.l-palette-item-label {
-    margin-left: $interiorMargin;
-}
-
-.l-inline-palette {
-    .l-palette-row {
-        width: 100%;
-        .l-palette-item {
-            //@include display(flex);
-            @include flex(1 0 auto);
-            margin: 1px;
-            min-width: auto;
-            width: auto;
-            &:before {
-                content: '';
-                padding-top: 75%;
+        &.l-option-row {
+            margin-bottom: $interiorMargin;
+            .s-palette-item {
+                border-color: $colorPaletteFg;
             }
         }
-    }
-}
+
+		.l-palette-item {
+			box-sizing: border-box;
+			display: block;
+			float: left;
+			height: $d; width: $d;
+			line-height: $d * 0.9;
+			margin: 0 ($m * 1px) ($m * 1px) 0;
+            position: relative;
+			text-align: center;
+		}
+
+		.s-palette-item {
+            border: 1px solid transparent;
+            color: $colorPaletteFg;
+            text-shadow: $shdwPaletteFg;
+            @include trans-prop-nice-fade(0.25s);
+			&:hover {
+				@include trans-prop-nice-fade(0);
+				border-color: $colorPaletteSelected !important;
+			}
+            &.selected {
+                border-color: $colorPaletteSelected;
+                box-shadow: $shdwPaletteSelected; //Needed to see selection rect on light colored swatches
+            }
+		}
+
+		.l-palette-item-label {
+			margin-left: $interiorMargin;
+		}
+	}
+}

platform/commonUI/general/res/sass/mobile/_tree.scss

@@ -34,7 +34,18 @@ body.touch {
 		line-height: $mobileTreeItemH !important;
 		.view-control {
             font-size: 1em;
-            width: ceil($mobileTreeItemH * 0.5);
+            margin-right: $interiorMargin;
+            width: ceil($mobileTreeItemH * 0.75);
+            &.has-children {
+                &:before {
+                    content: $glyph-icon-arrow-down;
+                    left: 50%;
+                    @include transform(translateX(-50%) rotate(-90deg));
+                }
+                &.expanded:before {
+                    @include transform(translateX(-50%) rotate(0deg));
+                }
+            }
 		}
 		.t-object-label {
 			line-height: inherit;

platform/commonUI/general/res/sass/plots/_legend.scss

@@ -1,208 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, 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.
- *****************************************************************************/
-.gl-plot {
-    .gl-plot-legend {
-        min-height: $plotLegendH;
-
-        .view-control {
-            font-size: 1em;
-            margin-right: $interiorMarginSm;
-        }
-
-        table {
-            table-layout: fixed;
-            tr {
-                display: table-row;
-            }
-            th,
-            td {
-                @include ellipsize(); // Note: this won't work if table-layout uses anything other than fixed.
-                display: table-cell;
-                padding: 1px 3px; // Tighter than standard tabular padding
-            }
-        }
-
-        &.hover-on-plot {
-            // User is hovering over the plot to get a value at a point
-            .hover-value-enabled {
-                background-color: $legendHoverValueBg;
-                border-radius: $smallCr;
-                padding: 0 $interiorMarginSm;
-                &:before {
-                    opacity: 0.5;
-                }
-                &.cursor-hover,
-                .value-to-display-nearestTimestamp,
-                .value-to-display-nearestValue
-                {
-                    @extend .icon-crosshair-12px;
-                    &:before {
-                        font-size: 9px;
-                    }
-                }
-
-                &.value-to-display-min:before {
-                    content: 'MIN ';
-                }
-                &.value-to-display-max:before {
-                    content: 'MAX ';
-                }
-            }
-        }
-    }
-
-    &.plot-legend-collapsed .plot-wrapper-expanded-legend { display: none; }
-    &.plot-legend-expanded .plot-wrapper-collapsed-legend { display: none; }
-
-    /***************** GENERAL STYLES, ALL STATES */
-    .plot-legend-item {
-        // General styles for legend items, both expanded and collapsed legend states
-        .plot-series-color-swatch {
-            border-radius: $smallCr;
-            border: 1px solid $colorBodyBg;
-            display: inline-block;
-            height: $plotSwatchD;
-            width: $plotSwatchD;
-        }
-        .plot-series-name {
-            display: inline;
-        }
-
-        .plot-series-value {
-            @include ellipsize();
-        }
-    }
-
-    /***************** GENERAL STYLES, COLLAPSED */
-    &.plot-legend-collapsed {
-        // .plot-legend-item is a span of spans.
-        &.plot-legend-top .gl-plot-legend { margin-bottom: $interiorMargin; }
-        &.plot-legend-bottom .gl-plot-legend { margin-top: $interiorMargin; }
-        &.plot-legend-right .gl-plot-legend { margin-left: $interiorMargin; }
-        &.plot-legend-left .gl-plot-legend { margin-right: $interiorMargin; }
-
-        .plot-legend-item {
-            display: flex;
-            align-items: center;
-            &:not(:first-child) {
-                margin-left: $interiorMarginLg;
-            }
-            .plot-series-swatch-and-name,
-            .plot-series-value {
-                @include ellipsize();
-                flex: 1 1 auto;
-            }
-
-            .plot-series-swatch-and-name {
-                margin-right: $interiorMarginSm;
-            }
-
-            .plot-series-value {
-                text-align: left;
-                width: 170px;
-            }
-        }
-    }
-
-    /***************** GENERAL STYLES, EXPANDED */
-    &.plot-legend-expanded {
-        .gl-plot-legend {
-            max-height: 70%;
-        }
-
-        .plot-wrapper-expanded-legend {
-            overflow-y: auto;
-        }
-
-        &.plot-legend-top .gl-plot-legend {
-            margin-bottom: $interiorMargin;
-        }
-        &.plot-legend-bottom .gl-plot-legend {
-            margin-top: $interiorMargin;
-        }
-    }
-
-    /***************** TOP OR BOTTOM */
-    &.plot-legend-top,
-    &.plot-legend-bottom {
-        // General styles when legend is on the top or bottom
-        @extend .l-flex-col;
-        &.plot-legend-collapsed {
-            // COLLAPSED ON TOP OR BOTTOM
-            .plot-wrapper-collapsed-legend {
-                display: flex;
-                flex: 1 1 auto;
-                overflow: hidden;
-            }
-        }
-    }
-
-    /***************** EITHER SIDE */
-    &.plot-legend-left,
-    &.plot-legend-right {
-        @extend .l-flex-row;
-        // If the legend is expanded, use flex-col instead so that the legend gets the width it needs.
-        &.plot-legend-expanded {
-            // EXPANDED, ON EITHER SIDE
-            @extend .l-flex-col;
-        }
-
-        &.plot-legend-collapsed {
-            // COLLAPSED, ON EITHER SIDE
-            .gl-plot-legend {
-                max-height: inherit;
-                width: 25%;
-            }
-            .plot-wrapper-collapsed-legend {
-                display: flex;
-                flex-flow: column nowrap;
-                min-width: 0;
-                flex: 1 1 auto;
-                overflow-y: auto;
-            }
-            .plot-legend-item {
-                margin-bottom: 1px;
-                margin-left: 0;
-                flex-wrap: wrap;
-                .plot-series-swatch-and-name {
-                    flex: 0 1 auto;
-                    min-width: 20%;
-                }
-                .plot-series-value {
-                    flex: 0 1 auto;
-                    width: auto;
-                }
-            }
-        }
-    }
-
-    /***************** ON BOTTOM OR RIGHT */
-    &.plot-legend-right:not(.plot-legend-expanded),
-    &.plot-legend-bottom {
-        .gl-plot-legend {
-            order: 2;
-        }
-        .plot-wrapper-axis-and-display-area {
-            order: 1;
-        }
-    }
-}

platform/commonUI/general/res/sass/plots/_plots-main.scss

@@ -20,64 +20,18 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 .abs.holder-plot {
-    right: $interiorMargin; // Fend off the scrollbar when less than min-height;
-    .t-object-alert.t-alert-unsynced {
-        display: none;
-    }
+    // Fend off the scrollbar when less than min-height;
+    right: $interiorMargin;
 }
 
-/********************************************* STACKED PLOT LAYOUT */
-.t-plot-stacked {
-    .l-view-section {
-        //  Make this a flex container
-        display: flex;
-        flex-flow: column nowrap;
-        .gl-plot.child-frame {
-            mct-plot { 
-                display: flex; 
-                flex: 1 1 auto;
-                height: 100%;
-                position: relative;
-            }
-            flex: 1 1 auto;
-            &:not(:first-child) {
-                margin-top: $interiorMargin;
-            }
-        }
-    }
-
-    .s-status-timeconductor-unsynced .holder-plot {
-        .t-object-alert.t-alert-unsynced {
-            display: block;
-        }
-    }
-
-}
-
-
-
 .gl-plot {
 	color: $colorPlotFg;
-    display: flex;
 	font-size: 0.7rem;
 	position: relative;
 	width: 100%;
 	height: 100%;
     min-height: $plotMinH;
 
-    /********************************************* AXIS AND DISPLAY AREA */
-    .plot-wrapper-axis-and-display-area {
-        margin-top: $interiorMargin; // Keep the top tick label from getting clipped
-        position: relative;
-        flex: 1 1 auto;
-        .t-object-alert {
-            position: absolute;
-            display: block;
-            font-size: 1.5em;
-            top: $interiorMarginSm; left: $interiorMarginSm;
-        }
-    }
-
     .gl-plot-wrapper-display-area-and-x-axis {
         // Holds the plot area and the X-axis only
         position: absolute;
@@ -95,6 +49,7 @@
         }
 
         .gl-plot-axis-area.gl-plot-x {
+            //@include test(green);
             top: auto;
             right: 0;
             bottom: 0;
@@ -108,7 +63,7 @@
 	.gl-plot-axis-area {
 		position: absolute;
 		&.gl-plot-y {
-			top: nth($plotDisplayArea, 1);
+			top: $plotLegendH + $interiorMargin;
 			right: auto;
 			bottom: nth($plotDisplayArea, 3);
 			left: 0;
@@ -203,6 +158,17 @@
 		}
 	}
 
+	.gl-plot-legend {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: auto;
+		left: 0;
+		height: $plotLegendH;
+		overflow-x: hidden;
+		overflow-y: auto;
+	}
+
 	/****************************** Limits and Out-of-Bounds data */
 
 	.l-limit-bar,
@@ -269,6 +235,39 @@
     border: 1px solid $colorPlotAreaBorder;
 }
 
+.gl-plot-legend,
+.legend {
+	.plot-legend-item,
+	.legend-item {
+		display: inline-block;
+		margin-right: $interiorMarginLg;
+		margin-bottom: $interiorMarginSm;
+		span {
+			vertical-align: middle;
+		}
+		.plot-color-swatch,
+		.color-swatch {
+			border-radius: 2px;
+			display: inline-block;
+			height: $plotSwatchD;
+			width: $plotSwatchD;
+		}
+	}
+}
+
+.gl-plot-legend {
+	.plot-legend-item {
+		border-radius: $smallCr;
+		line-height: 1.5em;
+		padding: 0px $itemPadLR;
+		.plot-color-swatch {
+			border: 1px solid $colorBodyBg;
+			height: $plotSwatchD + 1;
+			width: $plotSwatchD + 1;
+		}
+	}
+}
+
 .tick {
 	position: absolute;
 	border: 0 $colorPlotHash solid;

platform/commonUI/general/res/sass/tree/_tree.scss

@@ -23,7 +23,7 @@
 ul.tree {
     @include menuUlReset();
     @include user-select(none);
-    > li {
+    li {
         display: block;
         position: relative;
     }
@@ -53,10 +53,12 @@ ul.tree {
     .view-control {
         color: $colorItemTreeVC;
         margin-right: $interiorMargin;
+        height: 100%;
+        line-height: inherit;
         width: $treeVCW;
-        &:before { display: block; }
-        &.no-children {
-            &:before { display: none; }
+        &:before { display: none; }
+        &.has-children {
+            &:before { display: block; }
         }
     }
 

platform/commonUI/general/res/sass/user-environ/_frame.scss

@@ -23,6 +23,7 @@
     $ohH: $btnFrameH;
     $bc: $colorInteriorBorder;
     &.child-frame.panel {
+        border: 1px solid transparent;
         z-index: 0; // Needed to prevent child-frame controls from showing through when another child-frame is above
         &:not(.no-frame) {
             background: $colorBodyBg;
@@ -90,7 +91,7 @@
 
     &.no-frame {
         background: transparent !important;
-        border-color: transparent;
+        border: none;
         .object-browse-bar .right {
             $m: 0;
             background: rgba(black, 0.3);

platform/commonUI/general/res/sass/user-environ/_selecting.scss

@@ -20,7 +20,6 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 .s-hover-border {
-    border: 1px solid transparent;
     &:hover {
         border-color: rgba($colorSelectableSelectedPrimary, 0.5) !important;
     }

platform/commonUI/general/res/templates/bottombar.html

@@ -19,14 +19,9 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class='abs bottom-bar ue-bottom-bar mobile-disable-select' ng-controller="BottomBarController as bar">
+<div class='abs bottom-bar ue-bottom-bar mobile-disable-select'>
     <div id='status' class='status-holder'>
-        <mct-include ng-repeat="indicator in bar.getIndicators()"
-                     ng-model="indicator.ngModel"
-                     key="indicator.template"
-                     class="status-block-holder"
-                     ng-class='indicator.ngModel.getGlyphClass()'>
-        </mct-include>
+        <mct-indicators></mct-indicators>
     </div>
     <mct-include key="'message-banner'"></mct-include>
     <mct-include key="'about-logo'"></mct-include>

platform/commonUI/general/res/templates/indicator.html

@@ -21,13 +21,11 @@
 -->
 <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
 <div class='status block'
-	 title="{{ngModel.getDescription()}}"
-	 ng-click='ngModel.configure()'
-	 ng-show="ngModel.getText().length > 0">
-	<span class="status-indicator {{ngModel.getCssClass()}}"></span><span class="label"
-		  ng-class='ngModel.getTextClass()'>
-		{{ngModel.getText()}}
-        <a class="s-button icon-gear" ng-if="ngModel.configure"></a>
+	 title="{{ngModel.description()}}"
+	 ng-show="ngModel.text().length > 0">
+	<span class="status-indicator {{ngModel.cssClass()}}"></span><span class="label"
+		  ng-class='ngModel.textClass()'>
+		{{ngModel.text()}}
 	</span><span class="count">
 	</span>
 </div>

platform/commonUI/general/src/directives/MCTIndicators.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,21 +20,24 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define([
-    './Region'
-], function (
-    Region
-) {
-
-    var PlotBrowseRegion = new Region({
-        name: "plot-options",
-        title: "Plot Options",
-        modes: ['browse'],
-        content: {
-            key: "plot-options-browse"
+define(
+    [],
+    function () {
+        function MCTIndicators(openmct) {
+            return {
+                restrict: "E",
+                link: function link(scope, element, attrs) {
+                    openmct.indicators.displayFunctions().then(function (displayFunctions){
+                        displayFunctions.forEach(function (displayFunction){
+                            var displayElement = displayFunction();
+                            element.append(displayElement);
+                        });
+                    })
+                }
+            };
         }
-    });
 
-    return PlotBrowseRegion;
+        return MCTIndicators;
 
-});
+    }
+);

platform/commonUI/general/src/ui/TreeNodeView.js

@@ -83,9 +83,9 @@ define([
         this.activeObject = domainObject;
 
         if (domainObject && domainObject.hasCapability('composition')) {
-            $(this.toggleView.elements()).removeClass('no-children');
+            $(this.toggleView.elements()).addClass('has-children');
         } else {
-            $(this.toggleView.elements()).addClass('no-children');
+            $(this.toggleView.elements()).removeClass('has-children');
         }
 
         if (domainObject && domainObject.hasCapability('status')) {

platform/commonUI/general/test/controllers/BottomBarControllerSpec.js

@@ -1,76 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, 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(
-    ["../../src/controllers/BottomBarController"],
-    function (BottomBarController) {
-
-        describe("The bottom bar controller", function () {
-            var testIndicators,
-                testIndicatorA,
-                testIndicatorB,
-                testIndicatorC,
-                mockIndicator,
-                controller;
-
-            beforeEach(function () {
-                mockIndicator = jasmine.createSpyObj(
-                    "indicator",
-                    ["getGlyph", "getCssClass", "getText"]
-                );
-
-                testIndicatorA = {};
-                testIndicatorB = function () {
-                    return mockIndicator;
-                };
-                testIndicatorC = { template: "someTemplate" };
-
-                testIndicators = [
-                    testIndicatorA,
-                    testIndicatorB,
-                    testIndicatorC
-                ];
-
-                controller = new BottomBarController(testIndicators);
-            });
-
-            it("exposes one indicator description per extension", function () {
-                expect(controller.getIndicators().length)
-                    .toEqual(testIndicators.length);
-            });
-
-            it("uses template field provided, or its own default", function () {
-                // "indicator" is the default;
-                // only testIndicatorC overrides this.
-                var indicators = controller.getIndicators();
-                expect(indicators[0].template).toEqual("indicator");
-                expect(indicators[1].template).toEqual("indicator");
-                expect(indicators[2].template).toEqual("someTemplate");
-            });
-
-            it("instantiates indicators given as constructors", function () {
-                // testIndicatorB constructs to mockIndicator
-                expect(controller.getIndicators()[1].ngModel).toBe(mockIndicator);
-            });
-        });
-    }
-);

platform/commonUI/inspect/src/services/InfoService.js

@@ -65,10 +65,6 @@ define(
             options = Object.create(OPTIONS);
             options.marginX = -bubbleSpaceLR;
 
-            // prevent bubble from appearing right under pointer,
-            // which causes hover callback to be called multiple times
-            options.offsetX = 1;
-
             // On a phone, bubble takes up more screen real estate,
             // so position it differently (toward the bottom)
             if (this.agentService.isPhone()) {

platform/commonUI/regions/src/InspectorController.js

@@ -50,11 +50,7 @@ define(
                         view.show(container);
                     } else {
                         self.providerView = false;
-                        var selectedItem = selection[0].context.oldItem;
-
-                        if (selectedItem) {
-                            $scope.inspectorKey = selectedItem.getCapability("type").typeDef.inspector;
-                        }
+                        $scope.inspectorKey = selection[0].context.oldItem.getCapability("type").typeDef.inspector;
                     }
                 }
 

platform/commonUI/themes/espresso/res/sass/_constants.scss

@@ -181,8 +181,6 @@ $colorPlotHash: $colorTick;
 $stylePlotHash: dashed;
 $colorPlotAreaBorder: $colorInteriorBorder;
 $colorPlotLabelFg: pushBack($colorPlotFg, 20%);
-$legendCollapsedNameMaxW: 50%;
-$legendHoverValueBg: rgba($colorBodyFg, 0.1);
 
 // Tree
 $colorItemTreeHoverBg: pullForward($colorBodyBg, $hoverRatioPercent);

platform/commonUI/themes/snow/res/sass/_constants.scss

@@ -181,8 +181,6 @@ $colorPlotHash: $colorTick;
 $stylePlotHash: dashed;
 $colorPlotAreaBorder: $colorInteriorBorder;
 $colorPlotLabelFg: pushBack($colorPlotFg, 20%);
-$legendCollapsedNameMaxW: 50%;
-$legendHoverValueBg: rgba($colorBodyFg, 0.2);
 
 // Tree
 $colorItemTreeHoverBg: pullForward($colorBodyBg, $hoverRatioPercent);

platform/features/clock/bundle.js

@@ -55,7 +55,6 @@ define([
     timerTemplate,
     legacyRegistry
 ) {
-
     legacyRegistry.register("platform/features/clock", {
         "name": "Clocks/Timers",
         "descriptions": "Domain objects for displaying current & relative times.",
@@ -86,11 +85,6 @@ define([
                         "CLOCK_INDICATOR_FORMAT"
                     ],
                     "priority": "preferred"
-                },
-                {
-                    "implementation": FollowIndicator,
-                    "depends": ["timerService"],
-                    "priority": "fallback"
                 }
             ],
             "services": [
@@ -305,6 +299,10 @@ define([
                     }
                 }
             ],
+            "runs": [{
+                "implementation": FollowIndicator,
+                "depends": ["openmct", "timerService"]
+            }],
             "licenses": [
                 {
                     "name": "moment-duration-format",

platform/features/clock/src/indicators/FollowIndicator.js

@@ -20,38 +20,29 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define(
-    ['moment'],
-    function (moment) {
-        var NO_TIMER = "No timer being followed";
+define([],function () {
 
-        /**
-         * Indicator that displays the active timer, as well as its
-         * current state.
-         * @implements {Indicator}
-         * @memberof platform/features/clock
-         */
-        function FollowIndicator(timerService) {
-            this.timerService = timerService;
+    function setIndicatorStatus(indicator, timer) {
+        if (timer !== undefined) {
+            indicator.cssClass('icon-timer s-status-ok');
+            indicator.text('Following timer ' + timer.name);
+        } else {
+            indicator.cssClass('icon-timer');
+            indicator.text('No timer being followed.');
         }
-
-        FollowIndicator.prototype.getGlyphClass = function () {
-            return "";
-        };
-
-        FollowIndicator.prototype.getCssClass = function () {
-            return (this.timerService.getTimer()) ? "icon-timer s-status-ok" : "icon-timer";
-        };
-
-        FollowIndicator.prototype.getText = function () {
-            var timer = this.timerService.getTimer();
-            return timer ? ('Following timer ' + timer.name) : NO_TIMER;
-        };
-
-        FollowIndicator.prototype.getDescription = function () {
-            return "";
-        };
-
-        return FollowIndicator;
     }
-);
+
+    /**
+     * Indicator that displays the active timer, as well as its
+     * current state.
+     * @memberof platform/features/clock
+     */
+    return function installFollowIndicator(openmct, timerService) {
+        var indicator = openmct.indicators.create();
+        var timer = timerService.getTimer();
+        var setIndicatorStatusFromTimer = setIndicatorStatus.bind(this, indicator);
+        
+        setIndicatorStatusFromTimer(timer);
+        timerService.on('change', setIndicatorStatusFromTimer);
+    };
+});

platform/features/clock/src/services/TimerService.js

@@ -44,7 +44,7 @@ define(['EventEmitter'], function (EventEmitter) {
      */
     TimerService.prototype.setTimer = function (timer) {
         this.timer = timer;
-        this.emit('change');
+        this.emit('change', timer);
 
         if (this.stopObserving) {
             this.stopObserving();

platform/features/clock/test/indicators/FollowIndicatorSpec.js

@@ -42,15 +42,18 @@ define(["../../src/indicators/FollowIndicator"], function (FollowIndicator) {
         });
 
         describe("when a timer is set", function () {
-            var testObject;
+            var testModel;
+            var mockDomainObject;
 
             beforeEach(function () {
-                testObject = { name: "some timer!" };
-                mockTimerService.getTimer.andReturn(testObject);
+                testModel = { name: "some timer!" };
+                mockDomainObject = jasmine.createSpyObj('timer', ['getModel']);
+                mockDomainObject.getModel.andReturn(testModel);
+                mockTimerService.getTimer.andReturn(mockDomainObject);
             });
 
             it("displays the timer's name", function () {
-                expect(indicator.getText().indexOf(testObject.name))
+                expect(indicator.getText().indexOf(testModel.name))
                     .not.toEqual(-1);
             });
         });

platform/features/layout/bundle.js

@@ -272,8 +272,7 @@ define([
                         "$scope",
                         "$q",
                         "dialogService",
-                        "openmct",
-                        "$element"
+                        "openmct"
                     ]
                 }
             ],
@@ -337,6 +336,46 @@ define([
                             "conversion": "number[]"
                         }
                     ]
+                },
+                {
+                    "key": "telemetry.panel",
+                    "name": "Telemetry Panel",
+                    "cssClass": "icon-telemetry-panel",
+                    "description": "A panel for collecting telemetry elements.",
+                    "priority": 899,
+                    "delegates": [
+                        "telemetry"
+                    ],
+                    "features": "creation",
+                    "contains": [
+                        {
+                            "has": "telemetry"
+                        }
+                    ],
+                    "model": {
+                        "composition": []
+                    },
+                    "properties": [
+                        {
+                            "name": "Layout Grid",
+                            "control": "composite",
+                            "items": [
+                                {
+                                    "name": "Horizontal grid (px)",
+                                    "control": "textfield",
+                                    "cssClass": "l-input-sm l-numeric"
+                                },
+                                {
+                                    "name": "Vertical grid (px)",
+                                    "control": "textfield",
+                                    "cssClass": "l-input-sm l-numeric"
+                                }
+                            ],
+                            "pattern": "^(\\d*[1-9]\\d*)?$",
+                            "property": "layoutGrid",
+                            "conversion": "number[]"
+                        }
+                    ]
                 }
             ]
         }

platform/features/layout/res/templates/fixed.html

@@ -23,7 +23,7 @@
      ng-controller="FixedController as controller">
 
     <!-- Background grid -->
-    <div class="l-grid-holder" ng-click="controller.bypassSelection($event)">
+    <div class="l-grid-holder" ng-click="controller.clearSelection()">
         <div class="l-grid l-grid-x"
              ng-if="!controller.getGridSize()[0] < 3"
              ng-style="{ 'background-size': controller.getGridSize() [0] + 'px 100%' }"></div>
@@ -35,28 +35,35 @@
     <!-- Fixed position elements -->
     <div ng-repeat="element in controller.getElements()"
          class="l-fixed-position-item s-selectable s-moveable s-hover-border"
+         ng-class="{
+            's-not-selected': controller.selected() && !controller.selected(element),
+            's-selected': controller.selected(element)
+         }"
          ng-style="element.style"
-         mct-selectable="controller.getContext(element)"
-         mct-init-select="controller.shouldSelect(element)">
+         ng-click="controller.select(element, $event)">
         <mct-include key="element.template"
                      parameters="{ gridSize: controller.getGridSize() }"
                      ng-model="element">
-        </mct-include>       
+        </mct-include>
     </div>
+
     <!-- Selection highlight, handles -->
-    <span class="s-selected s-moveable" ng-if="controller.isElementSelected()">
+    <span class="s-selected s-moveable" ng-if="controller.selected()">
         <div class="l-fixed-position-item t-edit-handle-holder"
-             mct-drag-down="controller.moveHandle().startDrag()"
+             mct-drag-down="controller.moveHandle().startDrag(controller.selected())"
              mct-drag="controller.moveHandle().continueDrag(delta)"
-             mct-drag-up="controller.endDrag()"
-             ng-style="controller.getSelectedElementStyle()">
+             mct-drag-up="controller.moveHandle().endDrag()"
+             ng-style="controller.selected().style"
+             ng-click="$event.stopPropagation()">
         </div>
         <div ng-repeat="handle in controller.handles()"
              class="l-fixed-position-item-handle edit-corner"
              ng-style="handle.style()"
              mct-drag-down="handle.startDrag()"
              mct-drag="handle.continueDrag(delta)"
-             mct-drag-up="controller.endDrag(handle)">
+             mct-drag-up="handle.endDrag()"
+             ng-click="$event.stopPropagation()">
         </div>
     </span>
+
 </div>

platform/features/layout/res/templates/layout.html

@@ -36,8 +36,7 @@
              ng-style="{ 'background-size': '100% ' + controller.getGridSize() [1] + 'px' }"></div>
     </div>
 
-    <div class="abs frame t-frame-outer child-frame panel s-selectable s-moveable s-hover-border t-object-type-{{ childObject.getModel().type }}"
-         data-layout-id="{{childObject.getId() + '-' + $id}}"
+    <div class="abs frame t-frame-outer child-frame panel s-selectable s-moveable s-hover-border {{childObject.getId() + '-' + $id}} t-object-type-{{ childObject.getModel().type }}"
          ng-class="{ 'no-frame': !controller.hasFrame(childObject), 's-drilled-in': controller.isDrilledIn(childObject) }"
          ng-repeat="childObject in composition"
          ng-init="controller.selectIfNew(childObject.getId() + '-' + $id, childObject)"

platform/features/layout/src/FixedController.js

@@ -47,7 +47,7 @@ define(
          * @constructor
          * @param {Scope} $scope the controller's Angular scope
          */
-        function FixedController($scope, $q, dialogService, openmct, $element) {
+        function FixedController($scope, $q, dialogService, openmct) {
             this.names = {}; // Cache names by ID
             this.values = {}; // Cache values by ID
             this.elementProxiesById = {};
@@ -55,11 +55,9 @@ define(
             this.telemetryObjects = [];
             this.subscriptions = [];
             this.openmct = openmct;
-            this.$element = $element;
             this.$scope = $scope;
 
             this.gridSize = $scope.domainObject && $scope.domainObject.getModel().layoutGrid;
-            this.fixedViewSelectable = false;
 
             var self = this;
             [
@@ -89,8 +87,9 @@ define(
 
             // Update the style for a selected element
             function updateSelectionStyle() {
-                if (self.selectedElementProxy) {
-                    self.selectedElementProxy.style = convertPosition(self.selectedElementProxy);
+                var element = self.selection && self.selection.get();
+                if (element) {
+                    element.style = convertPosition(element);
                 }
             }
 
@@ -137,19 +136,25 @@ define(
 
             // Decorate elements in the current configuration
             function refreshElements() {
-                var elements = (($scope.configuration || {}).elements || []);
+                // Cache selection; we are instantiating new proxies
+                // so we may want to restore this.
+                var selected = self.selection && self.selection.get(),
+                    elements = (($scope.configuration || {}).elements || []),
+                    index = -1; // Start with a 'not-found' value
+
+                // Find the selection in the new array
+                if (selected !== undefined) {
+                    index = elements.indexOf(selected.element);
+                }
 
                 // Create the new proxies...
                 self.elementProxies = elements.map(makeProxyElement);
 
-                // If selection is not in array, select parent.
-                // Otherwise, set the element to select after refresh.
-                if (self.selectedElementProxy) {
-                    var index = elements.indexOf(self.selectedElementProxy.element);
-                    if (index === -1) {
-                        self.$element[0].click();
-                    } else if (!self.elementToSelectAfterRefresh) {
-                        self.elementToSelectAfterRefresh = self.elementProxies[index].element;
+                // Clear old selection, and restore if appropriate
+                if (self.selection) {
+                    self.selection.deselect();
+                    if (index > -1) {
+                        self.select(self.elementProxies[index]);
                     }
                 }
 
@@ -219,12 +224,12 @@ define(
                     $scope.configuration.elements || [];
                 // Store the position of this element.
                 $scope.configuration.elements.push(element);
-
-                self.elementToSelectAfterRefresh = element;
-
                 // Refresh displayed elements
                 refreshElements();
-
+                // Select the newly-added element
+                self.select(
+                    self.elementProxies[self.elementProxies.length - 1]
+                );
                 // Mark change as persistable
                 if ($scope.commit) {
                     $scope.commit("Dropped an element.");
@@ -258,36 +263,21 @@ define(
                 self.getTelemetry($scope.domainObject);
             }
 
-            // Sets the selectable object in response to the selection change event.
-            function setSelection(selectable) {
-                var selection = selectable[0];
-
-                if (!selection) {
-                    return;
-                }
-
-                if (selection.context.elementProxy) {
-                    self.selectedElementProxy = selection.context.elementProxy;
-                    self.mvHandle = self.generateDragHandle(self.selectedElementProxy);
-                    self.resizeHandles = self.generateDragHandles(self.selectedElementProxy);
-                } else {
-                    // Make fixed view selectable if it's not already.
-                    if (!self.fixedViewSelectable && selectable.length === 1) {
-                        self.fixedViewSelectable = true;
-                        selection.context.viewProxy = new FixedProxy(addElement, $q, dialogService);
-                        self.openmct.selection.select(selection);
-                    }
-
-                    self.resizeHandles = [];
-                    self.mvHandle = undefined;
-                    self.selectedElementProxy = undefined;
-                }
-            }
-
             this.elementProxies = [];
             this.generateDragHandle = generateDragHandle;
             this.generateDragHandles = generateDragHandles;
-            this.updateSelectionStyle = updateSelectionStyle;
+
+            // Track current selection state
+            $scope.$watch("selection", function (selection) {
+                this.selection = selection;
+
+                // Expose the view's selection proxy
+                if (this.selection) {
+                    this.selection.proxy(
+                        new FixedProxy(addElement, $q, dialogService)
+                    );
+                }
+            }.bind(this));
 
             // Detect changes to grid size
             $scope.$watch("model.layoutGrid", updateElementPositions);
@@ -308,13 +298,10 @@ define(
             $scope.$on("$destroy", function () {
                 self.unsubscribe();
                 self.openmct.time.off("bounds", updateDisplayBounds);
-                self.openmct.selection.off("change", setSelection);
             });
 
             // Respond to external bounds changes
             this.openmct.time.on("bounds", updateDisplayBounds);
-            this.openmct.selection.on('change', setSelection);
-            this.$element.on('click', this.bypassSelection.bind(this));
         }
 
         /**
@@ -373,10 +360,10 @@ define(
          */
         FixedController.prototype.updateView = function (telemetryObject, datum) {
             var metadata = this.openmct.telemetry.getMetadata(telemetryObject);
-            var valueMetadata = this.chooseValueMetadataToDisplay(metadata);
-            var formattedTelemetryValue = this.getFormattedTelemetryValueForKey(valueMetadata, datum);
+            var telemetryKeyToDisplay = this.chooseTelemetryKeyToDisplay(metadata);
+            var formattedTelemetryValue = this.getFormattedTelemetryValueForKey(telemetryKeyToDisplay, datum, metadata);
             var limitEvaluator = this.openmct.telemetry.limitEvaluator(telemetryObject);
-            var alarm = limitEvaluator && limitEvaluator.evaluate(datum, valueMetadata);
+            var alarm = limitEvaluator && limitEvaluator.evaluate(datum, telemetryKeyToDisplay);
 
             this.setDisplayedValue(
                 telemetryObject,
@@ -389,28 +376,29 @@ define(
         /**
          * @private
          */
-        FixedController.prototype.getFormattedTelemetryValueForKey = function (valueMetadata, datum) {
+        FixedController.prototype.getFormattedTelemetryValueForKey = function (telemetryKeyToDisplay, datum, metadata) {
+            var valueMetadata = metadata.value(telemetryKeyToDisplay);
             var formatter = this.openmct.telemetry.getValueFormatter(valueMetadata);
 
-            return formatter.format(datum);
+            return formatter.format(datum[valueMetadata.key]);
         };
 
         /**
          * @private
          */
-        FixedController.prototype.chooseValueMetadataToDisplay = function (metadata) {
+        FixedController.prototype.chooseTelemetryKeyToDisplay = function (metadata) {
             // If there is a range value, show that preferentially
-            var valueMetadata = metadata.valuesForHints(['range'])[0];
+            var telemetryKeyToDisplay = metadata.valuesForHints(['range'])[0];
 
             // If no range is defined, default to the highest priority non time-domain data.
-            if (valueMetadata === undefined) {
+            if (telemetryKeyToDisplay === undefined) {
                 var valuesOrderedByPriority = metadata.values();
-                valueMetadata = valuesOrderedByPriority.filter(function (values) {
-                    return !(values.hints.domain);
+                telemetryKeyToDisplay = valuesOrderedByPriority.filter(function (valueMetadata) {
+                    return !(valueMetadata.hints.domain);
                 })[0];
             }
 
-            return valueMetadata;
+            return telemetryKeyToDisplay.source;
         };
 
         /**
@@ -464,7 +452,7 @@ define(
 
             function filterForTelemetryObjects(objects) {
                 return objects.filter(function (object) {
-                    return self.openmct.telemetry.isTelemetryObject(object);
+                    return self.openmct.telemetry.canProvideTelemetry(object);
                 });
             }
 
@@ -504,56 +492,42 @@ define(
         };
 
         /**
-         * Checks if the element should be selected or not.
-         *
-         * @param elementProxy the element to check
-         * @returns {boolean} true if the element should be selected.
+         * Check if the element is currently selected, or (if no
+         * argument is supplied) get the currently selected element.
+         * @returns {boolean} true if selected
          */
-        FixedController.prototype.shouldSelect = function (elementProxy) {
-            if (elementProxy.element === this.elementToSelectAfterRefresh) {
-                delete this.elementToSelectAfterRefresh;
-                return true;
-            } else {
-                return false;
+        FixedController.prototype.selected = function (element) {
+            var selection = this.selection;
+            return selection && ((arguments.length > 0) ?
+                    selection.selected(element) : selection.get());
+        };
+
+        /**
+         * Set the active user selection in this view.
+         * @param element the element to select
+         */
+        FixedController.prototype.select = function select(element, event) {
+            if (event) {
+                event.stopPropagation();
+            }
+
+            if (this.selection) {
+                // Update selection...
+                this.selection.select(element);
+                // ...as well as move, resize handles
+                this.mvHandle = this.generateDragHandle(element);
+                this.resizeHandles = this.generateDragHandles(element);
             }
         };
 
         /**
-         * Checks if an element is currently selected.
-         *
-         * @returns {boolean} true if an element is selected.
+         * Clear the current user selection.
          */
-        FixedController.prototype.isElementSelected = function () {
-            return (this.selectedElementProxy) ? true : false;
-        };
-
-        /**
-         * Gets the style for the selected element.
-         *
-         * @returns {string} element style
-         */
-        FixedController.prototype.getSelectedElementStyle = function () {
-            return (this.selectedElementProxy) ? this.selectedElementProxy.style : undefined;
-        };
-
-        /**
-         * Gets the selected element.
-         *
-         * @returns the selected element
-         */
-        FixedController.prototype.getSelectedElement = function () {
-            return this.selectedElementProxy;
-        };
-
-        /**
-         * Prevents the event from bubbling up if drag is in progress.
-         */
-        FixedController.prototype.bypassSelection = function ($event) {
-            if (this.dragInProgress) {
-                if ($event) {
-                    $event.stopPropagation();
-                }
-                return;
+        FixedController.prototype.clearSelection = function () {
+            if (this.selection) {
+                this.selection.deselect();
+                this.resizeHandles = [];
+                this.mvHandle = undefined;
             }
         };
 
@@ -574,38 +548,6 @@ define(
             return this.mvHandle;
         };
 
-        /**
-         * Gets the selection context.
-         *
-         * @param elementProxy the element proxy
-         * @returns {object} the context object which includes elementProxy and toolbar
-         */
-        FixedController.prototype.getContext = function (elementProxy) {
-            return {
-                elementProxy: elementProxy,
-                toolbar: elementProxy
-            };
-        };
-
-        /**
-         * End drag.
-         *
-         * @param handle the resize handle
-         */
-        FixedController.prototype.endDrag = function (handle) {
-            this.dragInProgress = true;
-
-            setTimeout(function () {
-                this.dragInProgress = false;
-            }.bind(this), 0);
-
-            if (handle) {
-                handle.endDrag();
-            } else {
-                this.moveHandle().endDrag();
-            }
-        };
-
         return FixedController;
     }
 );

platform/features/layout/src/FixedDragHandle.js

@@ -65,7 +65,7 @@ define(
          * Start a drag gesture. This should be called when a drag
          * begins to track initial state.
          */
-        FixedDragHandle.prototype.startDrag = function () {
+        FixedDragHandle.prototype.startDrag = function startDrag() {
             // Cache initial x/y positions
             this.dragging = {
                 x: this.elementHandle.x(),

platform/features/layout/src/LayoutController.js

@@ -515,7 +515,7 @@ define(
         LayoutController.prototype.selectIfNew = function (selector, domainObject) {
             if (domainObject.getId() === this.droppedIdToSelectAfterRefresh) {
                 setTimeout(function () {
-                    $('[data-layout-id="' + selector + '"]')[0].click();
+                    $('.' + selector)[0].click();
                     delete this.droppedIdToSelectAfterRefresh;
                 }.bind(this), 0);
             }

platform/features/layout/src/elements/ElementProxy.js

@@ -55,8 +55,8 @@ define(
          * @param element the fixed position element, as stored in its
          *        configuration
          * @param index the element's index within its array
-         * @param {Array} elements the full array of elements
          * @param {number[]} gridSize the current layout grid size in [x,y] from
+         * @param {Array} elements the full array of elements
          */
         function ElementProxy(element, index, elements, gridSize) {
             /**

platform/features/layout/test/FixedControllerSpec.js

@@ -21,14 +21,8 @@
  *****************************************************************************/
 
 define(
-    [
-        "../src/FixedController",
-        "zepto"
-    ],
-    function (
-        FixedController,
-        $
-    ) {
+    ["../src/FixedController"],
+    function (FixedController) {
 
         describe("The Fixed Position controller", function () {
             var mockScope,
@@ -52,9 +46,6 @@ define(
                 mockMetadata,
                 mockTimeSystem,
                 mockLimitEvaluator,
-                mockSelection,
-                $element = [],
-                selectable = [],
                 controller;
 
             // Utility function; find a watch for a given expression
@@ -106,8 +97,8 @@ define(
                     'telemetryFormatter',
                     ['format']
                 );
-                mockFormatter.format.andCallFake(function (valueMetadata) {
-                    return "Formatted " + valueMetadata.value;
+                mockFormatter.format.andCallFake(function (value) {
+                    return "Formatted " + value;
                 });
 
                 mockDomainObject = jasmine.createSpyObj(
@@ -150,13 +141,13 @@ define(
                     [
                         'subscribe',
                         'request',
-                        'isTelemetryObject',
+                        'canProvideTelemetry',
                         'getMetadata',
                         'limitEvaluator',
                         'getValueFormatter'
                     ]
                 );
-                mockTelemetryAPI.isTelemetryObject.andReturn(true);
+                mockTelemetryAPI.canProvideTelemetry.andReturn(true);
                 mockTelemetryAPI.request.andReturn(Promise.resolve([]));
 
                 testGrid = [123, 456];
@@ -189,30 +180,17 @@ define(
 
                 mockScope.model = testModel;
                 mockScope.configuration = testConfiguration;
-
-                selectable[0] = {
-                    context: {
-                        oldItem: mockDomainObject
-                    }
-                };
-                mockSelection = jasmine.createSpyObj("selection", [
-                    'select',
-                    'on',
-                    'off',
-                    'get'
-                ]);
-                mockSelection.get.andCallThrough();
+                mockScope.selection = jasmine.createSpyObj(
+                    'selection',
+                    ['select', 'get', 'selected', 'deselect', 'proxy']
+                );
 
                 mockOpenMCT = {
                     time: mockConductor,
                     telemetry: mockTelemetryAPI,
-                    composition: mockCompositionAPI,
-                    selection: mockSelection
+                    composition: mockCompositionAPI
                 };
 
-                $element = $('<div></div>');
-                spyOn($element[0], 'click');
-
                 mockMetadata = jasmine.createSpyObj('mockMetadata', [
                     'valuesForHints',
                     'value',
@@ -248,11 +226,11 @@ define(
                     mockScope,
                     mockQ,
                     mockDialogService,
-                    mockOpenMCT,
-                    $element
+                    mockOpenMCT
                 );
 
                 findWatch("model.layoutGrid")(testModel.layoutGrid);
+                findWatch("selection")(mockScope.selection);
             });
 
             it("subscribes when a domain object is available", function () {
@@ -328,41 +306,41 @@ define(
             });
 
             it("allows elements to be selected", function () {
-                testModel.modified = 1;
-                findWatch("model.modified")(testModel.modified);
-
-                selectable[0].context.elementProxy = controller.getElements()[1];
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
-
-                expect(controller.isElementSelected()).toBe(true);
-            });
-
-            it("allows selection retrieval", function () {
                 var elements;
 
                 testModel.modified = 1;
                 findWatch("model.modified")(testModel.modified);
 
                 elements = controller.getElements();
-                selectable[0].context.elementProxy = elements[1];
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
-
-                expect(controller.getSelectedElement()).toEqual(elements[1]);
+                controller.select(elements[1]);
+                expect(mockScope.selection.select)
+                    .toHaveBeenCalledWith(elements[1]);
             });
 
-            it("selects the parent view when selected element is removed", function () {
+            it("allows selection retrieval", function () {
+                // selected with no arguments should give the current
+                // selection
+                var elements;
+
                 testModel.modified = 1;
                 findWatch("model.modified")(testModel.modified);
 
-                var elements = controller.getElements();
-                selectable[0].context.elementProxy = elements[1];
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
+                elements = controller.getElements();
+                controller.select(elements[1]);
+                mockScope.selection.get.andReturn(elements[1]);
+                expect(controller.selected()).toEqual(elements[1]);
+            });
 
-                elements[1].remove();
-                testModel.modified = 2;
+            it("allows selections to be cleared", function () {
+                var elements;
+
+                testModel.modified = 1;
                 findWatch("model.modified")(testModel.modified);
 
-                expect($element[0].click).toHaveBeenCalled();
+                elements = controller.getElements();
+                controller.select(elements[1]);
+                controller.clearSelection();
+                expect(controller.selected(elements[1])).toBeFalsy();
             });
 
             it("retains selections during refresh", function () {
@@ -374,21 +352,23 @@ define(
                 findWatch("model.modified")(testModel.modified);
 
                 elements = controller.getElements();
-                selectable[0].context.elementProxy = elements[1];
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
+                controller.select(elements[1]);
 
-                expect(controller.getSelectedElement()).toEqual(elements[1]);
+                // Verify precondition
+                expect(mockScope.selection.select.calls.length).toEqual(1);
+
+                // Mimic selection behavior
+                mockScope.selection.get.andReturn(elements[1]);
 
                 elements[2].remove();
                 testModel.modified = 2;
                 findWatch("model.modified")(testModel.modified);
 
                 elements = controller.getElements();
-
                 // Verify removal, as test assumes this
                 expect(elements.length).toEqual(2);
 
-                expect(controller.shouldSelect(elements[1])).toBe(true);
+                expect(mockScope.selection.select.calls.length).toEqual(2);
             });
 
             it("Displays received values for telemetry elements", function () {
@@ -525,25 +505,21 @@ define(
             });
 
             it("exposes a view-level selection proxy", function () {
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
-                var selection = mockOpenMCT.selection.select.mostRecentCall.args[0];
-
-                expect(mockOpenMCT.selection.select).toHaveBeenCalled();
-                expect(selection.context.viewProxy).toBeDefined();
+                expect(mockScope.selection.proxy).toHaveBeenCalledWith(
+                    jasmine.any(Object)
+                );
             });
 
             it("exposes drag handles", function () {
                 var handles;
 
+                // Select something so that drag handles are expected
                 testModel.modified = 1;
                 findWatch("model.modified")(testModel.modified);
-
-                selectable[0].context.elementProxy = controller.getElements()[1];
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
+                controller.select(controller.getElements()[1]);
 
                 // Should have a non-empty array of handles
                 handles = controller.handles();
-
                 expect(handles).toEqual(jasmine.any(Array));
                 expect(handles.length).not.toEqual(0);
 
@@ -556,14 +532,15 @@ define(
             });
 
             it("exposes a move handle", function () {
+                var handle;
+
+                // Select something so that drag handles are expected
                 testModel.modified = 1;
                 findWatch("model.modified")(testModel.modified);
-
-                selectable[0].context.elementProxy = controller.getElements()[1];
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
+                controller.select(controller.getElements()[1]);
 
                 // Should have a move handle
-                var handle = controller.moveHandle();
+                handle = controller.moveHandle();
 
                 // And it should have start/continue/end drag methods
                 expect(handle.startDrag).toEqual(jasmine.any(Function));
@@ -574,40 +551,26 @@ define(
             it("updates selection style during drag", function () {
                 var oldStyle;
 
+                // Select something so that drag handles are expected
                 testModel.modified = 1;
                 findWatch("model.modified")(testModel.modified);
-
-                selectable[0].context.elementProxy = controller.getElements()[1];
-                mockOpenMCT.selection.on.mostRecentCall.args[1](selectable);
+                controller.select(controller.getElements()[1]);
+                mockScope.selection.get.andReturn(controller.getElements()[1]);
 
                 // Get style
-                oldStyle = controller.getSelectedElementStyle();
+                oldStyle = controller.selected().style;
 
                 // Start a drag gesture
                 controller.moveHandle().startDrag();
 
                 // Haven't moved yet; style shouldn't have updated yet
-                expect(controller.getSelectedElementStyle()).toEqual(oldStyle);
+                expect(controller.selected().style).toEqual(oldStyle);
 
                 // Drag a little
                 controller.moveHandle().continueDrag([1000, 100]);
 
                 // Style should have been updated
-                expect(controller.getSelectedElementStyle()).not.toEqual(oldStyle);
-            });
-
-            it("cleans up slection on scope destroy", function () {
-                expect(mockScope.$on).toHaveBeenCalledWith(
-                    '$destroy',
-                    jasmine.any(Function)
-                );
-
-                mockScope.$on.mostRecentCall.args[1]();
-
-                expect(mockOpenMCT.selection.off).toHaveBeenCalledWith(
-                    'change',
-                    jasmine.any(Function)
-                );
+                expect(controller.selected().style).not.toEqual(oldStyle);
             });
 
             describe("on display bounds changes", function () {
@@ -697,7 +660,7 @@ define(
                             source: 'range'
                         }
                     ]);
-                    var key = controller.chooseValueMetadataToDisplay(mockMetadata).source;
+                    var key = controller.chooseTelemetryKeyToDisplay(mockMetadata);
                     expect(key).toEqual('range');
                 });
 
@@ -719,7 +682,7 @@ define(
                             }
                         }
                     ]);
-                    var key = controller.chooseValueMetadataToDisplay(mockMetadata).source;
+                    var key = controller.chooseTelemetryKeyToDisplay(mockMetadata);
                     expect(key).toEqual('image');
                 });
 
@@ -739,14 +702,6 @@ define(
                         expect(controller.getElements()[0].cssClass).toEqual("alarm-a");
                     });
                 });
-
-                it("listens for selection change events", function () {
-                    expect(mockOpenMCT.selection.on).toHaveBeenCalledWith(
-                        'change',
-                        jasmine.any(Function)
-                    );
-                });
-
             });
         });
     }

platform/features/layout/test/LayoutControllerSpec.js

@@ -475,11 +475,11 @@ define(
                 );
 
                 var childObj = mockDomainObject("d");
-                var testElement = $("<div data-layout-id='some-id'></div>");
+                var testElement = $("<div class='some-class'></div>");
                 $element.append(testElement);
                 spyOn(testElement[0], 'click');
 
-                controller.selectIfNew('some-id', childObj);
+                controller.selectIfNew('some-class', childObj);
                 jasmine.Clock.tick(0);
 
                 expect(testElement[0].click).toHaveBeenCalled();

platform/features/plot/README.md

@@ -0,0 +1,37 @@
+# Plot README
+
+## Chart 
+
+The `mct-chart` directive is used to support drawing of simple charts. It is 
+present to support the Plot view, and its functionality is limited to the 
+functionality that is relevant for that view.
+
+This directive is used at the element level and takes one attribute, `draw` 
+which is an Angular expression which will should evaluate to a drawing object. 
+This drawing object should contain the following properties:
+
+* `dimensions`: The size, in logical coordinates, of the chart area. A 
+two-element array or numbers. 
+* `origin`: The position, in logical coordinates, of the lower-left corner of 
+the chart area. A two-element array or numbers. 
+* `lines`: An array of lines (e.g. as a plot line) to draw, where each line is 
+expressed as an object containing: 
+    * `buffer`: A Float32Array containing points in the line, in logical 
+    coordinates, in sequential x,y pairs. 
+    * `color`: The color of the line, as a four-element RGBA array, where 
+    each element is a number in the range of 0.0-1.0. 
+    * `points`: The number of points in the line. 
+* `boxes`: An array of rectangles to draw in the chart area. Each is an object 
+containing: 
+    * `start`: The first corner of the rectangle, as a two-element array of 
+    numbers, in logical coordinates. 
+    * `end`: The opposite corner of the rectangle, as a two-element array of 
+    numbers, in logical coordinates. color : The color of the line, as a 
+    four-element RGBA array, where each element is a number in the range of 
+    0.0-1.0. 
+
+While `mct-chart` is intended to support plots specifically, it does perform 
+some useful management of canvas objects (e.g. choosing between WebGL and Canvas 
+2D APIs for drawing based on browser support) so its usage is recommended when 
+its supported drawing primitives are sufficient for other charting tasks. 
+ 

platform/features/plot/bundle.js

@@ -0,0 +1,157 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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([
+    "./src/MCTChart",
+    "./src/PlotController",
+    "./src/policies/PlotViewPolicy",
+    "./src/PlotOptionsController",
+    "./src/services/ExportImageService",
+    "text!./res/templates/plot.html",
+    "text!./res/templates/plot-options-browse.html",
+    'legacyRegistry'
+], function (
+    MCTChart,
+    PlotController,
+    PlotViewPolicy,
+    PlotOptionsController,
+    exportImageService,
+    plotTemplate,
+    plotOptionsBrowseTemplate,
+    legacyRegistry
+) {
+
+    legacyRegistry.register("platform/features/plot", {
+        "name": "Plot view for telemetry",
+        "extensions": {
+            "views": [
+                {
+                    "name": "Plot",
+                    "key": "plot",
+                    "cssClass": "icon-sine",
+                    "template": plotTemplate,
+                    "needs": [
+                        "telemetry"
+                    ],
+                    "priority": "preferred",
+                    "delegation": true
+                }
+            ],
+            "directives": [
+                {
+                    "key": "mctChart",
+                    "implementation": MCTChart,
+                    "depends": [
+                        "$interval",
+                        "$log"
+                    ]
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "PlotController",
+                    "implementation": PlotController,
+                    "depends": [
+                        "$scope",
+                        "$element",
+                        "exportImageService",
+                        "telemetryFormatter",
+                        "telemetryHandler",
+                        "throttle",
+                        "PLOT_FIXED_DURATION",
+                        "openmct"
+                    ]
+                },
+                {
+                    "key": "PlotOptionsController",
+                    "implementation": PlotOptionsController,
+                    "depends": [
+                        "$scope"
+                    ]
+                }
+            ],
+            "services": [
+                {
+                    "key": "exportImageService",
+                    "implementation": exportImageService,
+                    "depends": [
+                        "$q",
+                        "$timeout",
+                        "$log",
+                        "EXPORT_IMAGE_TIMEOUT"
+                    ]
+
+                }
+            ],
+            "constants": [
+                {
+                    "key": "PLOT_FIXED_DURATION",
+                    "value": 900000,
+                    "priority": "fallback",
+                    "comment": "Fifteen minutes."
+                },
+                {
+                    "key": "EXPORT_IMAGE_TIMEOUT",
+                    "value": 500,
+                    "priority": "fallback"
+                }
+            ],
+            "policies": [
+                {
+                    "category": "view",
+                    "implementation": PlotViewPolicy,
+                    "depends": [
+                        "openmct"
+                    ]
+                }
+            ],
+            "representations": [
+                {
+                    "key": "plot-options-browse",
+                    "template": plotOptionsBrowseTemplate
+                }
+            ],
+            "licenses": [
+                {
+                    "name": "FileSaver.js",
+                    "version": "0.0.2",
+                    "author": "Eli Grey",
+                    "description": "File download initiator (for file exports)",
+                    "website": "https://github.com/eligrey/FileSaver.js/",
+                    "copyright": "Copyright © 2015 Eli Grey.",
+                    "license": "license-mit",
+                    "link": "https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md"
+                },
+                {
+                    "name": "html2canvas",
+                    "version": "0.4.1",
+                    "author": "Niklas von Hertzen",
+                    "description": "JavaScript HTML renderer",
+                    "website": "https://github.com/niklasvh/html2canvas",
+                    "copyright": "Copyright © 2012 Niklas von Hertzen.",
+                    "license": "license-mit",
+                    "link": "https://github.com/niklasvh/html2canvas/blob/master/LICENSE"
+                }
+            ]
+        }
+    });
+});

platform/features/plot/res/templates/plot-options-browse.html

@@ -0,0 +1,70 @@
+<!--
+ Open MCT, Copyright (c) 2014-2017, 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.
+-->
+<div ng-controller="PlotOptionsController" class="flex-elem grows l-inspector-part">
+    <em class="t-inspector-part-header" title="Display properties for this object">Plot Options</em>
+    <mct-form
+            ng-model="configuration.plot.xAxis"
+            structure="xAxisForm"
+            name="xAxisFormState"
+            class="flex-elem l-flex-row no-margin">
+    </mct-form>
+    <mct-form
+            ng-model="configuration.plot.yAxis"
+            structure="yAxisForm"
+            name="yAxisFormState"
+            class="flex-elem l-flex-row no-margin">
+    </mct-form>
+    <div class="form">
+        <div class="section-header ng-binding ng-scope">
+            Plot Series
+        </div>
+        <ul class="first flex-elem grows vscroll">
+            <ul class="tree">
+                <li ng-repeat="child in children">
+                    <span ng-controller="ToggleController as toggle">
+                        <span ng-controller="TreeNodeController as treeNode">
+                            <span class="tree-item menus-to-left">
+                                <span
+                                    class='ui-symbol view-control flex-elem has-children'
+                                    ng-class="{ expanded: toggle.isActive() }"
+                                    ng-click="toggle.toggle(); treeNode.trackExpansion()">
+                                </span>
+                                <mct-representation
+                                    class="rep-object-label"
+                                    key="'label'"
+                                    mct-object="child">
+                                </mct-representation>
+                            </span>
+                        </span>
+                        <mct-form
+                            ng-class="{hidden: !toggle.isActive()}"
+                            ng-model="configuration.plot.series[$index]"
+                            structure="plotSeriesForm"
+                            name="plotOptionsState"
+                            class="flex-elem l-flex-row">
+                        </mct-form>
+                    </span>
+                </li>
+            </ul>
+        </ul>
+    </div>
+</div>

platform/features/plot/res/templates/plot.html

@@ -0,0 +1,165 @@
+<!--
+ Open MCT, Copyright (c) 2014-2017, 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.
+-->
+<span ng-controller="PlotController as plot"
+      class="abs holder holder-plot has-control-bar">
+    <div class="l-control-bar" ng-show="!plot.hideExportButtons">
+         <span class="l-btn-set">
+            <a class="s-button t-export labeled icon-download"
+               ng-click="plot.exportPNG()"
+               title="Export This View's Data as PNG">
+                PNG
+            </a>
+            <a class="s-button t-export labeled"
+               ng-click="plot.exportJPG()"
+               title="Export This View's Data as JPG">
+                JPG
+            </a>
+        </span>
+    </div>
+    <div class="l-view-section">
+        <div class="gl-plot"
+             ng-style="{ height: 100 / plot.getSubPlots().length + '%'}"
+             ng-repeat="subplot in plot.getSubPlots()">
+            <div class="gl-plot-legend">
+                <span class='plot-legend-item'
+                        ng-repeat="telemetryObject in subplot.getTelemetryObjects()"
+                        ng-class="plot.getLegendClass(telemetryObject)">
+                    <span class='plot-color-swatch'
+                          ng-style="{ 'background-color': plot.getColor($index) }">
+                    </span>
+                    <span class='title-label'>{{telemetryObject.getModel().name}}</span>
+                </span>
+            </div>
+
+            <div class="gl-plot-axis-area gl-plot-y">
+                <div class="gl-plot-label gl-plot-y-label">
+                    {{axes[1].active.name}}
+                </div>
+                <div ng-repeat="tick in subplot.getRangeTicks()"
+                     class="gl-plot-tick gl-plot-y-tick-label"
+                     ng-style="{ bottom: (100 * $index / (subplot.getRangeTicks().length - 1)) + '%' }">
+                    {{tick.label | reverse}}
+                </div>
+                <div class="gl-plot-y-options gl-plot-local-controls"
+                     ng-if="axes[1].options.length > 1">
+                    <div class='form-control shell select'>
+                        <select class="form-control input shell"
+                                ng-model="axes[1].active"
+                                ng-options="option.name for option in axes[1].options">
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="gl-plot-wrapper-display-area-and-x-axis">
+                <mct-include key="'time-of-interest'"
+                             class="l-toi-holder show-val"
+                             ng-if="toiPerc"
+                             ng-class="{ 'pinned': toiPinned, 'val-to-left': toiPerc > 80 }"
+                             ng-style="{'left': toiPerc + '%'}"></mct-include>
+
+                <div class="gl-plot-coords"
+                     ng-if="subplot.isHovering() && subplot.getHoverCoordinates()">
+                    {{subplot.getHoverCoordinates()}}
+                </div>
+
+                <div class="gl-plot-display-area"
+                     ng-mouseenter="subplot.isHovering(true);"
+                     ng-mouseleave="subplot.isHovering(false)"
+                     ng-class="{ loading: plot.isRequestPending() }">
+
+                    <!-- Out-of-bounds data indicators -->
+                    <!-- ng-show is temporarily hard-coded in next element -->
+                    <div ng-show="false" class="l-oob-data l-oob-data-up"></div>
+                    <div ng-show="false" class="l-oob-data l-oob-data-dwn"></div>
+                    <div class="gl-plot-hash hash-v"
+                         ng-repeat="tick in subplot.getDomainTicks()"
+                         ng-style="{ left: (100 * $index / (subplot.getDomainTicks().length - 1)) + '%', height: '100%' }"
+                         ng-show="$index > 0 && $index < (subplot.getDomainTicks().length - 1)">
+                    </div>
+                    <div class="gl-plot-hash hash-h"
+                         ng-repeat="tick in subplot.getRangeTicks()"
+                         ng-style="{ bottom: (100 * $index / (subplot.getRangeTicks().length - 1)) + '%', width: '100%' }"
+                         ng-show="$index > 0 && $index < (subplot.getRangeTicks().length - 1)">
+                    </div>
+                    <mct-chart draw="subplot.getDrawingObject()"
+                               ng-if="subplot.getTelemetryObjects().length > 0"
+                               ng-mousemove="subplot.hover($event)"
+                               mct-drag="subplot.continueDrag($event)"
+                               mct-drag-down="subplot.startDrag($event)"
+                               mct-drag-up="subplot.endDrag($event); plot.update()">
+                    </mct-chart>
+                    <!-- TODO: Move into correct position; make part of group; infer from set of actions -->
+                    <div class="l-local-controls gl-plot-local-controls t-plot-display-controls"
+                         ng-if="$first">
+                        <a class="s-button icon-arrow-left"
+                           ng-click="plot.stepBackPanZoom()"
+                           ng-show="plot.isZoomed()"
+                           title="Restore previous pan/zoom">
+                        </a>
+                        <a class="s-button icon-arrows-out"
+                           ng-click="plot.unzoom()"
+                           ng-show="plot.isZoomed()"
+                           title="Reset pan/zoom">
+                        </a>
+                        <div class="menu-element s-menu-button menus-to-left {{plot.getMode().cssClass}}"
+                             ng-if="plot.getModeOptions().length > 1"
+                             ng-controller="ClickAwayController as toggle">
+                            <span class="l-click-area" ng-click="toggle.toggle()"></span>
+                            <span>{{plot.getMode().name}}</span>
+                            <div class="menu" ng-show="toggle.isActive()">
+                                <ul>
+                                    <li ng-repeat="option in plot.getModeOptions()"
+                                        ng-click="plot.setMode(option); toggle.setState(false)"
+                                        class="{{option.cssClass}}">
+                                        {{option.name}}
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div ng-if="$last" class="gl-plot-axis-area gl-plot-x">
+                    <div ng-repeat="tick in subplot.getDomainTicks()"
+                         class="gl-plot-tick gl-plot-x-tick-label"
+                         ng-show="$index > 0 && $index < (subplot.getDomainTicks().length - 1)"
+                         ng-style="{ left: (100 * $index / (subplot.getDomainTicks().length - 1)) + '%' }">
+                        {{tick.label | reverse}}
+                    </div>
+                    <div class="gl-plot-label gl-plot-x-label">
+                        {{axes[0].active.name}}
+                    </div>
+                    <div class="gl-plot-x-options gl-plot-local-controls"
+                         ng-if="axes[0].options.length > 1">
+                        <div class='form-control shell select'>
+                            <select class="form-control input shell"
+                                    ng-model="axes[0].active"
+                                    ng-options="option.name for option in axes[0].options">
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</span>

platform/features/plot/src/Canvas2DChart.js

@@ -0,0 +1,117 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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 () {
+
+        /**
+         * Create a new chart which uses Canvas's 2D API for rendering.
+         *
+         * @memberof platform/features/plot
+         * @constructor
+         * @implements {platform/features/plot.Chart}
+         * @param {CanvasElement} canvas the canvas object to render upon
+         * @throws {Error} an error is thrown if Canvas's 2D API is unavailable.
+         */
+        function Canvas2DChart(canvas) {
+            this.canvas = canvas;
+            this.c2d = canvas.getContext('2d');
+            this.width = canvas.width;
+            this.height = canvas.height;
+            this.dimensions = [this.width, this.height];
+            this.origin = [0, 0];
+
+            if (!this.c2d) {
+                throw new Error("Canvas 2d API unavailable.");
+            }
+        }
+
+        // Convert from logical to physical x coordinates
+        Canvas2DChart.prototype.x = function (v) {
+            return ((v - this.origin[0]) / this.dimensions[0]) * this.width;
+        };
+
+        // Convert from logical to physical y coordinates
+        Canvas2DChart.prototype.y = function (v) {
+            return this.height -
+                ((v - this.origin[1]) / this.dimensions[1]) * this.height;
+        };
+
+        // Set the color to be used for drawing operations
+        Canvas2DChart.prototype.setColor = function (color) {
+            var mappedColor = color.map(function (c, i) {
+                return i < 3 ? Math.floor(c * 255) : (c);
+            }).join(',');
+            this.c2d.strokeStyle = "rgba(" + mappedColor + ")";
+            this.c2d.fillStyle = "rgba(" + mappedColor + ")";
+        };
+
+
+        Canvas2DChart.prototype.clear = function () {
+            var canvas = this.canvas;
+            this.width = canvas.width;
+            this.height = canvas.height;
+            this.c2d.clearRect(0, 0, this.width, this.height);
+        };
+
+        Canvas2DChart.prototype.setDimensions = function (newDimensions, newOrigin) {
+            this.dimensions = newDimensions;
+            this.origin = newOrigin;
+        };
+
+        Canvas2DChart.prototype.drawLine = function (buf, color, points) {
+            var i;
+
+            this.setColor(color);
+
+            // Configure context to draw two-pixel-thick lines
+            this.c2d.lineWidth = 2;
+
+            // Start a new path...
+            if (buf.length > 1) {
+                this.c2d.beginPath();
+                this.c2d.moveTo(this.x(buf[0]), this.y(buf[1]));
+            }
+
+            // ...and add points to it...
+            for (i = 2; i < points * 2; i = i + 2) {
+                this.c2d.lineTo(this.x(buf[i]), this.y(buf[i + 1]));
+            }
+
+            // ...before finally drawing it.
+            this.c2d.stroke();
+        };
+
+        Canvas2DChart.prototype.drawSquare = function (min, max, color) {
+            var x1 = this.x(min[0]),
+                y1 = this.y(min[1]),
+                w = this.x(max[0]) - x1,
+                h = this.y(max[1]) - y1;
+
+            this.setColor(color);
+            this.c2d.fillRect(x1, y1, w, h);
+        };
+
+        return Canvas2DChart;
+    }
+);

platform/features/plot/src/GLChart.js

@@ -0,0 +1,160 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+
+/**
+ * Module defining GLPlot. Created by vwoeltje on 11/12/14.
+ */
+define(
+    [],
+    function () {
+
+        // WebGL shader sources (for drawing plain colors)
+        var FRAGMENT_SHADER = [
+                "precision mediump float;",
+                "uniform vec4 uColor;",
+                "void main(void) {",
+                "gl_FragColor = uColor;",
+                "}"
+            ].join('\n'),
+            VERTEX_SHADER = [
+                "attribute vec2 aVertexPosition;",
+                "uniform vec2 uDimensions;",
+                "uniform vec2 uOrigin;",
+                "void main(void) {",
+                "gl_Position = vec4(2.0 * ((aVertexPosition - uOrigin) / uDimensions) - vec2(1,1), 0, 1);",
+                "}"
+            ].join('\n');
+
+        /**
+         * Create a new chart which uses WebGL for rendering.
+         *
+         * @memberof platform/features/plot
+         * @constructor
+         * @implements {platform/features/plot.Chart}
+         * @param {CanvasElement} canvas the canvas object to render upon
+         * @throws {Error} an error is thrown if WebGL is unavailable.
+         */
+        function GLChart(canvas) {
+            var gl = canvas.getContext("webgl", { preserveDrawingBuffer: true }) ||
+                    canvas.getContext("experimental-webgl", { preserveDrawingBuffer: true }),
+                vertexShader,
+                fragmentShader,
+                program,
+                aVertexPosition,
+                uColor,
+                uDimensions,
+                uOrigin;
+
+            // Ensure a context was actually available before proceeding
+            if (!gl) {
+                throw new Error("WebGL unavailable.");
+            }
+
+            // Initialize shaders
+            vertexShader = gl.createShader(gl.VERTEX_SHADER);
+            gl.shaderSource(vertexShader, VERTEX_SHADER);
+            gl.compileShader(vertexShader);
+            fragmentShader = gl.createShader(gl.FRAGMENT_SHADER);
+            gl.shaderSource(fragmentShader, FRAGMENT_SHADER);
+            gl.compileShader(fragmentShader);
+
+            // Assemble vertex/fragment shaders into programs
+            program = gl.createProgram();
+            gl.attachShader(program, vertexShader);
+            gl.attachShader(program, fragmentShader);
+            gl.linkProgram(program);
+            gl.useProgram(program);
+
+            // Get locations for attribs/uniforms from the
+            // shader programs (to pass values into shaders at draw-time)
+            aVertexPosition = gl.getAttribLocation(program, "aVertexPosition");
+            uColor = gl.getUniformLocation(program, "uColor");
+            uDimensions = gl.getUniformLocation(program, "uDimensions");
+            uOrigin = gl.getUniformLocation(program, "uOrigin");
+            gl.enableVertexAttribArray(aVertexPosition);
+
+            // Create a buffer to holds points which will be drawn
+            this.buffer = gl.createBuffer();
+
+            // Use a line width of 2.0 for legibility
+            gl.lineWidth(2.0);
+
+            // Enable blending, for smoothness
+            gl.enable(gl.BLEND);
+            gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+
+            this.gl = gl;
+            this.aVertexPosition = aVertexPosition;
+            this.uColor = uColor;
+            this.uDimensions = uDimensions;
+            this.uOrigin = uOrigin;
+        }
+
+        // Utility function to handle drawing of a buffer;
+        // drawType will determine whether this is a box, line, etc.
+        GLChart.prototype.doDraw = function (drawType, buf, color, points) {
+            var gl = this.gl;
+            gl.bindBuffer(gl.ARRAY_BUFFER, this.buffer);
+            gl.bufferData(gl.ARRAY_BUFFER, buf, gl.DYNAMIC_DRAW);
+            gl.vertexAttribPointer(this.aVertexPosition, 2, gl.FLOAT, false, 0, 0);
+            gl.uniform4fv(this.uColor, color);
+            gl.drawArrays(drawType, 0, points);
+        };
+
+        GLChart.prototype.clear = function () {
+            var gl = this.gl;
+
+            // Set the viewport size; note that we use the width/height
+            // that our WebGL context reports, which may be lower
+            // resolution than the canvas we requested.
+            gl.viewport(
+                0,
+                0,
+                gl.drawingBufferWidth,
+                gl.drawingBufferHeight
+            );
+            gl.clear(gl.COLOR_BUFFER_BIT + gl.DEPTH_BUFFER_BIT);
+        };
+
+
+        GLChart.prototype.setDimensions = function (dimensions, origin) {
+            var gl = this.gl;
+            if (dimensions && dimensions.length > 0 &&
+                origin && origin.length > 0) {
+                gl.uniform2fv(this.uDimensions, dimensions);
+                gl.uniform2fv(this.uOrigin, origin);
+            }
+        };
+
+        GLChart.prototype.drawLine = function (buf, color, points) {
+            this.doDraw(this.gl.LINE_STRIP, buf, color, points);
+        };
+
+        GLChart.prototype.drawSquare = function (min, max, color) {
+            this.doDraw(this.gl.TRIANGLE_FAN, new Float32Array(
+                min.concat([min[0], max[1]]).concat(max).concat([max[0], min[1]])
+            ), color, 4);
+        };
+
+        return GLChart;
+    }
+);

platform/features/plot/src/MCTChart.js

@@ -0,0 +1,250 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+
+/**
+ * Module defining MCTChart. Created by vwoeltje on 11/12/14.
+ */
+define(
+    ["./GLChart", "./Canvas2DChart"],
+    function (GLChart, Canvas2DChart) {
+
+        var TEMPLATE = "<canvas style='position: absolute; background: none; width: 100%; height: 100%;'></canvas>";
+
+        /**
+         * The mct-chart directive provides a canvas element which can be
+         * drawn upon, to support Plot view and similar visualizations.
+         *
+         * This directive takes one attribute, "draw", which is an Angular
+         * expression which will be two-way bound to a drawing object. This
+         * drawing object should contain:
+         *
+         * * `dimensions`: An object describing the logical bounds of the
+         *   drawable area, containing two fields:
+         *   * `origin`: The position, in logical coordinates, of the
+         *     lower-left corner of the chart area. A two-element array.
+         *   * `dimensions`: A two-element array containing the width
+         *     and height of the chart area, in logical coordinates.
+         * * `lines`: An array of lines to be drawn, where each line is
+         *   expressed as an object containing:
+         *   * `buffer`: A Float32Array containing points in the line,
+         *     in logical coordinate, in sequential x/y pairs.
+         *   * `color`: The color of the line, as a four-element RGBA
+         *     array, where each element is in the range of 0.0-1.0
+         *   * `points`: The number of points in the line.
+         * * `boxes`: An array of rectangles to draw in the chart area
+         *   (used for marquee zoom). Each is an object containing:
+         *   * `start`: The first corner of the rectangle (as a two-element
+         *      array, logical coordinates)
+         *   * `end`: The opposite corner of the rectangle (again, as a
+         *      two-element array)
+         *   * `color`: The color of the box, as a four-element RGBA
+         *     array, where each element is in the range of 0.0-1.0
+         *
+         * @memberof platform/features/plot
+         * @constructor
+         */
+        function MCTChart($interval, $log) {
+            // Get an underlying chart implementation
+            function getChart(Charts, canvas) {
+                // Try the first available option...
+                var Chart = Charts[0];
+
+                // This function recursively try-catches all options;
+                // if these all fail, issue a warning.
+                if (!Chart) {
+                    $log.warn("Cannot initialize mct-chart.");
+                    return undefined;
+                }
+
+                // Try first option; if it fails, try remaining options
+                try {
+                    return new Chart(canvas);
+                } catch (e) {
+                    $log.warn([
+                        "Could not instantiate chart",
+                        Chart.name,
+                        ";",
+                        e.message
+                    ].join(" "));
+
+                    return getChart(Charts.slice(1), canvas);
+                }
+            }
+
+            function linkChart(scope, element) {
+                var canvas = element.find("canvas")[0],
+                    activeInterval,
+                    chart;
+
+                // Handle drawing, based on contents of the "draw" object
+                // in scope
+                function doDraw(draw) {
+                    // Ensure canvas context has same resolution
+                    // as canvas element
+                    canvas.width = canvas.offsetWidth;
+                    canvas.height = canvas.offsetHeight;
+
+                    // Clear previous contents
+                    chart.clear();
+
+                    // Nothing to draw if no draw object defined
+                    if (!draw) {
+                        return;
+                    }
+
+                    // Set logical boundaries for the chart
+                    chart.setDimensions(
+                        draw.dimensions || [1, 1],
+                        draw.origin || [0, 0]
+                    );
+
+                    // Draw line segments
+                    (draw.lines || []).forEach(function (line) {
+                        chart.drawLine(
+                            line.buffer,
+                            line.color,
+                            line.points
+                        );
+                    });
+
+                    // Draw boxes (e.g. marquee zoom rect)
+                    (draw.boxes || []).forEach(function (box) {
+                        chart.drawSquare(
+                            box.start,
+                            box.end,
+                            box.color
+                        );
+                    });
+
+                }
+
+                // Issue a drawing call, if-and-only-if canvas size
+                // has changed. This will be called on a timer, since
+                // there is no event to depend on.
+                function drawIfResized() {
+                    if (canvas.width !== canvas.offsetWidth ||
+                            canvas.height !== canvas.offsetHeight) {
+                        doDraw(scope.draw);
+                        scope.$apply();
+                    }
+                }
+
+                // Stop watching for changes to size (scope destroyed)
+                function releaseInterval() {
+                    if (activeInterval) {
+                        $interval.cancel(activeInterval);
+                    }
+                }
+
+                // Switch from WebGL to plain 2D if context is lost
+                function fallbackFromWebGL() {
+                    element.html(TEMPLATE);
+                    canvas = element.find("canvas")[0];
+                    chart = getChart([Canvas2DChart], canvas);
+                    if (chart) {
+                        doDraw(scope.draw);
+                    }
+                }
+
+                // Try to initialize a chart.
+                chart = getChart([GLChart, Canvas2DChart], canvas);
+
+                // If that failed, there's nothing more we can do here.
+                // (A warning will already have been issued)
+                if (!chart) {
+                    return;
+                }
+
+                // WebGL is a bit of a special case; it may work, then fail
+                // later for various reasons, so we need to listen for this
+                // and fall back to plain canvas drawing when it occurs.
+                canvas.addEventListener("webglcontextlost", fallbackFromWebGL);
+
+                // Check for resize, on a timer
+                activeInterval = $interval(drawIfResized, 1000, 0, false);
+
+                // Watch "draw" for external changes to the set of
+                // things to be drawn.
+                scope.$watchCollection("draw", doDraw);
+
+                // Stop checking for resize when scope is destroyed
+                scope.$on("$destroy", releaseInterval);
+            }
+
+            return {
+                // Apply directive only to elements
+                restrict: "E",
+
+                // Template to use (a canvas element)
+                template: TEMPLATE,
+
+                // Link function; set up scope
+                link: linkChart,
+
+                // Initial, isolate scope for the directive
+                scope: { draw: "=" }
+            };
+        }
+
+        /**
+         * @interface platform/features/plot.Chart
+         * @private
+         */
+
+        /**
+         * Clear the chart.
+         * @method platform/features/plot.Chart#clear
+         */
+        /**
+         * Set the logical boundaries of the chart.
+         * @param {number[]} dimensions the horizontal and
+         *        vertical dimensions of the chart
+         * @param {number[]} origin the horizontal/vertical
+         *        origin of the chart
+         * @memberof platform/features/plot.Chart#setDimensions
+         */
+        /**
+         * Draw the supplied buffer as a line strip (a sequence
+         * of line segments), in the chosen color.
+         * @param {Float32Array} buf the line strip to draw,
+         *        in alternating x/y positions
+         * @param {number[]} color the color to use when drawing
+         *        the line, as an RGBA color where each element
+         *        is in the range of 0.0-1.0
+         * @param {number} points the number of points to draw
+         * @memberof platform/features/plot.Chart#drawLine
+         */
+        /**
+         * Draw a rectangle extending from one corner to another,
+         * in the chosen color.
+         * @param {number[]} min the first corner of the rectangle
+         * @param {number[]} max the opposite corner
+         * @param {number[]} color the color to use when drawing
+         *        the rectangle, as an RGBA color where each element
+         *        is in the range of 0.0-1.0
+         * @memberof platform/features/plot.Chart#drawSquare
+         */
+
+        return MCTChart;
+    }
+);
+

platform/features/plot/src/PlotController.js

@@ -0,0 +1,437 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+
+/**
+ * This bundle adds a "Plot" view for numeric telemetry data.
+ * @namespace platform/features/plot
+ */
+define(
+    [
+        "./elements/PlotUpdater",
+        "./elements/PlotPalette",
+        "./elements/PlotAxis",
+        "./elements/PlotLimitTracker",
+        "./elements/PlotTelemetryFormatter",
+        "./modes/PlotModeOptions",
+        "./SubPlotFactory"
+    ],
+    function (
+        PlotUpdater,
+        PlotPalette,
+        PlotAxis,
+        PlotLimitTracker,
+        PlotTelemetryFormatter,
+        PlotModeOptions,
+        SubPlotFactory
+    ) {
+
+        var AXIS_DEFAULTS = [
+                { "name": "Time" },
+                { "name": "Value" }
+            ];
+
+        /**
+         * The PlotController is responsible for any computation/logic
+         * associated with displaying the plot view. Specifically, these
+         * responsibilities include:
+         *
+         * * Describing axes and labeling.
+         * * Handling user interactions.
+         * * Deciding what needs to be drawn in the chart area.
+         *
+         * @memberof platform/features/plot
+         * @constructor
+         */
+        function PlotController(
+            $scope,
+            $element,
+            exportImageService,
+            telemetryFormatter,
+            telemetryHandler,
+            throttle,
+            PLOT_FIXED_DURATION,
+            openmct
+        ) {
+            var self = this,
+                plotTelemetryFormatter =
+                    new PlotTelemetryFormatter(telemetryFormatter),
+                subPlotFactory =
+                    new SubPlotFactory(plotTelemetryFormatter),
+                cachedObjects = [],
+                updater,
+                lastBounds,
+                lastRange,
+                lastDomain,
+                handle;
+            var timeAPI = openmct.time;
+
+            // Populate the scope with axis information (specifically, options
+            // available for each axis.)
+            function setupAxes(metadatas) {
+                $scope.axes.forEach(function (axis) {
+                    axis.updateMetadata(metadatas);
+                });
+            }
+
+            // Trigger an update of a specific subplot;
+            // used in a loop to update all subplots.
+            function updateSubplot(subplot) {
+                subplot.update();
+            }
+
+            // Set up available modes (stacked/overlaid), based on the
+            // set of telemetry objects in this plot view.
+            function setupModes(telemetryObjects) {
+                if (cachedObjects !== telemetryObjects) {
+                    cachedObjects = telemetryObjects;
+                    self.modeOptions = new PlotModeOptions(
+                        telemetryObjects || [],
+                        subPlotFactory
+                    );
+                }
+            }
+
+            // 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() {
+                var domain = $scope.axes[0].active.key,
+                    range = $scope.axes[1].active.key,
+                    duration = PLOT_FIXED_DURATION;
+
+                updater = new PlotUpdater(handle, domain, range, duration);
+                lastDomain = domain;
+                lastRange = range;
+
+                self.limitTracker = new PlotLimitTracker(handle, range);
+
+                // Keep any externally-provided bounds
+                if (lastBounds) {
+                    setBasePanZoom(lastBounds);
+                }
+            }
+
+            function getUpdater() {
+                if (!updater) {
+                    recreateUpdater();
+                }
+                return updater;
+            }
+
+            // Handle new telemetry data in this plot
+            function updateValues() {
+                self.pending = false;
+                if (handle) {
+                    setupModes(handle.getTelemetryObjects());
+                    setupAxes(handle.getMetadata());
+                    getUpdater().update();
+                    self.modeOptions.getModeHandler().plotTelemetry(updater);
+                    self.limitTracker.update();
+                    self.update();
+                }
+            }
+
+            // Display new historical data as it becomes available
+            function addHistoricalData(domainObject, series) {
+                self.pending = false;
+                getUpdater().addHistorical(domainObject, series);
+                self.modeOptions.getModeHandler().plotTelemetry(updater);
+                self.update();
+            }
+
+            // Issue a new request for historical telemetry
+            function requestTelemetry() {
+                if (handle) {
+                    handle.request({}, addHistoricalData);
+                }
+            }
+
+            // Requery for data entirely
+            function replot() {
+                if (handle) {
+                    updater = undefined;
+                    requestTelemetry();
+                }
+            }
+
+            function changeTimeOfInterest(timeOfInterest) {
+                if (timeOfInterest !== undefined) {
+                    var bounds = timeAPI.bounds();
+                    var range = bounds.end - bounds.start;
+                    $scope.toiPerc = ((timeOfInterest - bounds.start) / range) * 100;
+                    $scope.toiPinned = true;
+                } else {
+                    $scope.toiPerc = undefined;
+                    $scope.toiPinned = false;
+                }
+            }
+
+            // Create a new subscription; telemetrySubscriber gets
+            // to do the meaningful work here.
+            function subscribe(domainObject) {
+                if (handle) {
+                    handle.unsubscribe();
+                }
+                handle = domainObject && telemetryHandler.handle(
+                    domainObject,
+                    updateValues,
+                    true // Lossless
+                );
+                replot();
+
+                changeTimeOfInterest(timeAPI.timeOfInterest());
+                timeAPI.on("timeOfInterest", changeTimeOfInterest);
+            }
+
+            // Release the current subscription (called when scope is destroyed)
+            function releaseSubscription() {
+                if (handle) {
+                    handle.unsubscribe();
+                    handle = undefined;
+                }
+                timeAPI.off("timeOfInterest", changeTimeOfInterest);
+            }
+
+            function requery() {
+                self.pending = true;
+                releaseSubscription();
+                subscribe($scope.domainObject);
+            }
+
+            function updateDomainFormat() {
+                var domainAxis = $scope.axes[0];
+                plotTelemetryFormatter
+                    .setDomainFormat(domainAxis.active.format);
+            }
+
+            function domainRequery(newDomain) {
+                if (newDomain !== lastDomain) {
+                    updateDomainFormat();
+                    requery();
+                }
+            }
+
+            function rangeRequery(newRange) {
+                if (newRange !== lastRange) {
+                    requery();
+                }
+            }
+
+            // Respond to a display bounds change (requery for data)
+            function changeDisplayBounds(event, bounds, follow) {
+                //'hack' for follow mode
+                if (follow === true) {
+                    setBasePanZoom(bounds);
+                } else {
+                    var domainAxis = $scope.axes[0];
+
+                    if (bounds.domain) {
+                        domainAxis.chooseOption(bounds.domain);
+                    }
+                    updateDomainFormat();
+                    setBasePanZoom(bounds);
+                    requery();
+                }
+                self.setUnsynchedStatus($scope.domainObject, follow && self.isZoomed());
+                changeTimeOfInterest(timeAPI.timeOfInterest());
+            }
+
+            this.modeOptions = new PlotModeOptions([], subPlotFactory);
+            this.updateValues = updateValues;
+
+            // Create a throttled update function
+            this.scheduleUpdate = throttle(function () {
+                self.modeOptions.getModeHandler().getSubPlots()
+                    .forEach(updateSubplot);
+            });
+
+            self.pending = true;
+            self.$element = $element;
+            self.exportImageService = exportImageService;
+
+            // Initialize axes; will get repopulated when telemetry
+            // metadata becomes available.
+            $scope.axes = [
+                new PlotAxis("domains", [], AXIS_DEFAULTS[0]),
+                new PlotAxis("ranges", [], AXIS_DEFAULTS[1])
+            ];
+
+            //Are some initialized bounds defined?
+            var bounds = timeAPI.bounds();
+            if (bounds &&
+                bounds.start !== undefined &&
+                bounds.end !== undefined) {
+                changeDisplayBounds(undefined, timeAPI.bounds(), timeAPI.clock() !== undefined);
+            }
+
+            // Watch for changes to the selected axis
+            $scope.$watch("axes[0].active.key", domainRequery);
+            $scope.$watch("axes[1].active.key", rangeRequery);
+
+            // 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);
+        }
+
+        /**
+         * Get the color (as a style-friendly string) to use
+         * for plotting the trace at the specified index.
+         * @param {number} index the index of the trace
+         * @returns {string} the color, in #RRGGBB form
+         */
+        PlotController.prototype.getColor = function (index) {
+            return PlotPalette.getStringColor(index);
+        };
+
+        /**
+         * Check if the plot is zoomed or panned out
+         * of its default state (to determine whether back/unzoom
+         * controls should be shown)
+         * @returns {boolean} true if not in default state
+         */
+        PlotController.prototype.isZoomed = function () {
+            return this.modeOptions.getModeHandler().isZoomed();
+        };
+
+        /**
+         * Undo the most recent pan/zoom change and restore
+         * the prior state.
+         */
+        PlotController.prototype.stepBackPanZoom = function () {
+            return this.modeOptions.getModeHandler().stepBackPanZoom();
+        };
+
+        /**
+         * Undo all pan/zoom changes and restore the initial state.
+         */
+        PlotController.prototype.unzoom = function () {
+            return this.modeOptions.getModeHandler().unzoom();
+        };
+
+        /**
+         * Get the mode options (Stacked/Overlaid) that are applicable
+         * for this plot.
+         */
+        PlotController.prototype.getModeOptions = function () {
+            return this.modeOptions.getModeOptions();
+        };
+
+        /**
+         * Get the current mode that is applicable to this plot. This
+         * will include key, name, and cssClass fields.
+         */
+        PlotController.prototype.getMode = function () {
+            return this.modeOptions.getMode();
+        };
+
+        /**
+         * Set the mode which should be active in this plot.
+         * @param mode one of the mode options returned from
+         *        getModeOptions()
+         */
+        PlotController.prototype.setMode = function (mode) {
+            this.modeOptions.setMode(mode);
+            this.updateValues();
+        };
+
+        /**
+         * Get all individual plots contained within this Plot view.
+         * (Multiple may be contained when in Stacked mode).
+         * @returns {SubPlot[]} all subplots in this Plot view
+         */
+        PlotController.prototype.getSubPlots = function () {
+            return this.modeOptions.getModeHandler().getSubPlots();
+        };
+
+        /**
+         * Get the CSS class to apply to the legend for this domain
+         * object; this will reflect limit state.
+         * @returns {string} the CSS class
+         */
+        PlotController.prototype.getLegendClass = function (telemetryObject) {
+            return this.limitTracker &&
+                this.limitTracker.getLegendClass(telemetryObject);
+        };
+
+        /**
+         * Explicitly update all plots.
+         */
+        PlotController.prototype.update = function () {
+            this.scheduleUpdate();
+        };
+
+        /**
+         * Check if a request is pending (to show the wait spinner)
+         */
+        PlotController.prototype.isRequestPending = function () {
+            // Placeholder; this should reflect request state
+            // when requesting historical telemetry
+            return this.pending;
+        };
+
+        PlotController.prototype.setUnsynchedStatus = function (domainObject, status) {
+            if (domainObject.hasCapability('status')) {
+                domainObject.getCapability('status').set('timeconductor-unsynced', status);
+            }
+        };
+
+        /**
+         * Export the plot to PNG
+         */
+        PlotController.prototype.exportPNG = function () {
+            var self = this;
+            self.hideExportButtons = true;
+            self.exportImageService.exportPNG(self.$element[0], "plot.png").finally(function () {
+                self.hideExportButtons = false;
+            });
+        };
+
+        /**
+         * Export the plot to JPG
+         */
+        PlotController.prototype.exportJPG = function () {
+            var self = this;
+            self.hideExportButtons = true;
+            self.exportImageService.exportJPG(self.$element[0], "plot.jpg").finally(function () {
+                self.hideExportButtons = false;
+            });
+        };
+
+        return PlotController;
+    }
+);
+

platform/features/plot/src/PlotOptionsController.js

@@ -0,0 +1,195 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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(
+    ['./PlotOptionsForm'],
+    function (PlotOptionsForm) {
+
+        /**
+         * Notes on implementation of plot options
+         *
+         * Multiple y-axes will have to be handled with multiple forms as
+         * they will need to be stored on distinct model object
+         *
+         * Likewise plot series options per-child will need to be separate
+         * forms.
+         */
+
+        /**
+         * The LayoutController is responsible for supporting the
+         * Layout view. It arranges frames according to saved configuration
+         * and provides methods for updating these based on mouse
+         * movement.
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {Scope} $scope the controller's Angular scope
+         */
+        function PlotOptionsController($scope) {
+
+            var self = this;
+            this.$scope = $scope;
+            this.domainObject = $scope.domainObject;
+            this.configuration = this.domainObject.getModel().configuration || {};
+            this.plotOptionsForm = new PlotOptionsForm();
+            this.composition = [];
+            this.watches = [];
+
+            /*
+             Listen for changes to the domain object and update the object's
+             children.
+             */
+            this.mutationListener = this.domainObject.getCapability('mutation').listen(function (model) {
+                if (self.hasCompositionChanged(self.composition, model.composition)) {
+                    self.updateChildren();
+                }
+            });
+
+            /*
+             Set form structures on scope
+             */
+            $scope.plotSeriesForm = this.plotOptionsForm.plotSeriesForm;
+            $scope.xAxisForm = this.plotOptionsForm.xAxisForm;
+            $scope.yAxisForm = this.plotOptionsForm.yAxisForm;
+
+            $scope.$on("$destroy", function () {
+                //Clean up any listeners on destruction of controller
+                self.mutationListener();
+            });
+
+            this.defaultConfiguration();
+            this.updateChildren();
+
+            /*
+             * Setup a number of watches for changes to form values. On
+             * change, update the model configuration via mutation
+             */
+            $scope.$watchCollection('configuration.plot.yAxis', function (newValue, oldValue) {
+                self.updateConfiguration(newValue, oldValue);
+            });
+            $scope.$watchCollection('configuration.plot.xAxis', function (newValue, oldValue) {
+                self.updateConfiguration(newValue, oldValue);
+            });
+
+            this.watchSeries();
+
+        }
+
+        /**
+         * Unregister all watches for series data (ie. the configuration for
+         * child objects)
+         * @private
+         */
+        PlotOptionsController.prototype.clearSeriesWatches = function () {
+            this.watches.forEach(function (watch) {
+                watch();
+            });
+            this.watches = [];
+        };
+
+        /**
+         * Attach watches for each object in the plot's composition
+         * @private
+         */
+        PlotOptionsController.prototype.watchSeries = function () {
+            var self = this;
+
+            this.clearSeriesWatches();
+
+            (self.$scope.children || []).forEach(function (child, index) {
+                self.watches.push(
+                    self.$scope.$watchCollection(
+                        'configuration.plot.series[' + index + ']',
+                        function (newValue, oldValue) {
+                            self.updateConfiguration(newValue, oldValue);
+                        }
+                    )
+                );
+            });
+        };
+
+        /**
+         * Determine whether the changes to the model that triggered a
+         * mutation event were purely compositional.
+         *
+         * @private
+         */
+        PlotOptionsController.prototype.hasCompositionChanged = function (oldComposition, newComposition) {
+            // Framed slightly strangely, but the boolean logic is
+            // easier to follow for the unchanged case.
+            var isUnchanged = oldComposition === newComposition ||
+                    (
+                        oldComposition.length === newComposition.length &&
+                        oldComposition.every(function (currentValue, index) {
+                            return newComposition[index] && currentValue === newComposition[index];
+                        })
+                    );
+            return !isUnchanged;
+        };
+
+        /**
+         * Default the plot options model
+         *
+         * @private
+         */
+        PlotOptionsController.prototype.defaultConfiguration = function () {
+            this.configuration.plot = this.configuration.plot || {};
+            this.configuration.plot.xAxis = this.configuration.plot.xAxis || {};
+            this.configuration.plot.yAxis = this.configuration.plot.yAxis || {}; // y-axes will be associative array keyed on axis key
+            this.configuration.plot.series = this.configuration.plot.series || []; // series will be associative array keyed on sub-object id
+            this.$scope.configuration = this.configuration;
+        };
+
+        /**
+         * When a child is added to, or removed from a plot, update the
+         * plot options model
+         * @private
+         */
+        PlotOptionsController.prototype.updateChildren = function () {
+            var self = this;
+            this.domainObject.useCapability('composition').then(function (children) {
+                self.$scope.children = children;
+                self.composition = self.domainObject.getModel().composition;
+                children.forEach(function (child, index) {
+                    self.configuration.plot.series[index] =
+                        self.configuration.plot.series[index] || {'id': child.getId()};
+                });
+                self.watchSeries();
+            });
+        };
+
+        /**
+         * On changes to the form, update the configuration on the domain
+         * object
+         * @private
+         */
+        PlotOptionsController.prototype.updateConfiguration = function () {
+            var self = this;
+            this.domainObject.useCapability('mutation', function (model) {
+                model.configuration = model.configuration || {};
+                model.configuration.plot = self.configuration.plot;
+            });
+        };
+
+        return PlotOptionsController;
+    }
+);
+

platform/features/plot/src/PlotOptionsForm.js

@@ -0,0 +1,150 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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 () {
+
+        /**
+         * A class for encapsulating structure and behaviour of the plot
+         * options form
+         * @memberOf platform/features/plot
+         * @param topic
+         * @constructor
+         */
+        function PlotOptionsForm() {
+
+            /*
+             Defined below are the form structures for the plot options.
+             */
+            this.xAxisForm = {
+                'name': 'x-axis',
+                'sections': [{
+                    'name': 'x-axis',
+                    'rows': [
+                        {
+                            'name': 'Domain',
+                            'control': 'select',
+                            'key': 'key',
+                            'options': [
+                                {'name': 'SCET', 'value': 'scet'},
+                                {'name': 'SCLK', 'value': 'sclk'},
+                                {'name': 'LST', 'value': 'lst'}
+                            ]
+                        }
+                    ]
+                }]};
+
+            this.yAxisForm = {
+                'name': 'y-axis',
+                'sections': [{
+                    // Will need to be repeated for each y-axis, with a
+                    // distinct name for each. Ideally the name of the axis
+                    // itself.
+                    'name': 'y-axis',
+                    'rows': [
+                    {
+                        'name': 'Range',
+                        'control': 'select',
+                        'key': 'key',
+                        'options': [
+                            {'name': 'EU', 'value': 'eu'},
+                            {'name': 'DN', 'value': 'dn'},
+                            {'name': 'Status', 'value': 'status'}
+                        ]
+                    },
+                    {
+                        'name': 'Autoscale',
+                        'control': 'checkbox',
+                        'key': 'autoscale'
+                    },
+                    {
+                        'name': 'Min',
+                        'control': 'textfield',
+                        'key': 'min',
+                        'pattern': '[0-9]',
+                        'inputsize' : 'sm'
+                    },
+                    {
+                        'name': 'Max',
+                        'control': 'textfield',
+                        'key': 'max',
+                        'pattern': '[0-9]',
+                        'inputsize' : 'sm'
+                    }
+                ]
+                }]
+            };
+            this.plotSeriesForm = {
+                'name': 'Series Options',
+                'sections': [
+                    {
+                        rows: [
+                        {
+                            'name': 'Color',
+                            'control': 'color',
+                            'key': 'color'
+                        }]
+                    },
+                    {
+                        'rows': [
+                            {
+                                'name': 'Markers',
+                                'control': 'checkbox',
+                                'key': 'markers',
+                                'layout': 'control-first'
+                            }
+                        ]
+                    },
+                    {
+                        'rows': [
+                            {
+                                'name': 'No Line',
+                                'control': 'radio',
+                                'key': 'lineType',
+                                'value': 'noLine',
+                                'layout': 'control-first'
+                            },
+                            {
+                                'name': 'Step Line',
+                                'control': 'radio',
+                                'key': 'lineType',
+                                'value': 'stepLine',
+                                'layout': 'control-first'
+                            },
+                            {
+                                'name': 'Linear Line',
+                                'control': 'radio',
+                                'key': 'lineType',
+                                'value': 'linearLine',
+                                'layout': 'control-first'
+                            }
+                        ]
+                    }
+                ]
+            };
+        }
+
+        return PlotOptionsForm;
+    }
+);
+

platform/features/plot/src/SubPlot.js

@@ -0,0 +1,415 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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(
+    [
+        './elements/PlotPosition',
+        './elements/PlotTickGenerator'
+    ],
+    function (PlotPosition, PlotTickGenerator) {
+
+        var DOMAIN_TICKS = 5,
+            RANGE_TICKS = 7;
+
+        /**
+         * A SubPlot is an individual plot within a Plot View (which
+         * may contain multiple plots, specifically when in Stacked
+         * plot mode.)
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {DomainObject[]} telemetryObjects the domain objects
+         *        which will be plotted in this sub-plot
+         * @param {PlotPanZoomStack} panZoomStack the stack of pan-zoom
+         *        states which is applicable to this sub-plot
+         * @param {TelemetryFormatter} telemetryFormatter the telemetry
+         *        formatting service; used to convert domain/range values
+         *        from telemetry data sets to a human-readable form.
+         */
+        function SubPlot(telemetryObjects, panZoomStack, telemetryFormatter) {
+            // We are used from a template often, so maintain
+            // state in local variables to allow for fast look-up,
+            // as is normal for controllers.
+            this.telemetryObjects = telemetryObjects;
+            this.domainTicks = [];
+            this.rangeTicks = [];
+            this.formatter = telemetryFormatter;
+            this.draw = {};
+            this.hovering = false;
+            this.panZoomStack = panZoomStack;
+
+            // Start with the right initial drawing bounds,
+            // tick marks
+            this.updateDrawingBounds();
+            this.updateTicks();
+        }
+
+        /**
+         * Tests whether this subplot has domain data to show for the current pan/zoom level. Absence of domain data
+         * implies that there is no range data displayed either
+         * @returns {boolean} true if domain data exists for the current pan/zoom level
+         */
+        SubPlot.prototype.hasDomainData = function () {
+            return this.panZoomStack &&
+                this.panZoomStack.getDimensions()[0] > 0;
+        };
+
+        // Utility function for filtering out empty strings.
+        function isNonEmpty(v) {
+            return typeof v === 'string' && v !== "";
+        }
+
+        // Converts from pixel coordinates to domain-range,
+        // to interpret mouse gestures.
+        SubPlot.prototype.mousePositionToDomainRange = function (mousePosition) {
+            return new PlotPosition(
+                mousePosition.x,
+                mousePosition.y,
+                mousePosition.width,
+                mousePosition.height,
+                this.panZoomStack
+            ).getPosition();
+        };
+
+        // Utility function to get the mouse position (in x,y
+        // pixel coordinates in the canvas area) from a mouse
+        // event object.
+        SubPlot.prototype.toMousePosition = function ($event) {
+            var bounds = this.subPlotBounds;
+
+            return {
+                x: $event.clientX - bounds.left,
+                y: $event.clientY - bounds.top,
+                width: bounds.width,
+                height: bounds.height
+            };
+        };
+
+        // Convert a domain-range position to a displayable
+        // position. This will subtract the domain offset, which
+        // is used to bias domain values to minimize loss-of-precision
+        // associated with conversion to a 32-bit floating point
+        // format (which is needed in the chart area itself, by WebGL.)
+        SubPlot.prototype.toDisplayable = function (position) {
+            return [position[0] - this.domainOffset, position[1]];
+        };
+
+        // Update the current hover coordinates
+        SubPlot.prototype.updateHoverCoordinates = function () {
+            var formatter = this.formatter;
+
+            // Utility, for map/forEach loops. Index 0 is domain,
+            // index 1 is range.
+            function formatValue(v, i) {
+                return i ?
+                    formatter.formatRangeValue(v) :
+                    formatter.formatDomainValue(v);
+            }
+
+            this.hoverCoordinates = this.mousePosition &&
+                this.mousePositionToDomainRange(this.mousePosition)
+                    .map(formatValue)
+                    .filter(isNonEmpty)
+                    .join(", ");
+        };
+
+        // Update the drawable marquee area to reflect current
+        // mouse position (or don't show it at all, if no marquee
+        // zoom is in progress)
+        SubPlot.prototype.updateMarqueeBox = function () {
+            // Express this as a box in the draw object, which
+            // is passed to an mct-chart in the template for rendering.
+            this.draw.boxes = this.marqueeStart ?
+                [{
+                    start: this.toDisplayable(
+                        this.mousePositionToDomainRange(this.marqueeStart)
+                    ),
+                    end: this.toDisplayable(
+                        this.mousePositionToDomainRange(this.mousePosition)
+                    ),
+                    color: [1, 1, 1, 0.5]
+                }] : undefined;
+        };
+
+        // Update the bounds (origin and dimensions) of the drawing area.
+        SubPlot.prototype.updateDrawingBounds = function () {
+            var panZoom = this.panZoomStack.getPanZoom();
+
+            // Communicate pan-zoom state from stack to the draw object
+            // which is passed to mct-chart in the template.
+            this.draw.dimensions = panZoom.dimensions;
+            this.draw.origin = [
+                panZoom.origin[0] - this.domainOffset,
+                panZoom.origin[1]
+            ];
+        };
+
+        // Update tick marks in scope.
+        SubPlot.prototype.updateTicks = function () {
+            var tickGenerator =
+                new PlotTickGenerator(this.panZoomStack, this.formatter);
+
+            this.domainTicks =
+                tickGenerator.generateDomainTicks(DOMAIN_TICKS);
+            this.rangeTicks =
+                tickGenerator.generateRangeTicks(RANGE_TICKS);
+        };
+
+        SubPlot.prototype.updatePan = function () {
+            var start, current, delta, nextOrigin;
+
+            // Clear the previous panning pan-zoom state
+            this.panZoomStack.popPanZoom();
+
+            // Calculate what the new resulting pan-zoom should be
+            start = this.mousePositionToDomainRange(
+                this.panStart,
+                this.panZoomStack
+            );
+            current = this.mousePositionToDomainRange(
+                this.mousePosition,
+                this.panZoomStack
+            );
+
+            delta = [current[0] - start[0], current[1] - start[1]];
+            nextOrigin = [
+                this.panStartBounds.origin[0] - delta[0],
+                this.panStartBounds.origin[1] - delta[1]
+            ];
+
+            // ...and push a new one at the current mouse position
+            this.panZoomStack
+                .pushPanZoom(nextOrigin, this.panStartBounds.dimensions);
+        };
+
+        /**
+         * Get the set of domain objects which are being
+         * represented in this sub-plot.
+         * @returns {DomainObject[]} the domain objects which
+         *          will have data plotted in this sub-plot
+         */
+        SubPlot.prototype.getTelemetryObjects = function () {
+            return this.telemetryObjects;
+        };
+
+        /**
+         * Get ticks mark information appropriate for using in the
+         * template for this sub-plot's domain axis, as prepared
+         * by the PlotTickGenerator.
+         * @returns {Array} tick marks for the domain axis
+         */
+        SubPlot.prototype.getDomainTicks = function () {
+            return this.domainTicks;
+        };
+
+        /**
+         * Get ticks mark information appropriate for using in the
+         * template for this sub-plot's range axis, as prepared
+         * by the PlotTickGenerator.
+         * @returns {Array} tick marks for the range axis
+         */
+        SubPlot.prototype.getRangeTicks = function () {
+            return this.rangeTicks;
+        };
+
+        /**
+         * Get the drawing object associated with this sub-plot;
+         * this object will be passed to the mct-chart in which
+         * this sub-plot's lines will be plotted, as its "draw"
+         * attribute, and should have the same internal format
+         * expected by that directive.
+         * @return {object} the drawing object
+         */
+        SubPlot.prototype.getDrawingObject = function () {
+            return this.draw;
+        };
+
+        /**
+         * Get the coordinates (as displayable text) for the
+         * current mouse position.
+         * @returns {string[]} the displayable domain and range
+         *          coordinates over which the mouse is hovered
+         */
+        SubPlot.prototype.getHoverCoordinates = function () {
+            return this.hoverCoordinates;
+        };
+
+        /**
+         * Handle mouse movement over the chart area.
+         * @param $event the mouse event
+         * @memberof platform/features/plot.SubPlot#
+         */
+        SubPlot.prototype.hover = function ($event) {
+            this.hovering = true;
+            this.subPlotBounds = $event.target.getBoundingClientRect();
+            this.mousePosition = this.toMousePosition($event);
+            //If there is a domain to display, show hover coordinates, otherwise hover coordinates are meaningless
+            if (this.hasDomainData()) {
+                this.updateHoverCoordinates();
+            }
+            if (this.marqueeStart) {
+                this.updateMarqueeBox();
+            }
+            if (this.panStart) {
+                this.updatePan();
+                this.updateDrawingBounds();
+                this.updateTicks();
+            }
+        };
+
+        /**
+         * Continue a previously-start pan or zoom gesture.
+         * @param $event the mouse event
+         * @memberof platform/features/plot.SubPlot#
+         */
+        SubPlot.prototype.continueDrag = function ($event) {
+            this.mousePosition = this.toMousePosition($event);
+            if (this.marqueeStart) {
+                this.updateMarqueeBox();
+            }
+            if (this.panStart) {
+                this.updatePan();
+                this.updateDrawingBounds();
+                this.updateTicks();
+            }
+        };
+
+        /**
+         * Initiate a marquee zoom action.
+         * @param $event the mouse event
+         */
+        SubPlot.prototype.startDrag = function ($event) {
+            this.subPlotBounds = $event.target.getBoundingClientRect();
+            this.mousePosition = this.toMousePosition($event);
+            // Treat any modifier key as a pan
+            if ($event.altKey || $event.shiftKey || $event.ctrlKey) {
+                // Start panning
+                this.panStart = this.mousePosition;
+                this.panStartBounds = this.panZoomStack.getPanZoom();
+                // We're starting a pan, so add this back as a
+                // state on the stack; it will get replaced
+                // during the pan.
+                this.panZoomStack.pushPanZoom(
+                    this.panStartBounds.origin,
+                    this.panStartBounds.dimensions
+                );
+                $event.preventDefault();
+            } else {
+                // Start marquee zooming
+                this.marqueeStart = this.mousePosition;
+                this.updateMarqueeBox();
+            }
+        };
+
+        /**
+         * Complete a marquee zoom action.
+         * @param $event the mouse event
+         */
+        SubPlot.prototype.endDrag = function ($event) {
+            var self = this;
+
+            // Perform a marquee zoom.
+            function marqueeZoom(start, end) {
+                // Determine what boundary is described by the marquee,
+                // in domain-range values. Use the minima for origin, so that
+                // it doesn't matter what direction the user marqueed in.
+                var a = self.mousePositionToDomainRange(start),
+                    b = self.mousePositionToDomainRange(end),
+                    origin = [
+                        Math.min(a[0], b[0]),
+                        Math.min(a[1], b[1])
+                    ],
+                    dimensions = [
+                        Math.max(a[0], b[0]) - origin[0],
+                        Math.max(a[1], b[1]) - origin[1]
+                    ];
+
+                // Proceed with zoom if zoom dimensions are non zeros
+                if (!(dimensions[0] === 0 && dimensions[1] === 0)) {
+                    // Push the new state onto the pan-zoom stack
+                    self.panZoomStack.pushPanZoom(origin, dimensions);
+
+                    // Make sure tick marks reflect new bounds
+                    self.updateTicks();
+                }
+            }
+
+            this.mousePosition = this.toMousePosition($event);
+            this.subPlotBounds = undefined;
+            if (this.marqueeStart) {
+                marqueeZoom(this.marqueeStart, this.mousePosition);
+                this.marqueeStart = undefined;
+                this.updateMarqueeBox();
+                this.updateDrawingBounds();
+                this.updateTicks();
+            }
+            if (this.panStart) {
+                // End panning
+                this.panStart = undefined;
+                this.panStartBounds = undefined;
+            }
+        };
+
+        /**
+         * Update the drawing bounds, marquee box, and
+         * tick marks for this subplot.
+         */
+        SubPlot.prototype.update = function () {
+            this.updateDrawingBounds();
+            this.updateMarqueeBox();
+            this.updateTicks();
+        };
+
+        /**
+         * Set the domain offset associated with this sub-plot.
+         * A domain offset is subtracted from all domain
+         * before lines are drawn to avoid artifacts associated
+         * with the use of 32-bit floats when domain values
+         * are often timestamps (due to insufficient precision.)
+         * A SubPlot will be drawing boxes (for marquee zoom) in
+         * the same offset coordinate space, so it needs to know
+         * the value of this to position that marquee box
+         * correctly.
+         * @param {number} value the domain offset
+         */
+        SubPlot.prototype.setDomainOffset = function (value) {
+            this.domainOffset = value;
+        };
+
+        /**
+         * When used with no argument, check whether or not the user
+         * is currently hovering over this subplot. When used with
+         * an argument, set that state.
+         * @param {boolean} [state] the new hovering state
+         * @returns {boolean} the hovering state
+         */
+        SubPlot.prototype.isHovering = function (state) {
+            if (state !== undefined) {
+                this.hovering = state;
+            }
+            return this.hovering;
+        };
+
+        return SubPlot;
+
+    }
+);
+

platform/features/plot/src/SubPlotFactory.js

@@ -21,39 +21,39 @@
  *****************************************************************************/
 
 define(
-    [],
-    function () {
+    ["./SubPlot"],
+    function (SubPlot) {
 
         /**
-         * Controller for the bottombar template. Exposes
-         * available indicators (of extension category "indicators")
-         * @memberof platform/commonUI/general
+         * Utility factory; wraps the SubPlot constructor and adds
+         * in a reference to the telemetryFormatter, which will be
+         * used to represent telemetry values (timestamps or data
+         * values) as human-readable strings.
+         * @memberof platform/features/plot
          * @constructor
          */
-        function BottomBarController(indicators) {
-            // Utility function used to make indicators presentable
-            // for display.
-            function present(Indicator) {
-                return {
-                    template: Indicator.template || "indicator",
-                    ngModel: typeof Indicator === 'function' ?
-                            new Indicator() : Indicator
-                };
-            }
-
-            this.indicators = indicators.map(present);
+        function SubPlotFactory(telemetryFormatter) {
+            this.telemetryFormatter = telemetryFormatter;
         }
 
         /**
-         * Get all indicators to display.
-         * @returns {Indicator[]} all indicators
-         *          to display in the bottom bar.
-         * @memberof platform/commonUI/general.BottomBarController#
+         * Instantiate a new sub-plot.
+         * @param {DomainObject[]} telemetryObjects the domain objects
+         *        which will be plotted in this sub-plot
+         * @param {PlotPanZoomStack} panZoomStack the stack of pan-zoom
+         *        states which is applicable to this sub-plot
+         * @returns {SubPlot} the instantiated sub-plot
+         * @method
          */
-        BottomBarController.prototype.getIndicators = function () {
-            return this.indicators;
+        SubPlotFactory.prototype.createSubPlot = function (telemetryObjects, panZoomStack) {
+            return new SubPlot(
+                telemetryObjects,
+                panZoomStack,
+                this.telemetryFormatter
+            );
         };
 
-        return BottomBarController;
+        return SubPlotFactory;
+
     }
 );

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

@@ -0,0 +1,134 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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 () {
+
+        /**
+         * A PlotAxis provides a template-ready set of options
+         * for the domain or range axis, sufficient to populate
+         * selectors.
+         *
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {string} axisType the field in metadatas to
+         *        look at for axis options; usually one of
+         *        "domains" or "ranges"
+         * @param {object[]} metadatas metadata objects, as
+         *        returned by the `getMetadata()` method of
+         *        a `telemetry` capability.
+         * @param {object} defaultValue the value to use for the
+         *        active state in the event that no options are
+         *        found; should contain "name" and "key" at
+         *        minimum.
+         *
+         */
+        function PlotAxis(axisType, metadatas, defaultValue) {
+            this.axisType = axisType;
+            this.defaultValue = defaultValue;
+            this.optionKeys = {};
+
+            /**
+             * The currently chosen option for this axis. An
+             * initial value is provided; this will be updated
+             * directly form the plot template.
+             * @memberof platform/features/plot.PlotAxis#
+             */
+            this.active = defaultValue;
+
+            /**
+             * The set of options applicable for this axis;
+             * an array of objects, where each object contains a
+             * "key" field and a "name" field (for machine- and
+             * human-readable names respectively)
+             * @memberof platform/features/plot.PlotAxis#
+             */
+            this.options = [];
+
+            // Initialize options from metadata objects
+            this.updateMetadata(metadatas);
+        }
+
+
+        /**
+         * Update axis options to reflect current metadata.
+         * @param {TelemetryMetadata[]} metadata objects describing
+         *        applicable telemetry
+         */
+        PlotAxis.prototype.updateMetadata = function (metadatas) {
+            var axisType = this.axisType,
+                optionKeys = this.optionKeys,
+                newOptions = {},
+                toAdd = [];
+
+            function isValid(option) {
+                return option && optionKeys[option.key];
+            }
+
+            metadatas.forEach(function (m) {
+                (m[axisType] || []).forEach(function (option) {
+                    var key = option.key;
+                    if (!optionKeys[key] && !newOptions[key]) {
+                        toAdd.push(option);
+                    }
+                    newOptions[key] = true;
+                });
+            });
+
+            optionKeys = this.optionKeys = newOptions;
+
+            // General approach here is to avoid changing object
+            // instances unless something has really changed, since
+            // Angular is watching; don't want to trigger extra digests.
+            if (!this.options.every(isValid)) {
+                this.options = this.options.filter(isValid);
+            }
+
+            if (toAdd.length > 0) {
+                this.options = this.options.concat(toAdd);
+            }
+
+            if (!isValid(this.active)) {
+                this.active = this.options[0] || this.defaultValue;
+            }
+        };
+
+        /**
+         * Change the domain/range selection for this axis. If the
+         * provided `key` is not recognized as an option, no change
+         * will occur.
+         * @param {string} key the identifier for the domain/range
+         */
+        PlotAxis.prototype.chooseOption = function (key) {
+            var self = this;
+            this.options.forEach(function (option) {
+                if (option.key === key) {
+                    self.active = option;
+                }
+            });
+        };
+
+        return PlotAxis;
+
+    }
+);

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

@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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 () {
+
+        /**
+         * Tracks the limit state of telemetry objects being plotted.
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {platform/telemetry.TelemetryHandle} handle the handle
+         *        to telemetry access
+         * @param {string} range the key to use when looking up range values
+         */
+        function PlotLimitTracker(handle, range) {
+            this.handle = handle;
+            this.range = range;
+            this.legendClasses = {};
+        }
+
+        /**
+         * Update limit states to reflect the latest data.
+         */
+        PlotLimitTracker.prototype.update = function () {
+            var legendClasses = {},
+                range = this.range,
+                handle = this.handle;
+
+            function updateLimit(telemetryObject) {
+                var limit = telemetryObject.getCapability('limit'),
+                    datum = handle.getDatum(telemetryObject);
+
+                if (limit && datum) {
+                    legendClasses[telemetryObject.getId()] =
+                        (limit.evaluate(datum, range) || {}).cssClass;
+                }
+            }
+
+            handle.getTelemetryObjects().forEach(updateLimit);
+
+            this.legendClasses = legendClasses;
+        };
+
+        /**
+         * Get the CSS class associated with any limit violations for this
+         * telemetry object.
+         * @param {DomainObject} domainObject the telemetry object to check
+         * @returns {string} the CSS class name, if any
+         */
+        PlotLimitTracker.prototype.getLegendClass = function (domainObject) {
+            var id = domainObject && domainObject.getId();
+            return id && this.legendClasses[id];
+        };
+
+        return PlotLimitTracker;
+
+    }
+);

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

@@ -0,0 +1,118 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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(
+    ['./PlotSeriesWindow'],
+    function (PlotSeriesWindow) {
+
+
+        /**
+         * Represents a single line or trace of a plot.
+         * @param {{PlotLineBuffer}} buffer the plot buffer
+         * @constructor
+         */
+        function PlotLine(buffer) {
+            this.buffer = buffer;
+        }
+
+        /**
+         * Add a point to this plot line.
+         * @param {number} domainValue the domain value
+         * @param {number} rangeValue the range value
+         */
+        PlotLine.prototype.addPoint = function (domainValue, rangeValue) {
+            var buffer = this.buffer,
+                index;
+
+            // Make sure we got real/useful values here...
+            if (domainValue !== undefined && rangeValue !== undefined) {
+                index = buffer.findInsertionIndex(domainValue);
+
+                // Already in the buffer? Skip insertion
+                if (index < 0) {
+                    return;
+                }
+
+                // Insert the point
+                if (!buffer.insertPoint(domainValue, rangeValue, index)) {
+                    // If insertion failed, trim from the beginning...
+                    buffer.trim(1);
+                    // ...and try again.
+                    buffer.insertPoint(domainValue, rangeValue, index);
+                }
+            }
+        };
+
+        /**
+         * Add a series of telemetry data to this plot line.
+         * @param {TelemetrySeries} series the data series
+         * @param {string} [domain] the key indicating which domain
+         *        to use when looking up data from this series
+         * @param {string} [range] the key indicating which range
+         *        to use when looking up data from this series
+         */
+        PlotLine.prototype.addSeries = function (series, domain, range) {
+            var buffer = this.buffer;
+
+            // Insert a time-windowed data series into the buffer
+            function insertSeriesWindow(seriesWindow) {
+                var count = seriesWindow.getPointCount();
+
+                function doInsert() {
+                    var firstTimestamp = seriesWindow.getDomainValue(0),
+                        lastTimestamp = seriesWindow.getDomainValue(count - 1),
+                        startIndex = buffer.findInsertionIndex(firstTimestamp),
+                        endIndex = buffer.findInsertionIndex(lastTimestamp);
+
+                    // Does the whole series fit in between two adjacent indexes?
+                    if ((startIndex === endIndex) && startIndex > -1) {
+                        // Insert it in between
+                        buffer.insert(seriesWindow, startIndex);
+                    } else {
+                        // Split it up, and add the two halves
+                        seriesWindow.split().forEach(insertSeriesWindow);
+                    }
+                }
+
+                // Only insert if there are points to insert
+                if (count > 0) {
+                    doInsert();
+                }
+            }
+
+            // Should try to add via insertion if a
+            // clear insertion point is available;
+            // if not, should split and add each half.
+            // Insertion operation also needs to factor out
+            // redundant timestamps, for overlapping data
+            insertSeriesWindow(new PlotSeriesWindow(
+                series,
+                domain,
+                range,
+                0,
+                series.getPointCount()
+            ));
+        };
+
+        return PlotLine;
+    }
+);

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

@@ -0,0 +1,268 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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 () {
+
+        /**
+         * Contains the buffer used to draw a plot.
+         * @param {number} domainOffset number to subtract from domain values
+         * @param {number} initialSize initial buffer size
+         * @param {number} maxSize maximum buffer size
+         * @memberof platform/features/plot
+         * @constructor
+         */
+        function PlotLineBuffer(domainOffset, initialSize, maxSize) {
+            this.buffer = new Float32Array(initialSize * 2);
+            this.rangeExtrema =
+                [Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY];
+            this.length = 0;
+            this.domainOffset = domainOffset;
+            this.initialSize = initialSize;
+            this.maxSize = maxSize;
+        }
+
+        // Binary search for an insertion index
+        PlotLineBuffer.prototype.binSearch = function (value, min, max) {
+            var mid = Math.floor((min + max) / 2),
+                found = this.buffer[mid * 2];
+
+            // On collisions, insert at same index
+            if (found === value) {
+                return mid;
+            }
+
+            // Otherwise, if we're down to a single index,
+            // we've found our insertion point
+            if (min >= max) {
+                // Compare the found timestamp with the search
+                // value to decide if we'll insert after or before.
+                return min + ((found < value) ? 1 : 0);
+            }
+
+            // Finally, do the recursive step
+            if (found < value) {
+                return this.binSearch(value, mid + 1, max);
+            } else {
+                return this.binSearch(value, min, mid - 1);
+            }
+        };
+
+        // Increase the size of the buffer
+        PlotLineBuffer.prototype.doubleBufferSize = function () {
+            var sz = Math.min(this.maxSize * 2, this.buffer.length * 2),
+                canDouble = sz > this.buffer.length,
+                doubled = canDouble && new Float32Array(sz);
+
+            if (canDouble) {
+                doubled.set(this.buffer); // Copy contents of original
+                this.buffer = doubled;
+            }
+
+            return canDouble;
+        };
+
+        // Decrease the size of the buffer
+        PlotLineBuffer.prototype.halveBufferSize = function () {
+            var sz = Math.max(this.initialSize * 2, this.buffer.length / 2),
+                canHalve = sz < this.buffer.length;
+
+            if (canHalve) {
+                this.buffer = new Float32Array(this.buffer.subarray(0, sz));
+            }
+
+            return canHalve;
+        };
+
+        // Set a value in the buffer
+        PlotLineBuffer.prototype.setValue = function (index, domainValue, rangeValue) {
+            this.buffer[index * 2] = domainValue - this.domainOffset;
+            this.buffer[index * 2 + 1] = rangeValue;
+            // Track min/max of range values (min/max for
+            // domain values can be read directly from buffer)
+            this.rangeExtrema[0] = Math.min(this.rangeExtrema[0], rangeValue);
+            this.rangeExtrema[1] = Math.max(this.rangeExtrema[1], rangeValue);
+        };
+
+        /**
+         * Get the WebGL-displayable buffer of points to plot.
+         * @returns {Float32Array} displayable buffer for this line
+         */
+        PlotLineBuffer.prototype.getBuffer = function () {
+            return this.buffer;
+        };
+
+        /**
+         * Get the number of points stored in this buffer.
+         * @returns {number} the number of points stored
+         */
+        PlotLineBuffer.prototype.getLength = function () {
+            return this.length;
+        };
+
+        /**
+         * Get the min/max range values that are currently in this
+         * buffer. Unlike range extrema, these will change as the
+         * buffer gets trimmed.
+         * @returns {number[]} min, max domain values
+         */
+        PlotLineBuffer.prototype.getDomainExtrema = function () {
+            // Since these are ordered in the buffer, assume
+            // these are the values at the first and last index
+            return [
+                this.buffer[0] + this.domainOffset,
+                this.buffer[this.length * 2 - 2] + this.domainOffset
+            ];
+        };
+
+        /**
+         * Get the min/max range values that have been observed for this
+         * buffer. Note that these values may have been trimmed out at
+         * some point.
+         * @returns {number[]} min, max range values
+         */
+        PlotLineBuffer.prototype.getRangeExtrema = function () {
+            return this.rangeExtrema;
+        };
+
+        /**
+         * Remove values from this buffer.
+         * Normally, values are removed from the start
+         * of the buffer; a truthy value in the second argument
+         * will cause values to be removed from the end.
+         * @param {number} count number of values to remove
+         * @param {boolean} [fromEnd] true if the most recent
+         *        values should be removed
+         */
+        PlotLineBuffer.prototype.trim = function (count, fromEnd) {
+            // If we're removing values from the start...
+            if (!fromEnd) {
+                // ...do so by shifting buffer contents over
+                this.buffer.set(this.buffer.subarray(2 * count));
+            }
+            // Reduce used buffer size accordingly
+            this.length -= count;
+            // Finally, if less than half of the buffer is being
+            // used, free up some memory.
+            if (this.length < this.buffer.length / 4) {
+                this.halveBufferSize();
+            }
+        };
+
+        /**
+         * Insert data from the provided series at the specified
+         * index. If this would exceed the buffer's maximum capacity,
+         * this operation fails and the buffer is unchanged.
+         * @param {TelemetrySeries} series the series to insert
+         * @param {number} index the index at which to insert this
+         *        series
+         * @returns {boolean} true if insertion succeeded; otherwise
+         *          false
+         */
+        PlotLineBuffer.prototype.insert = function (series, index) {
+            var sz = series.getPointCount(),
+                i;
+
+            // Don't allow append after the end; that doesn't make sense
+            index = Math.min(index, this.length);
+
+            // Resize if necessary
+            while (sz > ((this.buffer.length / 2) - this.length)) {
+                if (!this.doubleBufferSize()) {
+                    // Can't make room for this, insertion fails
+                    return false;
+                }
+            }
+
+            // Shift data over if necessary
+            if (index < this.length) {
+                this.buffer.set(
+                    this.buffer.subarray(index * 2, this.length * 2),
+                    (index + sz) * 2
+                );
+            }
+
+            // Insert data into the set
+            for (i = 0; i < sz; i += 1) {
+                this.setValue(
+                    i + index,
+                    series.getDomainValue(i),
+                    series.getRangeValue(i)
+                );
+            }
+
+            // Increase the length
+            this.length += sz;
+
+            // Indicate that insertion was successful
+            return true;
+        };
+
+        /**
+         * Append a single data point.
+         * @memberof platform/features/plot.PlotLineBuffer#
+         */
+        PlotLineBuffer.prototype.insertPoint = function (domainValue, rangeValue) {
+            // Ensure there is space for this point
+            if (this.length >= (this.buffer.length / 2)) {
+                if (!this.doubleBufferSize()) {
+                    return false;
+                }
+            }
+
+            // Put the data in the buffer
+            this.setValue(this.length, domainValue, rangeValue);
+
+            // Update length
+            this.length += 1;
+
+            // Indicate that this was successful
+            return true;
+        };
+
+        /**
+         * Find an index for inserting data with this
+         * timestamp. The second argument indicates whether
+         * we are searching for insert-before or insert-after
+         * positions.
+         * Timestamps are meant to be unique, so if a collision
+         * occurs, this will return -1.
+         * @param {number} timestamp timestamp to insert
+         * @returns {number} the index for insertion (or -1)
+         */
+        PlotLineBuffer.prototype.findInsertionIndex = function (timestamp) {
+            var value = timestamp - this.domainOffset;
+
+            // Handle empty buffer case and check for an
+            // append opportunity (which is most common case for
+            // real-time data so is optimized-for) before falling
+            // back to a binary search for the insertion point.
+            return (this.length < 1) ? 0 :
+                (value > this.buffer[this.length * 2 - 2]) ? this.length :
+                    this.binSearch(value, 0, this.length - 1);
+        };
+
+        return PlotLineBuffer;
+    }
+);
+

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

@@ -0,0 +1,133 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+
+/**
+ * Plot palette. Defines colors for various plot lines.
+ */
+define(
+    function () {
+
+        // Prepare different forms of the palette, since we wish to
+        // describe colors in several ways (as RGB 0-255, as
+        // RGB 0.0-1.0, or as stylesheet-appropriate #-prefixed colors).
+        var integerPalette = [
+            [0x20, 0xB2, 0xAA],
+            [0x9A, 0xCD, 0x32],
+            [0xFF, 0x8C, 0x00],
+            [0xD2, 0xB4, 0x8C],
+            [0x40, 0xE0, 0xD0],
+            [0x41, 0x69, 0xFF],
+            [0xFF, 0xD7, 0x00],
+            [0x6A, 0x5A, 0xCD],
+            [0xEE, 0x82, 0xEE],
+            [0xCC, 0x99, 0x66],
+            [0x99, 0xCC, 0xCC],
+            [0x66, 0xCC, 0x33],
+            [0xFF, 0xCC, 0x00],
+            [0xFF, 0x66, 0x33],
+            [0xCC, 0x66, 0xFF],
+            [0xFF, 0x00, 0x66],
+            [0xFF, 0xFF, 0x00],
+            [0x80, 0x00, 0x80],
+            [0x00, 0x86, 0x8B],
+            [0x00, 0x8A, 0x00],
+            [0xFF, 0x00, 0x00],
+            [0x00, 0x00, 0xFF],
+            [0xF5, 0xDE, 0xB3],
+            [0xBC, 0x8F, 0x8F],
+            [0x46, 0x82, 0xB4],
+            [0xFF, 0xAF, 0xAF],
+            [0x43, 0xCD, 0x80],
+            [0xCD, 0xC1, 0xC5],
+            [0xA0, 0x52, 0x2D],
+            [0x64, 0x95, 0xED]
+        ], stringPalette = integerPalette.map(function (arr) {
+            // Convert to # notation for use in styles
+            return '#' + arr.map(function (c) {
+                return (c < 16 ? '0' : '') + c.toString(16);
+            }).join('');
+        }), floatPalette = integerPalette.map(function (arr) {
+            return arr.map(function (c) {
+                return c / 255.0;
+            }).concat([1]); // RGBA
+        });
+
+        /**
+         * PlotPalette allows a consistent set of colors to be retrieved
+         * by index, in various color formats. All PlotPalette methods are
+         * static, so there is no need for a constructor call; using
+         * this will simply return PlotPalette itself.
+         * @memberof platform/features/plot
+         * @constructor
+         */
+        function PlotPalette() {
+            return PlotPalette;
+        }
+
+        /**
+         * Look up a color in the plot's palette, by index.
+         * This will be returned as a three element array of RGB
+         * values, as integers in the range of 0-255.
+         * @param {number} i the index of the color to look up
+         * @return {number[]} the color, as integer RGB values
+         */
+        PlotPalette.getIntegerColor = function (i) {
+            return integerPalette[Math.floor(i) % integerPalette.length];
+        };
+
+
+        /**
+         * Look up a color in the plot's palette, by index.
+         * This will be returned as a three element array of RGB
+         * values, in the range of 0.0-1.0.
+         *
+         * This format is present specifically to support use with
+         * WebGL, which expects colors of that form.
+         *
+         * @param {number} i the index of the color to look up
+         * @return {number[]} the color, as floating-point RGB values
+         */
+        PlotPalette.getFloatColor = function (i) {
+            return floatPalette[Math.floor(i) % floatPalette.length];
+        };
+
+
+        /**
+         * Look up a color in the plot's palette, by index.
+         * This will be returned as a string using #-prefixed
+         * six-digit RGB hex notation (e.g. #FF0000)
+         * See http://www.w3.org/TR/css3-color/#rgb-color.
+         *
+         * This format is useful for representing colors in in-line
+         * styles.
+         *
+         * @param {number} i the index of the color to look up
+         * @return {string} the color, as a style-friendly string
+         */
+        PlotPalette.getStringColor = function (i) {
+            return stringPalette[Math.floor(i) % stringPalette.length];
+        };
+
+        return PlotPalette;
+
+    }
+);

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

@@ -0,0 +1,141 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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 () {
+
+        /**
+         * The PlotPanZoomStack is responsible for maintaining the
+         * pan-zoom state of a plot (expressed as a boundary starting
+         * at an origin and extending to certain dimensions) in a
+         * stack, to support the back and unzoom buttons in plot controls.
+         *
+         * Dimensions and origins are here described each by two-element
+         * arrays, where the first element describes a value or quantity
+         * along the domain axis, and the second element describes the same
+         * along the range axis.
+         *
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {number[]} origin the plot's origin, initially
+         * @param {number[]} dimensions the plot's dimensions, initially
+         */
+        function PlotPanZoomStack(origin, dimensions) {
+            // Use constructor parameters as the stack's initial state
+            this.stack = [{ origin: origin, dimensions: dimensions }];
+        }
+
+        // Various functions which follow are simply wrappers for
+        // normal stack-like array methods, with the exception that
+        // they prevent undesired modification and enforce that this
+        // stack must remain non-empty.
+        // See JSDoc for specific methods below for more detail.
+
+        /**
+         * Get the current stack depth; that is, the number
+         * of items on the stack. A depth of one means that no
+         * panning or zooming relative to the base value has
+         * been applied.
+         * @returns {number} the depth of the stack
+         */
+        PlotPanZoomStack.prototype.getDepth = function getDepth() {
+            return this.stack.length;
+        };
+
+        /**
+         * Push a new pan-zoom state onto the stack; this will
+         * become the active pan-zoom state.
+         * @param {number[]} origin the new origin
+         * @param {number[]} dimensions the new dimensions
+         */
+        PlotPanZoomStack.prototype.pushPanZoom = function (origin, dimensions) {
+            this.stack.push({ origin: origin, dimensions: dimensions });
+        };
+
+        /**
+         * Pop a pan-zoom state from the stack. Whatever pan-zoom
+         * state was previously present will become current.
+         * If called when there is only one pan-zoom state on the
+         * stack, this acts as a no-op (that is, the lowest
+         * pan-zoom state on the stack cannot be popped, to ensure
+         * that some pan-zoom state is always available.)
+         */
+        PlotPanZoomStack.prototype.popPanZoom = function popPanZoom() {
+            if (this.stack.length > 1) {
+                this.stack.pop();
+            }
+        };
+
+        /**
+         * Set the base pan-zoom state; that is, the state at the
+         * bottom of the stack. This allows the "unzoomed" state of
+         * a plot to be updated (e.g. as new data comes in) without
+         * interfering with the user's chosen zoom level.
+         * @param {number[]} origin the base origin
+         * @param {number[]} dimensions the base dimensions
+         * @memberof platform/features/plot.PlotPanZoomStack#
+         */
+        PlotPanZoomStack.prototype.setBasePanZoom = function (origin, dimensions) {
+            this.stack[0] = { origin: origin, dimensions: dimensions };
+        };
+
+        /**
+         * Clear the pan-zoom stack down to its bottom element;
+         * in effect, pop all elements but the last, e.g. to remove
+         * any temporary user modifications to pan-zoom state.
+         */
+        PlotPanZoomStack.prototype.clearPanZoom = function clearPanZoom() {
+            this.stack = [this.stack[0]];
+        };
+
+        /**
+         * Get the current pan-zoom state (the state at the top
+         * of the stack), expressed as an object with "origin" and
+         * "dimensions" fields.
+         * @returns {object} the current pan-zoom state
+         */
+        PlotPanZoomStack.prototype.getPanZoom = function getPanZoom() {
+            return this.stack[this.stack.length - 1];
+        };
+
+        /**
+         * Get the current origin, as represented on the top of the
+         * stack.
+         * @returns {number[]} the current plot origin
+         */
+        PlotPanZoomStack.prototype.getOrigin = function getOrigin() {
+            return this.getPanZoom().origin;
+        };
+
+        /**
+         * Get the current dimensions, as represented on the top of
+         * the stack.
+         * @returns {number[]} the current plot dimensions
+         */
+        PlotPanZoomStack.prototype.getDimensions = function getDimensions() {
+            return this.getPanZoom().dimensions;
+        };
+
+        return PlotPanZoomStack;
+    }
+);

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

@@ -0,0 +1,167 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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(
+    ['./PlotPanZoomStack'],
+    function (PlotPanZoomStack) {
+
+        /**
+         * A plot pan zoom stack group provides a collection of individual
+         * pan-zoom stacks that synchronize upon the domain axis, but
+         * remain independent upon the range axis. This supports panning
+         * and zooming in stacked-plot mode (and, importantly,
+         * stepping back through those states.)
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {number} count the number of stacks to include in this
+         *        group
+         */
+        function PlotPanZoomStackGroup(count) {
+            var self = this;
+
+            // Push a pan-zoom state; the index argument identifies
+            // which stack originated the request (all other stacks
+            // will ignore the range part of the change.)
+            function pushPanZoom(origin, dimensions, index) {
+                self.stacks.forEach(function (stack, i) {
+                    if (i === index) {
+                        // Do a normal push for the specified stack
+                        stack.pushPanZoom(origin, dimensions);
+                    } else {
+                        // For other stacks, do a push, but repeat
+                        // their current range axis bounds.
+                        stack.pushPanZoom(
+                            [origin[0], stack.getOrigin()[1]],
+                            [dimensions[0], stack.getDimensions()[1]]
+                        );
+                    }
+                });
+            }
+
+
+            // Decorate a pan-zoom stack; returns an object with
+            // the same interface, but whose stack-mutation methods
+            // effect all items in the group.
+            function decorateStack(stack, index) {
+                var result = Object.create(stack);
+
+                // Use the methods defined above
+                result.pushPanZoom = function (origin, dimensions) {
+                    pushPanZoom(origin, dimensions, index);
+                };
+                result.setBasePanZoom = function () {
+                    self.setBasePanZoom.apply(self, arguments);
+                };
+                result.popPanZoom = function () {
+                    self.popPanZoom.apply(self, arguments);
+                };
+                result.clearPanZoom = function () {
+                    self.clearPanZoom.apply(self, arguments);
+                };
+
+                return result;
+            }
+
+            // Create the stacks in this group ...
+            this.stacks = [];
+            while (this.stacks.length < count) {
+                this.stacks.push(new PlotPanZoomStack([], []));
+            }
+            // ... and their decorated-to-synchronize versions.
+            this.decoratedStacks = this.stacks.map(decorateStack);
+        }
+
+        /**
+         * Pop a pan-zoom state from all stacks in the group.
+         * If called when there is only one pan-zoom state on each
+         * stack, this acts as a no-op (that is, the lowest
+         * pan-zoom state on the stack cannot be popped, to ensure
+         * that some pan-zoom state is always available.)
+         */
+        PlotPanZoomStackGroup.prototype.popPanZoom = function () {
+            this.stacks.forEach(function (stack) {
+                stack.popPanZoom();
+            });
+        };
+
+        /**
+         * Set the base pan-zoom state for all stacks in this group.
+         * This changes the state at the bottom of each stack.
+         * This allows the "unzoomed" state of plots to be updated
+         * (e.g. as new data comes in) without
+         * interfering with the user's chosen pan/zoom states.
+         * @param {number[]} origin the base origin
+         * @param {number[]} dimensions the base dimensions
+         */
+        PlotPanZoomStackGroup.prototype.setBasePanZoom = function (origin, dimensions) {
+            this.stacks.forEach(function (stack) {
+                stack.setBasePanZoom(origin, dimensions);
+            });
+        };
+
+        /**
+         * Clear all pan-zoom stacks in this group down to
+         * their bottom element; in effect, pop all elements
+         * but the last, e.g. to remove any temporary user
+         * modifications to pan-zoom state.
+         */
+        PlotPanZoomStackGroup.prototype.clearPanZoom = function () {
+            this.stacks.forEach(function (stack) {
+                stack.clearPanZoom();
+            });
+        };
+
+        /**
+         * Get the current stack depth; that is, the number
+         * of items on each stack in the group.
+         * A depth of one means that no
+         * panning or zooming relative to the base value has
+         * been applied.
+         * @returns {number} the depth of the stacks in this group
+         */
+        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;
+        };
+
+        /**
+         * Get a specific pan-zoom stack in this group.
+         * Stacks are specified by index; this index must be less
+         * than the count provided at construction time, and must
+         * not be less than zero.
+         * The stack returned by this function will be synchronized
+         * to other stacks in this group; that is, mutating that
+         * stack directly will result in other stacks in this group
+         * undergoing similar updates to ensure that domain bounds
+         * remain the same.
+         * @param {number} index the index of the stack to get
+         * @returns {PlotPanZoomStack} the pan-zoom stack in the
+         *          group identified by that index
+         */
+        PlotPanZoomStackGroup.prototype.getPanZoomStack = function (index) {
+            return this.decoratedStacks[index];
+        };
+
+        return PlotPanZoomStackGroup;
+    }
+);

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

@@ -0,0 +1,95 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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 () {
+
+        /**
+         * A PlotPosition converts from pixel coordinates to domain-range
+         * coordinates, based on the current plot boundary as described on
+         * the pan-zoom stack.
+         *
+         * These coordinates are not updated after construction; that is,
+         * they represent the result of the conversion at the time the
+         * PlotPosition was instantiated. Care should be taken when retaining
+         * PlotPosition objects across changes to the pan-zoom stack.
+         *
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {number} x the horizontal pixel position in the plot area
+         * @param {number} y the vertical pixel position in the plot area
+         * @param {number} width the width of the plot area
+         * @param {number} height the height of the plot area
+         * @param {PanZoomStack} panZoomStack the applicable pan-zoom stack,
+         *        used to determine the plot's domain-range boundaries.
+         */
+        function PlotPosition(x, y, width, height, panZoomStack) {
+            var panZoom = panZoomStack.getPanZoom(),
+                origin = panZoom.origin,
+                dimensions = panZoom.dimensions;
+
+            function convert(v, i) {
+                return v * dimensions[i] + origin[i];
+            }
+
+            if (!dimensions || !origin) {
+                // We need both dimensions and origin to compute a position
+                this.position = [];
+            } else {
+                // Convert from pixel to domain-range space.
+                // Note that range is reversed from the y-axis in pixel space
+                //(positive range points up, positive pixel-y points down)
+                this.position =
+                    [x / width, (height - y) / height].map(convert);
+            }
+        }
+
+        /**
+         * Get the domain value corresponding to this pixel position.
+         * @returns {number} the domain value
+         */
+        PlotPosition.prototype.getDomain = function () {
+            return this.position[0];
+        };
+
+        /**
+         * Get the range value corresponding to this pixel position.
+         * @returns {number} the range value
+         */
+        PlotPosition.prototype.getRange = function () {
+            return this.position[1];
+        };
+
+        /**
+         * Get the domain and values corresponding to this
+         * pixel position.
+         * @returns {number[]} an array containing the domain and
+         *          the range value, in that order
+         */
+        PlotPosition.prototype.getPosition = function () {
+            return this.position;
+        };
+
+        return PlotPosition;
+    }
+);

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

@@ -0,0 +1,153 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+
+/**
+ * Prepares data to be rendered in a GL Plot. Handles
+ * the conversion from data API to displayable buffers.
+ */
+define(
+    function () {
+
+        function identity(x) {
+            return x;
+        }
+
+        /**
+         * The PlotPreparer is responsible for handling data sets and
+         * preparing them to be rendered. It creates a WebGL-plottable
+         * Float32Array for each trace, and tracks the boundaries of the
+         * data sets (since this is convenient to do during the same pass).
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {Telemetry[]} datas telemetry data objects
+         * @param {string} domain the key to use when looking up domain values
+         * @param {string} range the key to use when looking up range values
+         */
+        function PlotPreparer(datas, domain, range) {
+            var index,
+                vertices = [],
+                max = [Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY],
+                min = [Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY],
+                x,
+                y,
+                domainOffset = Number.POSITIVE_INFINITY;
+
+            // Remove any undefined data sets
+            datas = (datas || []).filter(identity);
+
+            // Do a first pass to determine the domain offset.
+            // This will be use to reduce the magnitude of domain values
+            // in the buffer, to minimize loss-of-precision when
+            // converting to a 32-bit float.
+            datas.forEach(function (data) {
+                domainOffset = Math.min(data.getDomainValue(0, domain), domainOffset);
+            });
+
+            // Assemble buffers, and track bounds of the data present
+            datas.forEach(function (data, i) {
+                vertices.push([]);
+                for (index = 0; index < data.getPointCount(); index += 1) {
+                    x = data.getDomainValue(index, domain);
+                    y = data.getRangeValue(index, range);
+                    vertices[i].push(x - domainOffset);
+                    vertices[i].push(y);
+                    min[0] = Math.min(min[0], x);
+                    min[1] = Math.min(min[1], y);
+                    max[0] = Math.max(max[0], x);
+                    max[1] = Math.max(max[1], y);
+                }
+            });
+
+            // If range is empty, add some padding
+            if (max[1] === min[1]) {
+                max[1] = max[1] + 1.0;
+                min[1] = min[1] - 1.0;
+            }
+
+            // Convert to Float32Array
+            this.buffers = vertices.map(function (v) {
+                return new Float32Array(v);
+            });
+
+            this.min = min;
+            this.max = max;
+            this.domainOffset = domainOffset;
+        }
+
+        /**
+         * Get the dimensions which bound all data in the provided
+         * data sets. This is given as a two-element array where the
+         * first element is domain, and second is range.
+         * @returns {number[]} the dimensions which bound this data set
+         */
+        PlotPreparer.prototype.getDimensions = function () {
+            var max = this.max, min = this.min;
+            return [max[0] - min[0], max[1] - min[1]];
+        };
+
+        /**
+         * Get the origin of this data set's boundary.
+         * This is given as a two-element array where the
+         * first element is domain, and second is range.
+         * The domain value here is not adjusted by the domain offset.
+         * @returns {number[]} the origin of this data set's boundary
+         */
+        PlotPreparer.prototype.getOrigin = function () {
+            return this.min;
+        };
+
+        /**
+         * Get the domain offset; this offset will have been subtracted
+         * from all domain values in all buffers returned by this
+         * preparer, in order to minimize loss-of-precision due to
+         * conversion to the 32-bit float format needed by WebGL.
+         * @returns {number} the domain offset
+         */
+        PlotPreparer.prototype.getDomainOffset = function () {
+            return this.domainOffset;
+        };
+
+        /**
+         * Get all renderable buffers for this data set. This will
+         * be returned as an array which can be correlated back to
+         * the provided telemetry data objects (from the constructor
+         * call) by index.
+         *
+         * Internally, these are flattened; each buffer contains a
+         * sequence of alternating domain and range values.
+         *
+         * All domain values in all buffers will have been adjusted
+         * from their original values by subtraction of the domain
+         * offset; this minimizes loss-of-precision resulting from
+         * the conversion to 32-bit floats, which may otherwise
+         * cause aliasing artifacts (particularly for timestamps)
+         *
+         * @returns {Float32Array[]} the buffers for these traces
+         */
+        PlotPreparer.prototype.getBuffers = function () {
+            return this.buffers;
+        };
+
+        return PlotPreparer;
+
+    }
+);

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

@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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 () {
+
+        /**
+         * Provides a window on a telemetry data series, to support
+         * insertion into a plot line.
+         * @constructor
+         * @memberof platform/features/plot
+         * @implements {TelemetrySeries}
+         */
+        function PlotSeriesWindow(series, domain, range, start, end) {
+            this.series = series;
+            this.domain = domain;
+            this.range = range;
+            this.start = start;
+            this.end = end;
+        }
+
+        PlotSeriesWindow.prototype.getPointCount = function () {
+            return this.end - this.start;
+        };
+
+        PlotSeriesWindow.prototype.getDomainValue = function (index) {
+            return this.series.getDomainValue(index + this.start, this.domain);
+        };
+
+        PlotSeriesWindow.prototype.getRangeValue = function (index) {
+            return this.series.getRangeValue(index + this.start, this.range);
+        };
+
+        /**
+         * Split this series into two series of equal (or nearly-equal) size.
+         * @returns {PlotSeriesWindow[]} two series
+         */
+        PlotSeriesWindow.prototype.split = function () {
+            var mid = Math.floor((this.end + this.start) / 2);
+            return ((this.end - this.start) > 1) ?
+                [
+                    new PlotSeriesWindow(
+                        this.series,
+                        this.domain,
+                        this.range,
+                        this.start,
+                        mid
+                    ),
+                    new PlotSeriesWindow(
+                        this.series,
+                        this.domain,
+                        this.range,
+                        mid,
+                        this.end
+                    )
+                ] : [];
+        };
+
+        return PlotSeriesWindow;
+    }
+);

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

@@ -0,0 +1,76 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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 () {
+
+        var DIGITS = 3;
+
+        /**
+         * Wraps a `TelemetryFormatter` to provide formats for domain and
+         * range values; provides a single place to track domain/range
+         * formats within a plot, allowing other plot elements to simply
+         * request that values be formatted.
+         * @constructor
+         * @memberof platform/features/plot
+         * @implements {platform/telemetry.TelemetryFormatter}
+         * @param {TelemetryFormatter} telemetryFormatter the formatter
+         *        to wrap.
+         */
+        function PlotTelemetryFormatter(telemetryFormatter) {
+            this.telemetryFormatter = telemetryFormatter;
+        }
+
+        /**
+         * Specify the format to use for domain values.
+         * @param {string} key the format's identifier
+         */
+        PlotTelemetryFormatter.prototype.setDomainFormat = function (key) {
+            this.domainFormat = key;
+        };
+
+        /**
+         * Specify the format to use for range values.
+         * @param {string} key the format's identifier
+         */
+        PlotTelemetryFormatter.prototype.setRangeFormat = function (key) {
+            this.rangeFormat = key;
+        };
+
+        PlotTelemetryFormatter.prototype.formatDomainValue = function (value) {
+            return this.telemetryFormatter
+                .formatDomainValue(value, this.domainFormat);
+        };
+
+        PlotTelemetryFormatter.prototype.formatRangeValue = function (value) {
+            if (typeof value === 'number') {
+                return value.toFixed(DIGITS);
+            }
+
+            return this.telemetryFormatter
+                .formatRangeValue(value, this.rangeFormat);
+        };
+
+        return PlotTelemetryFormatter;
+    }
+);

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

@@ -0,0 +1,102 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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 () {
+
+        /**
+         * The PlotTickGenerator provides labels for ticks along the
+         * domain and range axes of the plot, to support the plot
+         * template.
+         *
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {PlotPanZoomStack} panZoomStack the pan-zoom stack for
+         *        this plot, used to determine plot boundaries
+         * @param {TelemetryFormatter} formatter used to format (for display)
+         *        domain and range values.
+         */
+        function PlotTickGenerator(panZoomStack, formatter) {
+            this.panZoomStack = panZoomStack;
+            this.formatter = formatter;
+        }
+
+        // For phantomjs compatibility, for headless testing
+        // (Function.prototype.bind unsupported)
+        function bind(fn, thisObj) {
+            return fn.bind ? fn.bind(thisObj) : function () {
+                return fn.apply(thisObj, arguments);
+            };
+        }
+
+        // Generate ticks; interpolate from start up to
+        // start + span in count steps, using the provided
+        // formatter to represent each value.
+        PlotTickGenerator.prototype.generateTicks = function (start, span, count, format) {
+            var step = span / (count - 1),
+                result = [],
+                i;
+
+            for (i = 0; i < count; i += 1) {
+                result.push({
+                    //If data to show, display label for each tick line, otherwise show lines but suppress labels.
+                    label: span > 0 ? format(i * step + start) : ''
+                });
+            }
+
+            return result;
+        };
+
+        /**
+         * Generate tick marks for the domain axis.
+         * @param {number} count the number of ticks
+         * @returns {string[]} labels for those ticks
+         */
+        PlotTickGenerator.prototype.generateDomainTicks = function (count) {
+            var panZoom = this.panZoomStack.getPanZoom();
+            return this.generateTicks(
+                panZoom.origin[0],
+                panZoom.dimensions[0],
+                count,
+                bind(this.formatter.formatDomainValue, this.formatter)
+            );
+        };
+
+        /**
+         * Generate tick marks for the range axis.
+         * @param {number} count the number of ticks
+         * @returns {string[]} labels for those ticks
+         */
+        PlotTickGenerator.prototype.generateRangeTicks = function (count) {
+            var panZoom = this.panZoomStack.getPanZoom();
+            return this.generateTicks(
+                panZoom.origin[1],
+                panZoom.dimensions[1],
+                count,
+                bind(this.formatter.formatRangeValue, this.formatter)
+            );
+        };
+
+        return PlotTickGenerator;
+    }
+);

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

@@ -0,0 +1,353 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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(
+    ['./PlotLine', './PlotLineBuffer'],
+    function (PlotLine, PlotLineBuffer) {
+
+        var MAX_POINTS = 86400,
+            PADDING_RATIO = 0.10, // Padding percentage for top & bottom
+            INITIAL_SIZE = 675; // 1/128 of MAX_POINTS
+
+        /**
+         * The PlotPreparer is responsible for handling data sets and
+         * preparing them to be rendered. It creates a WebGL-plottable
+         * Float32Array for each trace, and tracks the boundaries of the
+         * data sets (since this is convenient to do during the same pass).
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {TelemetryHandle} handle the handle to telemetry access
+         * @param {string} domain the key to use when looking up domain values
+         * @param {string} range the key to use when looking up range values
+         * @param {number} fixedDuration maximum plot duration to display
+         * @param {number} maxPoints maximum number of points to display
+         */
+        function PlotUpdater(handle, domain, range, fixedDuration, maxPoints) {
+            this.handle = handle;
+            this.domain = domain;
+            this.range = range;
+            this.fixedDuration = fixedDuration;
+            this.maxPoints = maxPoints;
+
+            this.ids = [];
+            this.lines = {};
+            this.buffers = {};
+            this.bufferArray = [];
+
+            // Use a default MAX_POINTS if none is provided
+            this.maxPoints = maxPoints !== undefined ? maxPoints : MAX_POINTS;
+            this.dimensions = [0, 0];
+            this.origin = [0, 0];
+
+            // Initially prepare state for these objects.
+            // Note that this may be an empty array at this time,
+            // so we also need to check during update cycles.
+            this.update();
+        }
+
+        // Look up a domain object's id (for mapping, below)
+        function getId(domainObject) {
+            return domainObject.getId();
+        }
+
+        // Used in the reduce step of updateExtrema
+        function reduceExtrema(a, b) {
+            return [Math.min(a[0], b[0]), Math.max(a[1], b[1])];
+        }
+
+        // Convert a domain/range extrema to plot dimensions
+        function dimensionsOf(extrema) {
+            return extrema[1] - extrema[0];
+        }
+
+        // Convert a domain/range extrema to a plot origin
+        function originOf(extrema) {
+            return extrema[0];
+        }
+
+        // Check if this set of ids matches the current set of ids
+        // (used to detect if line preparation can be skipped)
+        PlotUpdater.prototype.idsMatch = function (nextIds) {
+            var ids = this.ids;
+            return ids.length === nextIds.length &&
+                nextIds.every(function (id, index) {
+                    return ids[index] === id;
+                });
+        };
+
+        // Prepare plot lines for this group of telemetry objects
+        PlotUpdater.prototype.prepareLines = function (telemetryObjects) {
+            var nextIds = telemetryObjects.map(getId),
+                next = {},
+                self = this;
+
+            // Detect if we already have everything we need prepared
+            if (this.idsMatch(nextIds)) {
+                // Nothing to prepare, move on
+                return;
+            }
+
+            // Built up a set of ids. Note that we can only
+            // create plot lines after our domain offset has
+            // been determined.
+            if (this.domainOffset !== undefined) {
+                // Update list of ids in use
+                this.ids = nextIds;
+
+                // Create buffers for these objects
+                this.bufferArray = this.ids.map(function (id) {
+                    self.buffers[id] = self.buffers[id] || new PlotLineBuffer(
+                        self.domainOffset,
+                        INITIAL_SIZE,
+                        self.maxPoints
+                    );
+                    next[id] =
+                        self.lines[id] || new PlotLine(self.buffers[id]);
+                    return self.buffers[id];
+                });
+            }
+
+            // If there are no more lines, clear the domain offset
+            if (Object.keys(next).length < 1) {
+                this.domainOffset = undefined;
+            }
+
+            // Update to the current set of lines
+            this.lines = next;
+        };
+
+        // Initialize the domain offset, based on these observed values
+        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;
+        };
+
+        // Expand range slightly so points near edges are visible
+        PlotUpdater.prototype.expandRange = function () {
+            var padding = PADDING_RATIO * this.dimensions[1],
+                top;
+            padding = Math.max(padding, 1.0);
+            top = Math.ceil(this.origin[1] + this.dimensions[1] + padding / 2);
+            this.origin[1] = Math.floor(this.origin[1] - padding / 2);
+            this.dimensions[1] = top - this.origin[1];
+        };
+
+        // Update dimensions and origin based on extrema of plots
+        PlotUpdater.prototype.updateBounds = function () {
+            var bufferArray = this.bufferArray.filter(function (lineBuffer) {
+                    return lineBuffer.getLength() > 0; // Ignore empty lines
+                }),
+                priorDomainOrigin = this.origin[0],
+                priorDomainDimensions = this.dimensions[0];
+
+            if (bufferArray.length > 0) {
+                this.domainExtrema = bufferArray.map(function (lineBuffer) {
+                    return lineBuffer.getDomainExtrema();
+                }).reduce(reduceExtrema);
+
+                this.rangeExtrema = bufferArray.map(function (lineBuffer) {
+                    return lineBuffer.getRangeExtrema();
+                }).reduce(reduceExtrema);
+
+                // Calculate best-fit dimensions
+                this.dimensions = [this.domainExtrema, this.rangeExtrema]
+                    .map(dimensionsOf);
+                this.origin = [this.domainExtrema, this.rangeExtrema]
+                    .map(originOf);
+
+                // 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] -
+                        this.fixedDuration;
+                    this.dimensions[0] = this.fixedDuration;
+                }
+            }
+        };
+
+        // Add latest data for this domain object
+        PlotUpdater.prototype.addPointFor = function (domainObject) {
+            var line = this.lines[domainObject.getId()];
+            if (line) {
+                line.addPoint(
+                    this.handle.getDomainValue(domainObject, this.domain),
+                    this.handle.getRangeValue(domainObject, this.range)
+                );
+            }
+        };
+
+        /**
+         * Update with latest data.
+         */
+        PlotUpdater.prototype.update = function update() {
+            var objects = this.handle.getTelemetryObjects(),
+                self = this;
+
+            // Initialize domain offset if necessary
+            if (this.domainOffset === undefined) {
+                this.initializeDomainOffset(objects.map(function (obj) {
+                    return self.handle.getDomainValue(obj, self.domain);
+                }).filter(function (value) {
+                    return typeof value === 'number';
+                }));
+            }
+
+            // Make sure lines are available
+            this.prepareLines(objects);
+
+            // Add new data
+            objects.forEach(function (domainObject, index) {
+                self.addPointFor(domainObject, index);
+            });
+
+            // Then, update extrema
+            this.updateBounds();
+        };
+
+        /**
+         * Get the dimensions which bound all data in the provided
+         * data sets. This is given as a two-element array where the
+         * first element is domain, and second is range.
+         * @returns {number[]} the dimensions which bound this data set
+         */
+        PlotUpdater.prototype.getDimensions = function () {
+            return this.dimensions;
+        };
+
+        /**
+         * Get the origin of this data set's boundary.
+         * This is given as a two-element array where the
+         * first element is domain, and second is range.
+         * The domain value here is not adjusted by the domain offset.
+         * @returns {number[]} the origin of this data set's boundary
+         */
+        PlotUpdater.prototype.getOrigin = function () {
+            return this.origin;
+        };
+
+        /**
+         * Get the domain offset; this offset will have been subtracted
+         * from all domain values in all buffers returned by this
+         * preparer, in order to minimize loss-of-precision due to
+         * conversion to the 32-bit float format needed by WebGL.
+         * @returns {number} the domain offset
+         * @memberof platform/features/plot.PlotUpdater#
+         */
+        PlotUpdater.prototype.getDomainOffset = function () {
+            return this.domainOffset;
+        };
+
+        /**
+         * Get all renderable buffers for this data set. This will
+         * be returned as an array which can be correlated back to
+         * the provided telemetry data objects (from the constructor
+         * call) by index.
+         *
+         * Internally, these are flattened; each buffer contains a
+         * sequence of alternating domain and range values.
+         *
+         * All domain values in all buffers will have been adjusted
+         * from their original values by subtraction of the domain
+         * offset; this minimizes loss-of-precision resulting from
+         * the conversion to 32-bit floats, which may otherwise
+         * cause aliasing artifacts (particularly for timestamps)
+         *
+         * @returns {Float32Array[]} the buffers for these traces
+         * @memberof platform/features/plot.PlotUpdater#
+         */
+        PlotUpdater.prototype.getLineBuffers = function () {
+            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.
+         */
+        PlotUpdater.prototype.addHistorical = function (domainObject, series) {
+            var count = series ? series.getPointCount() : 0,
+                line;
+
+            // Nothing to do if it's an empty series
+            if (count < 1) {
+                return;
+            }
+
+            // Initialize domain offset if necessary
+            if (this.domainOffset === undefined) {
+                this.initializeDomainOffset([
+                    series.getDomainValue(0, this.domain),
+                    series.getDomainValue(count - 1, this.domain)
+                ]);
+            }
+
+            // Make sure lines are available
+            this.prepareLines(this.handle.getTelemetryObjects());
+
+            // Look up the line for this domain object
+            line = this.lines[domainObject.getId()];
+
+            // ...and put the data into it.
+            if (line) {
+                line.addSeries(series, this.domain, this.range);
+            }
+
+            // Update extrema
+            this.updateBounds();
+        };
+
+        return PlotUpdater;
+
+    }
+);
+

platform/features/plot/src/modes/PlotModeOptions.js

@@ -0,0 +1,155 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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(
+    ["./PlotOverlayMode", "./PlotStackMode"],
+    function (PlotOverlayMode, PlotStackMode) {
+
+        var STACKED = {
+                key: "stacked",
+                name: "Stacked",
+                cssClass: "icon-plot-stacked",
+                Constructor: PlotStackMode
+            },
+            OVERLAID = {
+                key: "overlaid",
+                name: "Overlaid",
+                cssClass: "icon-plot-overlay",
+                Constructor: PlotOverlayMode
+            };
+
+        /**
+         * Handles distinct behavior associated with different
+         * plot modes.
+         *
+         * @interface platform/features/plot.PlotModeHandler
+         * @private
+         */
+
+        /**
+         * Plot telemetry to the sub-plot(s) managed by this mode.
+         * @param {platform/features/plot.PlotUpdater} updater a source
+         *        of data that is ready to plot
+         * @method platform/features/plot.PlotModeHandler#plotTelemetry
+         */
+        /**
+         * Get all sub-plots to be displayed in this mode; used
+         * to populate the plot template.
+         * @return {platform/features/plot.SubPlot[]} all sub-plots to
+         *         display in this mode
+         * @method platform/features/plot.PlotModeHandler#getSubPlots
+         */
+        /**
+         * Check if we are not in our base pan-zoom state (that is,
+         * there are some temporary user modifications to the
+         * current pan-zoom state.)
+         * @returns {boolean} true if not in the base pan-zoom state
+         * @method platform/features/plot.PlotModeHandler#isZoomed
+         */
+        /**
+         * Undo the most recent pan/zoom change and restore
+         * the prior state.
+         * @method platform/features/plot.PlotModeHandler#stepBackPanZoom
+         */
+        /**
+         * Undo all pan/zoom change and restore the base state.
+         * @method platform/features/plot.PlotModeHandler#unzoom
+         */
+
+        /**
+         * Determines which plotting modes (stacked/overlaid)
+         * are applicable in a given plot view, maintains current
+         * selection state thereof, and provides handlers for the
+         * different behaviors associated with these modes.
+         * @memberof platform/features/plot
+         * @constructor
+         * @param {DomainObject[]} telemetryObjects the telemetry objects being
+         *        represented in this plot view
+         * @param {platform/features/plot.SubPlotFactory} subPlotFactory a
+         *        factory for creating sub-plots
+         */
+        function PlotModeOptions(telemetryObjects, subPlotFactory) {
+            this.options = telemetryObjects.length > 1 ?
+                    [OVERLAID, STACKED] : [OVERLAID];
+            this.mode = this.options[0]; // Initial selection (overlaid)
+            this.telemetryObjects = telemetryObjects;
+            this.subPlotFactory = subPlotFactory;
+        }
+
+        /**
+         * Get a handler for the current mode. This will handle
+         * plotting telemetry, providing subplots for the template,
+         * and view-level interactions with pan-zoom state.
+         * @returns {PlotOverlayMode|PlotStackMode} a handler
+         *          for the current mode
+         */
+        PlotModeOptions.prototype.getModeHandler = function () {
+            // Lazily initialize
+            if (!this.modeHandler) {
+                this.modeHandler = new this.mode.Constructor(
+                    this.telemetryObjects,
+                    this.subPlotFactory
+                );
+            }
+            return this.modeHandler;
+        };
+
+        /**
+         * Get all mode options available for each plot. Each
+         * mode contains a `name` and `cssClass` field suitable
+         * for display in a template.
+         * @return {Array} the available modes
+         */
+        PlotModeOptions.prototype.getModeOptions = function () {
+            return this.options;
+        };
+
+        /**
+         * Get the plotting mode option currently in use.
+         * This will be one of the elements returned from
+         * `getModeOptions`.
+         * @return {*} the current mode
+         */
+        PlotModeOptions.prototype.getMode = function () {
+            return this.mode;
+        };
+
+        /**
+         * Set the plotting mode option to use.
+         * The passed argument must be one of the options
+         * returned by `getModeOptions`.
+         * @param {object} option one of the plot mode options
+         *        from `getModeOptions`
+         */
+        PlotModeOptions.prototype.setMode = function (option) {
+            if (this.mode !== option) {
+                this.mode = option;
+                // Clear the existing mode handler, so it
+                // can be instantiated next time it's needed.
+                this.modeHandler = undefined;
+            }
+        };
+
+
+        return PlotModeOptions;
+    }
+);

platform/features/plot/src/modes/PlotOverlayMode.js

@@ -0,0 +1,88 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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(
+    ["../SubPlot", "../elements/PlotPalette", "../elements/PlotPanZoomStack"],
+    function (SubPlot, PlotPalette, PlotPanZoomStack) {
+
+        /**
+         * Handles plotting in Overlaid mode. In overlaid mode, there
+         * is one sub-plot which contains all plotted objects.
+         * @memberof platform/features/plot
+         * @constructor
+         * @implements {platform/features/plot.PlotModeHandler}
+         * @param {DomainObject[]} the domain objects to be plotted
+         */
+        function PlotOverlayMode(telemetryObjects, subPlotFactory) {
+            this.panZoomStack = new PlotPanZoomStack([], []);
+            this.subplot = subPlotFactory.createSubPlot(
+                telemetryObjects,
+                this.panZoomStack
+            );
+            this.subplots = [this.subplot];
+        }
+
+        PlotOverlayMode.prototype.plotTelemetry = function (updater) {
+            // Fit to the boundaries of the data, but don't
+            // override any user-initiated pan-zoom changes.
+            this.panZoomStack.setBasePanZoom(
+                updater.getOrigin(),
+                updater.getDimensions()
+            );
+
+            // Track the domain offset, used to bias domain values
+            // to minimize loss of precision when converted to 32-bit
+            // floating point values for display.
+            this.subplot.setDomainOffset(updater.getDomainOffset());
+
+            // Draw the buffers. Select color by index.
+            this.subplot.getDrawingObject().lines =
+                updater.getLineBuffers().map(function (buf, i) {
+                    return {
+                        buffer: buf.getBuffer(),
+                        color: PlotPalette.getFloatColor(i),
+                        points: buf.getLength()
+                    };
+                });
+        };
+
+        PlotOverlayMode.prototype.getSubPlots = function () {
+            return this.subplots;
+        };
+
+        PlotOverlayMode.prototype.isZoomed = function () {
+            return this.panZoomStack.getDepth() > 1;
+        };
+
+        PlotOverlayMode.prototype.stepBackPanZoom = function () {
+            this.panZoomStack.popPanZoom();
+            this.subplot.update();
+        };
+
+        PlotOverlayMode.prototype.unzoom = function () {
+            this.panZoomStack.clearPanZoom();
+            this.subplot.update();
+        };
+
+        return PlotOverlayMode;
+    }
+);

platform/features/plot/src/modes/PlotStackMode.js

@@ -0,0 +1,104 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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(
+    ["../SubPlot", "../elements/PlotPalette", "../elements/PlotPanZoomStackGroup"],
+    function (SubPlot, PlotPalette, PlotPanZoomStackGroup) {
+
+        /**
+         * Handles plotting in Stacked mode. In stacked mode, there
+         * is one sub-plot for each plotted object.
+         * @memberof platform/features/plot
+         * @constructor
+         * @implements {platform/features/plot.PlotModeHandler}
+         * @param {DomainObject[]} the domain objects to be plotted
+         */
+        function PlotStackMode(telemetryObjects, subPlotFactory) {
+            var self = this;
+
+            this.panZoomStackGroup =
+                new PlotPanZoomStackGroup(telemetryObjects.length);
+
+            this.subplots = telemetryObjects.map(function (telemetryObject, i) {
+                    return subPlotFactory.createSubPlot(
+                        [telemetryObject],
+                        self.panZoomStackGroup.getPanZoomStack(i)
+                    );
+                });
+        }
+
+        PlotStackMode.prototype.plotTelemetryTo = function (subplot, prepared, index) {
+            var buffer = prepared.getLineBuffers()[index];
+
+            // Track the domain offset, used to bias domain values
+            // to minimize loss of precision when converted to 32-bit
+            // floating point values for display.
+            subplot.setDomainOffset(prepared.getDomainOffset());
+
+            // Draw the buffers. Always use the 0th color, because there
+            // is one line per plot.
+            subplot.getDrawingObject().lines = [{
+                buffer: buffer.getBuffer(),
+                color: PlotPalette.getFloatColor(0),
+                points: buffer.getLength()
+            }];
+        };
+
+        PlotStackMode.prototype.plotTelemetry = function (prepared) {
+            var self = this;
+            // Fit to the boundaries of the data, but don't
+            // override any user-initiated pan-zoom changes.
+            this.panZoomStackGroup.setBasePanZoom(
+                prepared.getOrigin(),
+                prepared.getDimensions()
+            );
+
+            this.subplots.forEach(function (subplot, index) {
+                self.plotTelemetryTo(subplot, prepared, index);
+            });
+        };
+
+        PlotStackMode.prototype.getSubPlots = function () {
+            return this.subplots;
+        };
+
+        PlotStackMode.prototype.isZoomed = function () {
+            return this.panZoomStackGroup.getDepth() > 1;
+        };
+
+        PlotStackMode.prototype.stepBackPanZoom = function () {
+            this.panZoomStackGroup.popPanZoom();
+            this.subplots.forEach(function (subplot) {
+                subplot.update();
+            });
+        };
+
+        PlotStackMode.prototype.unzoom = function () {
+            this.panZoomStackGroup.clearPanZoom();
+            this.subplots.forEach(function (subplot) {
+                subplot.update();
+            });
+        };
+
+        return PlotStackMode;
+    }
+);

platform/features/plot/src/policies/PlotViewPolicy.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -54,7 +54,7 @@ define(
         };
 
         PlotViewPolicy.prototype.allow = function (view, domainObject) {
-            if (view.key === 'plot-single') {
+            if (view.key === 'plot') {
                 return this.hasNumericTelemetry(domainObject);
             }
 

platform/features/plot/src/services/ExportImageService.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -32,6 +32,7 @@ define(
         html2canvas,
         saveAs
     ) {
+        var self = this;
 
         /**
          * The export image service will export any HTML node to
@@ -42,15 +43,14 @@ define(
          * @param {constant} EXPORT_IMAGE_TIMEOUT time in milliseconds before a timeout error is returned
          * @constructor
          */
-        function ExportImageService($q, $timeout, $log) {
-            this.$q = $q;
-            this.$timeout = $timeout;
-            this.$log = $log;
-            this.EXPORT_IMAGE_TIMEOUT = 1000;
-        }
-
-        function changeBackgroundColor(element, color) {
-            element.style.backgroundColor = color;
+        function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT, injHtml2Canvas, injSaveAs, injFileReader) {
+            self.$q = $q;
+            self.$timeout = $timeout;
+            self.$log = $log;
+            self.EXPORT_IMAGE_TIMEOUT = EXPORT_IMAGE_TIMEOUT;
+            self.html2canvas = injHtml2Canvas || html2canvas;
+            self.saveAs = injSaveAs || saveAs;
+            self.reader = injFileReader || new FileReader();
         }
 
         /**
@@ -60,35 +60,24 @@ define(
          * @param {string} type of image to convert the element to
          * @returns {promise}
          */
-        ExportImageService.prototype.renderElement = function (element, type, color) {
-            var defer = this.$q.defer(),
+        function renderElement(element, type) {
+            var defer = self.$q.defer(),
                 validTypes = ["png", "jpg", "jpeg"],
-                renderTimeout,
-                originalColor;
+                renderTimeout;
 
             if (validTypes.indexOf(type) === -1) {
-                this.$log.error("Invalid type requested. Try: (" + validTypes.join(",") + ")");
+                self.$log.error("Invalid type requested. Try: (" + validTypes.join(",") + ")");
                 return;
             }
 
-            if (color) {
-                // Save color to be restored later
-                originalColor = element.style.backgroundColor || '';
-                // Defaulting to white so we can see the chart when printed
-                changeBackgroundColor(element, color);
-            }
-
-            renderTimeout = this.$timeout(function () {
+            renderTimeout = self.$timeout(function () {
                 defer.reject("html2canvas timed out");
-                this.$log.warn("html2canvas timed out");
-            }.bind(this), this.EXPORT_IMAGE_TIMEOUT);
+                self.$log.warn("html2canvas timed out");
+            }, self.EXPORT_IMAGE_TIMEOUT);
 
             try {
-                html2canvas(element, {
+                self.html2canvas(element, {
                     onrendered: function (canvas) {
-                        if (color) {
-                            changeBackgroundColor(element, originalColor);
-                        }
                         switch (type.toLowerCase()) {
                             case "png":
                                 canvas.toBlob(defer.resolve, "image/png");
@@ -104,42 +93,13 @@ define(
                 });
             } catch (e) {
                 defer.reject(e);
-                this.$log.warn("html2canvas failed with error: " + e);
+                self.$log.warn("html2canvas failed with error: " + e);
             }
 
-            defer.promise.finally(function () {
-                renderTimeout.cancel();
-                if (color) {
-                    changeBackgroundColor(element, originalColor);
-                }
-            });
+            defer.promise.finally(renderTimeout.cancel);
 
             return defer.promise;
-        };
-
-        /**
-         * Takes a screenshot of a DOM node and exports to JPG.
-         * @param {node} element to be exported
-         * @param {string} filename the exported image
-         * @returns {promise}
-         */
-        ExportImageService.prototype.exportJPG = function (element, filename, color) {
-            return this.renderElement(element, "jpeg", color).then(function (img) {
-                saveAs(img, filename);
-            });
-        };
-
-        /**
-         * Takes a screenshot of a DOM node and exports to PNG.
-         * @param {node} element to be exported
-         * @param {string} filename the exported image
-         * @returns {promise}
-         */
-        ExportImageService.prototype.exportPNG = function (element, filename, color) {
-            return this.renderElement(element, "png", color).then(function (img) {
-                saveAs(img, filename);
-            });
-        };
+        }
 
         /**
          * canvas.toBlob() not supported in IE < 10, Opera, and Safari. This polyfill
@@ -165,6 +125,30 @@ define(
             }
         }
 
+        /**
+         * Takes a screenshot of a DOM node and exports to JPG.
+         * @param {node} element to be exported
+         * @param {string} filename the exported image
+         * @returns {promise}
+         */
+        ExportImageService.prototype.exportJPG = function (element, filename) {
+            return renderElement(element, "jpeg").then(function (img) {
+                self.saveAs(img, filename);
+            });
+        };
+
+        /**
+         * Takes a screenshot of a DOM node and exports to PNG.
+         * @param {node} element to be exported
+         * @param {string} filename the exported image
+         * @returns {promise}
+         */
+        ExportImageService.prototype.exportPNG = function (element, filename) {
+            return renderElement(element, "png").then(function (img) {
+                self.saveAs(img, filename);
+            });
+        };
+
         polyfillToBlob();
 
         return ExportImageService;

platform/features/plot/test/Canvas2DChartSpec.js

@@ -0,0 +1,95 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+
+/**
+ * MergeModelsSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../src/Canvas2DChart"],
+    function (Canvas2DChart) {
+
+        describe("A canvas 2d chart", function () {
+            var mockCanvas,
+                mock2d,
+                chart;
+
+            beforeEach(function () {
+                mockCanvas = jasmine.createSpyObj("canvas", ["getContext"]);
+                mock2d = jasmine.createSpyObj(
+                    "2d",
+                    [
+                        "clearRect",
+                        "beginPath",
+                        "moveTo",
+                        "lineTo",
+                        "stroke",
+                        "fillRect"
+                    ]
+                );
+                mockCanvas.getContext.andReturn(mock2d);
+
+                chart = new Canvas2DChart(mockCanvas);
+            });
+
+            // Note that tests below are less specific than they
+            // could be, esp. w.r.t. arguments to drawing calls;
+            // this is a fallback option so is a lower test priority.
+
+            it("allows the canvas to be cleared", function () {
+                chart.clear();
+                expect(mock2d.clearRect).toHaveBeenCalled();
+            });
+
+            it("does not construct if 2D is unavailable", function () {
+                mockCanvas.getContext.andReturn(undefined);
+                expect(function () {
+                    return new Canvas2DChart(mockCanvas);
+                }).toThrow();
+            });
+
+            it("allows dimensions to be set", function () {
+                // No return value, just verify API is present
+                chart.setDimensions([120, 120], [0, 10]);
+            });
+
+            it("allows lines to be drawn", function () {
+                var testBuffer = [0, 1, 3, 8],
+                    testColor = [0.25, 0.33, 0.66, 1.0],
+                    testPoints = 2;
+                chart.drawLine(testBuffer, testColor, testPoints);
+                expect(mock2d.beginPath).toHaveBeenCalled();
+                expect(mock2d.lineTo.calls.length).toEqual(1);
+                expect(mock2d.stroke).toHaveBeenCalled();
+            });
+
+            it("allows squares to be drawn", function () {
+                var testMin = [0, 1],
+                    testMax = [10, 10],
+                    testColor = [0.25, 0.33, 0.66, 1.0];
+
+                chart.drawSquare(testMin, testMax, testColor);
+                expect(mock2d.fillRect).toHaveBeenCalled();
+            });
+
+        });
+    }
+);