Fixes normalize.min.css

- Add as slightly renamed .scss file to avoid issues arising from
.gitignore excluding .css files;

src/plugins/clearData/components/globalClearIndicator.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="c-indicator c-indicator--clickable icon-clear-data s-status-caution">
         <span class="label c-indicator__label">
-            <button @click="globalClearEmit">Clear Data</button>
+            <button @click="globalClearEmit">Clear All Data</button>
         </span>
     </div>
 </template>

src/plugins/plot/res/templates/mct-plot.html

@@ -110,25 +110,25 @@
     </div>
 
     <div class="plot-wrapper-axis-and-display-area flex-elem grows">
-        <div class="gl-plot-axis-area gl-plot-y has-local-controls"
+        <div class="gl-plot-axis-area gl-plot-y"
              ng-style="{
                  width: (tickWidth + 30) + 'px'
              }">
 
-            <div class="gl-plot-label gl-plot-y-label"
-                ng-class="{'icon-gear': (yKeyOptions.length > 1 && series.length === 1)}"
-                ng-bind="yAxisLabel">
+            <div class="gl-plot-label gl-plot-y-label" ng-if="!yKeyOptions">
+                {{ yAxis.get('label') }}
             </div>
 
-            <select  class="gl-plot-y-label__select local-controls--hidden"
-                     ng-if="yKeyOptions.length > 1 && series.length === 1"
-                     ng-model="yAxisLabel" ng-change="plot.toggleYAxisLabel(yAxisLabel, yKeyOptions, series[0])">
-                <option ng-repeat="option in yKeyOptions"
-                        value="{{option.name}}"
-                        ng-selected="option.name === yAxisLabel">
-                    {{option.name}}
-                </option>
-            </select>
+            <div class="gl-plot-label gl-plot-y-label" ng-if="yKeyOptions.length > 1 && series.length === 1">
+                <select  class="gl-plot-y-label__select"
+                         ng-model="yAxisLabel" ng-change="plot.toggleYAxisLabel(yAxisLabel, yKeyOptions, series[0])">
+                    <option ng-repeat="option in yKeyOptions"
+                            value="{{option.name}}"
+                            ng-selected="option.name === yAxisLabel">
+                        {{option.name}}
+                    </option>
+                </select>
+            </div>
             
 
             <mct-ticks axis="yAxis">

src/plugins/plot/src/plot/MCTPlotController.js

@@ -526,7 +526,6 @@ define([
 
         if (yAxisObject) {
             series.emit('change:yKey', yAxisObject.key);
-            this.$scope.yAxisLabel = label;
         }
     };
 

src/plugins/plot/src/telemetry/PlotController.js

@@ -269,7 +269,7 @@ define([
 
     PlotController.prototype.clearData = function () {
         this.config.series.forEach(function (series) {
-            series.reset();
+            series.refresh();
         });
     };
 
@@ -277,18 +277,22 @@ define([
      * Export view as JPG.
      */
     PlotController.prototype.exportJPG = function () {
-        var plotElement = this.$element.children()[1];
-
-        this.exportImageService.exportJPG(plotElement, 'plot.jpg', 'export-plot');
+        this.hideExportButtons = true;
+        this.exportImageService.exportJPG(this.$element[0], 'plot.jpg', 'export-plot')
+            .finally(function () {
+                this.hideExportButtons = false;
+            }.bind(this));
     };
 
     /**
      * Export view as PNG.
      */
     PlotController.prototype.exportPNG = function () {
-        var plotElement = this.$element.children()[1];
-
-        this.exportImageService.exportPNG(plotElement, 'plot.png', 'export-plot');
+        this.hideExportButtons = true;
+        this.exportImageService.exportPNG(this.$element[0], 'plot.png', 'export-plot')
+            .finally(function () {
+                this.hideExportButtons = false;
+            }.bind(this));
     };
 
     PlotController.prototype.toggleCursorGuide = function ($event) {

src/plugins/telemetryTable/TelemetryTable.js

@@ -187,11 +187,6 @@ define([
             }
         }
 
-        clearData() {
-            this.filteredRows.clear();
-            this.boundedRows.clear();
-        }
-
         getColumnMapForObject(objectKeyString) {
             let columns = this.configuration.getColumns();
 

src/plugins/telemetryTable/TelemetryTableViewProvider.js

@@ -75,7 +75,7 @@ define([
                         component.isEditing = editMode;
                     },
                     onClearData() {
-                        table.clearData();
+                        table.refreshData();
                     },
                     destroy: function (element) {
                         component.$destroy();

src/plugins/telemetryTable/components/table-cell.vue

@@ -64,8 +64,7 @@ export default {
             return this.row.getFormattedValue(this.columnKey);
         },
         isSelectable() {
-            let column = this.row.columns[this.columnKey];
-            return column && column.selectable;
+            return this.row.columns[this.columnKey].selectable;
         }
     }
 };

src/plugins/telemetryTable/components/table.vue

@@ -87,7 +87,7 @@
                         ><span class="c-telemetry-table__headers__label">{{title}}</span>
                         </table-column-header>
                     </tr>
-                    <tr v-if="allowFiltering" class="c-telemetry-table__headers__filter">
+                    <tr class="c-telemetry-table__headers__filter">
                         <table-column-header
                             v-for="(title, key, headerIndex) in headers"
                             :key="key"

src/styles/_legacy-plots.scss

@@ -126,12 +126,6 @@ mct-plot {
             bottom: nth($plotDisplayArea, 3);
             left: 0;
             width: $plotYBarW;
-
-            &:hover {
-                .gl-plot-y-label__select {
-                    display: block;
-                }
-            }
         }
     }
 
@@ -168,27 +162,24 @@ mct-plot {
         }
 
         &.gl-plot-y-label {
-            display: block;
-            left: 0; top: 0; right: auto; bottom: 0;
-            padding-left: 5px;
-            text-orientation: mixed;
-            overflow: hidden;
-            writing-mode: vertical-lr;
-            &:before {
-                // Icon denoting configurability
-                margin-bottom: $interiorMargin; // Uses margin-bottom due to writing-mode
+            $x: -50%;
+            $r: -90deg;
+            transform-origin: 50% 0;
+            transform: translateX($x) rotate($r);
+            display: inline-block;
+            margin-left: $interiorMargin; // Kick off the left edge
+            left: 0;
+            top: 50%;
+            white-space: nowrap;
+
+            select {
+                background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10'%3e%3cpath fill='%23#{svgColorFromHex($colorSelectArw)}' d='M0 5l5 5V0L0 5z'/%3e%3c/svg%3e");
+                background-position: left .4em top 50%, 0 0;
+                padding: 1px $interiorMargin 1px 20px;
             }
         }
     }
 
-    .gl-plot-y-label__select {
-        position: absolute;
-        top: 50%;
-        transform: translateY(-50%);
-        left: 20px;
-        z-index: 10;
-    }
-
     .gl-plot-x-options,
     .gl-plot-y-options {
         $h: 24px;

src/ui/layout/Layout.vue

@@ -171,7 +171,7 @@
             [class*='__head__collapse-button'] {
                 align-self: start;
                 flex: 0 0 auto;
-                margin-top: 6px;
+                margin-top: 4px;
 
                 &:before {
                     content: $glyph-icon-arrow-down;
@@ -214,9 +214,9 @@
         &__create-button { margin-right: $interiorMarginLg; }
 
         &__indicators {
+            //@include test();
             flex: 1 1 auto;
             flex-wrap: wrap;
-            justify-content: flex-end;
             [class*='indicator-clock'] { order: 90; }
 
             .c-indicator .label {

src/ui/toolbar/components/toolbar-toggle-button.vue

@@ -2,7 +2,7 @@
     <div class="c-ctrl-wrapper">
         <div class="c-icon-button"
              :title="nextValue.title"
-             :class="[nextValue.icon, {'c-icon-button--mixed': nonSpecific}]"
+             :class="[nextValue.icon, {'c-click-icon--mixed': nonSpecific}]"
              @click="cycle">
         </div>
     </div>