From 7f7518bb9d90bf39939179e49306ebc256f9b39d Mon Sep 17 00:00:00 2001
From: Jamie Vigliotta <jamie.j.vigliotta@nasa.gov>
Date: Wed, 15 Jul 2020 10:47:03 -0700
Subject: [PATCH] added units to plots and plot legends

---
 src/plugins/plot/res/templates/mct-plot.html           | 10 +++++++++-
 .../plot/res/templates/plot-options-browse.html        |  1 +
 src/plugins/plot/res/templates/plot-options-edit.html  |  3 +++
 src/plugins/plot/src/configuration/LegendModel.js      |  3 ++-
 src/plugins/plot/src/configuration/PlotSeries.js       |  1 +
 .../plot/src/inspector/PlotLegendFormController.js     |  5 +++++
 6 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/plugins/plot/res/templates/mct-plot.html b/src/plugins/plot/res/templates/mct-plot.html
index c9d58c85bc..d2dc530f36 100644
--- a/src/plugins/plot/res/templates/mct-plot.html
+++ b/src/plugins/plot/res/templates/mct-plot.html
@@ -44,7 +44,7 @@
                               ng-style="{ 'background-color': series.get('color').asHexString() }">
                         </span>
                         <span class="is-missing__indicator" title="This item is missing"></span>
-                        <span class="plot-series-name">{{ series.get('name') }}</span>
+                        <span class="plot-series-name">{{ series.get('name') + (series.get('unit') ? ' ' + series.get('unit') : '')}}</span>
                     </div>
                     <div class="plot-series-value hover-value-enabled value-to-display-{{ legend.get('valueToShowWhenCollapsed') }} {{ series.closest.mctLimitState.cssClass }}"
                          ng-class="{ 'cursor-hover': (legend.get('valueToShowWhenCollapsed').indexOf('nearest') != -1) }"
@@ -74,6 +74,9 @@
                             <th ng-if="legend.get('showValueWhenExpanded')">
                                 Value
                             </th>
+                            <th ng-if="legend.get('showUnitsWhenExpanded')">
+                                Unit
+                            </th>
                             <th ng-if="legend.get('showMinimumWhenExpanded')"
                                 class="mobile-hide">
                                 Min
@@ -107,6 +110,11 @@
                                 {{ series.formatY(series.closest) }}
                             </span>
                         </td>
+                        <td ng-if="legend.get('showUnitsWhenExpanded')">
+                            <span class="plot-series-value cursor-hover hover-value-enabled">
+                                {{ series.get('unit') }}
+                            </span>
+                        </td>
                         <td ng-if="legend.get('showMinimumWhenExpanded')"
                             class="mobile-hide">
                             <span class="plot-series-value">
diff --git a/src/plugins/plot/res/templates/plot-options-browse.html b/src/plugins/plot/res/templates/plot-options-browse.html
index 4462b762dc..b8527859e0 100644
--- a/src/plugins/plot/res/templates/plot-options-browse.html
+++ b/src/plugins/plot/res/templates/plot-options-browse.html
@@ -135,6 +135,7 @@
                     <span ng-if="config.legend.get('showValueWhenExpanded')">Value</span>
                     <span ng-if="config.legend.get('showMinimumWhenExpanded')">Min</span>
                     <span ng-if="config.legend.get('showMaximumWhenExpanded')">Max</span>
+                    <span ng-if="config.legend.get('showUnitsWhenExpanded')">Units</span>
                 </div>
             </li>
         </ul>
diff --git a/src/plugins/plot/res/templates/plot-options-edit.html b/src/plugins/plot/res/templates/plot-options-edit.html
index be3fa00eaf..a46f6c7724 100644
--- a/src/plugins/plot/res/templates/plot-options-edit.html
+++ b/src/plugins/plot/res/templates/plot-options-edit.html
@@ -197,6 +197,7 @@
                         <option value="nearestValue">Nearest value</option>
                         <option value="min">Minimum value</option>
                         <option value="max">Maximum value</option>
+                        <option value="units">showUnitsWhenExpanded</option>
                     </select>
                 </div>
             </li>
@@ -213,6 +214,8 @@
                                    ng-model="form.showMinimumWhenExpanded"/> Minimum value</li>
                         <li><input type="checkbox"
                                    ng-model="form.showMaximumWhenExpanded"/> Maximum value</li>
+                        <li><input type="checkbox"
+                                    ng-model="form.showUnitsWhenExpanded"/> Units</li>
                     </ul>
 
                 </div>
diff --git a/src/plugins/plot/src/configuration/LegendModel.js b/src/plugins/plot/src/configuration/LegendModel.js
index fd13073292..6cc0749131 100644
--- a/src/plugins/plot/src/configuration/LegendModel.js
+++ b/src/plugins/plot/src/configuration/LegendModel.js
@@ -52,7 +52,8 @@ define([
                 showTimestampWhenExpanded: true,
                 showValueWhenExpanded: true,
                 showMaximumWhenExpanded: true,
-                showMinimumWhenExpanded: true
+                showMinimumWhenExpanded: true,
+                showUnitsWhenExpanded: true
             };
         }
     });
diff --git a/src/plugins/plot/src/configuration/PlotSeries.js b/src/plugins/plot/src/configuration/PlotSeries.js
index f49ed2bdbb..61251a1a48 100644
--- a/src/plugins/plot/src/configuration/PlotSeries.js
+++ b/src/plugins/plot/src/configuration/PlotSeries.js
@@ -101,6 +101,7 @@ define([
             var range = this.metadata.valuesForHints(['range'])[0];
             return {
                 name: options.domainObject.name,
+                unit: range.unit || '',
                 xKey: options.collection.plot.xAxis.get('key'),
                 yKey: range.key,
                 markers: true,
diff --git a/src/plugins/plot/src/inspector/PlotLegendFormController.js b/src/plugins/plot/src/inspector/PlotLegendFormController.js
index adb8b86c4f..6832a2e7c6 100644
--- a/src/plugins/plot/src/inspector/PlotLegendFormController.js
+++ b/src/plugins/plot/src/inspector/PlotLegendFormController.js
@@ -60,6 +60,11 @@ define([
                 modelProp: 'showMinimumWhenExpanded',
                 coerce: Boolean,
                 objectPath: 'configuration.legend.showMinimumWhenExpanded'
+            },
+            {
+                modelProp: 'showUnitsWhenExpanded',
+                coerce: Boolean,
+                objectPath: 'configuration.legend.showUnitsWhenExpanded'
             }
         ]
     });