+ ng-class="{ 'pinned': toi.pinned, 'val-to-right': false }"
+ ng-style="{'left': toi.left + '%'}">
-
-
21:31:30
+
+
2016-09-15 21:31:30.000Z
diff --git a/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js b/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js
new file mode 100644
index 0000000000..c168acadf6
--- /dev/null
+++ b/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js
@@ -0,0 +1,114 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+ ["zepto"],
+ function ($) {
+
+ /**
+ * The mct-conductor-axis renders a horizontal axis with regular
+ * labelled 'ticks'. It requires 'start' and 'end' integer values to
+ * be specified as attributes.
+ */
+ function ConductorTOIController($scope, conductor, conductorViewService, $timeout) {
+ this.conductor = conductor;
+ this.conductorViewService = conductorViewService;
+
+ //Bind all class functions to 'this'
+ Object.keys(ConductorTOIController.prototype).filter(function (key) {
+ return typeof ConductorTOIController.prototype[key] === 'function';
+ }).forEach(function (key) {
+ this[key] = ConductorTOIController.prototype[key].bind(this);
+ }.bind(this));
+
+ this.conductor.on('timeOfInterest', this.changeTimeOfInterest);
+ this.conductorViewService.on('zoom', this.setOffsetFromBounds);
+ this.conductorViewService.on('pan', this.setOffsetFromBounds);
+
+ this.$timeout = $timeout;
+
+ var generateRandomTOI = function () {
+ var bounds = conductor.bounds();
+ var range = bounds.end - bounds.start;
+ var toi = Math.random() * range + bounds.start;
+ console.log('calculated random TOI of ' + toi);
+ conductor.timeOfInterest(toi);
+ //this.timeoutHandle = $timeout(generateRandomTOI, 1000);
+ }.bind(this);
+
+ //this.timeoutHandle = $timeout(generateRandomTOI, 2000);
+
+ $scope.$on('$destroy', this.destroy);
+
+ }
+
+ ConductorTOIController.prototype.destroy = function () {
+ this.conductor.off('timeOfInterest', this.setOffsetFromBounds);
+ this.conductorViewService.off('zoom', this.setOffsetFromBounds);
+ this.conductorViewService.off('pan', this.setOffsetFromBounds);
+
+ this.$timeout.cancel(this.timeoutHandle);
+ };
+
+ ConductorTOIController.prototype.setOffsetFromBounds = function (bounds) {
+ var toi = this.conductor.timeOfInterest();
+ var offset = toi - bounds.start;
+ this.left = offset / (bounds.end - bounds.start) * 100;
+ };
+
+ ConductorTOIController.prototype.changeTimeOfInterest = function () {
+ var bounds = this.conductor.bounds();
+ if (bounds) {
+ this.setOffsetFromBounds(bounds);
+ this.pinned = true;
+ }
+ };
+
+ ConductorTOIController.prototype.click = function (e) {
+ if (e.altKey) {
+ var element = $(e.currentTarget);
+ var width = element.width();
+ var relativeX = e.pageX - element.offset().left;
+ var percX = relativeX / width;
+ var bounds = this.conductor.bounds();
+ var timeRange = bounds.end - bounds.start;
+
+ this.conductor.timeOfInterest(timeRange * percX + bounds.start);
+ }
+ };
+
+ /*
+ ConductorTOIController.prototype.zoom = function (bounds) {
+ this.changeTOI(bounds)
+ };
+
+ ConductorTOIController.prototype.pan = function (bounds) {
+ this.changeTOI(bounds)
+ };*/
+
+ ConductorTOIController.prototype.resize = function () {
+ //Do something
+ };
+
+ return ConductorTOIController;
+ }
+);
diff --git a/platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js b/platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js
index 176d1bbb2f..0a87141443 100644
--- a/platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js
+++ b/platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js
@@ -99,7 +99,6 @@ define(
// Watch scope for selection of mode or time system by user
this.$scope.$watch('modeModel.selectedKey', this.setMode);
this.conductorViewService.on('pan', this.pan);
-
this.conductorViewService.on('pan-stop', this.panStop);
this.$scope.$on('$destroy', this.destroy);