From 605eeff9d76c96b41f760820a464f37ef66e9a51 Mon Sep 17 00:00:00 2001 From: Shefali Joshi Date: Thu, 20 May 2021 09:08:50 -0700 Subject: [PATCH] Plots - remove legacy code (#3814) * Remove Lecacy plot code * Adds tests for plots inspector * Set range max and min to undefined instead of 0 --- index.html | 1 - src/adapter/bundle.js | 13 +- .../services/ExportImageService.js | 0 .../views/TypeInspectorViewProvider.js | 7 - src/api/objects/ObjectAPI.js | 6 + .../plot/{vue/single => }/LinearScale.js | 0 src/plugins/plot/{vue/single => }/MctPlot.vue | 3 +- .../plot/{vue/single => }/MctTicks.vue | 0 src/plugins/plot/{vue/single => }/Plot.vue | 0 .../plot/{vue/single => }/PlotViewProvider.js | 2 +- .../plot/{vue/single => }/axis/XAxis.vue | 0 .../plot/{vue/single => }/axis/YAxis.vue | 0 .../chart/MCTChartAlarmPointSet.js | 0 .../single => }/chart/MCTChartLineLinear.js | 0 .../chart/MCTChartLineStepAfter.js | 0 .../single => }/chart/MCTChartPointSet.js | 0 .../chart/MCTChartSeriesElement.js | 0 .../plot/{vue/single => }/chart/MctChart.vue | 0 .../single => }/configuration/Collection.js | 0 .../single => }/configuration/LegendModel.js | 0 .../{vue/single => }/configuration/Model.js | 0 .../configuration/PlotConfigurationModel.js | 0 .../single => }/configuration/PlotSeries.js | 0 .../configuration/SeriesCollection.js | 0 .../single => }/configuration/XAxisModel.js | 0 .../single => }/configuration/YAxisModel.js | 1 - .../single => }/configuration/configStore.js | 0 .../plot/{vue/single => }/draw/Draw2D.js | 0 .../plot/{vue/single => }/draw/DrawLoader.js | 0 .../plot/{vue/single => }/draw/DrawWebGL.js | 0 .../{vue/single => }/draw/MarkerShapes.js | 0 .../plot/{vue => }/inspector/PlotOptions.vue | 4 +- .../{vue => }/inspector/PlotOptionsBrowse.vue | 17 +- .../{vue => }/inspector/PlotOptionsEdit.vue | 18 +- .../{vue => }/inspector/PlotOptionsItem.vue | 25 +- .../inspector/PlotsInspectorViewProvider.js | 15 +- .../{vue => }/inspector/forms/LegendForm.vue | 2 +- .../{vue => }/inspector/forms/SeriesForm.vue | 24 +- .../{vue => }/inspector/forms/YAxisForm.vue | 5 +- .../{vue => }/inspector/forms/formUtil.js | 0 .../{vue/single => }/legend/PlotLegend.vue | 0 .../legend/PlotLegendItemCollapsed.vue | 0 .../legend/PlotLegendItemExpanded.vue | 0 .../plot/{vue/single => }/lib/Color.js | 0 .../plot/{vue/single => }/lib/ColorHelper.js | 0 .../plot/{vue/single => }/lib/ColorPalette.js | 0 .../plot/{vue/single => }/lib/eventHelpers.js | 0 .../OverlayPlotCompositionPolicy.js | 29 + .../overlayPlot/OverlayPlotViewProvider.js | 6 +- src/plugins/plot/plugin.js | 298 ++------- .../plot/{vue/single => }/pluginSpec.js | 8 +- src/plugins/plot/res/templates/mct-plot.html | 279 -------- .../res/templates/plot-options-browse.html | 148 ----- .../plot/res/templates/plot-options-edit.html | 229 ------- .../plot/res/templates/plot-options.html | 31 - src/plugins/plot/res/templates/plot.html | 58 -- .../plot/res/templates/stacked-plot.html | 65 -- src/plugins/plot/src/PlotViewPolicy.js | 68 -- .../plot/src/chart/MCTChartAlarmPointSet.js | 74 --- .../plot/src/chart/MCTChartController.js | 441 ------------- .../plot/src/chart/MCTChartDirective.js | 67 -- .../plot/src/chart/MCTChartLineLinear.js | 39 -- .../plot/src/chart/MCTChartLineStepAfter.js | 79 --- .../plot/src/chart/MCTChartPointSet.js | 39 -- .../plot/src/chart/MCTChartSeriesElement.js | 164 ----- .../plot/src/configuration/Collection.js | 130 ---- .../plot/src/configuration/LegendModel.js | 63 -- src/plugins/plot/src/configuration/Model.js | 103 --- .../configuration/PlotConfigurationModel.js | 152 ----- .../plot/src/configuration/PlotSeries.js | 469 ------------- .../src/configuration/SeriesCollection.js | 174 ----- .../plot/src/configuration/XAxisModel.js | 97 --- .../plot/src/configuration/YAxisModel.js | 244 ------- .../plot/src/configuration/configStore.js | 48 -- src/plugins/plot/src/draw/Draw2D.js | 163 ----- src/plugins/plot/src/draw/DrawLoader.js | 110 ---- src/plugins/plot/src/draw/DrawWebGL.js | 307 --------- src/plugins/plot/src/draw/MarkerShapes.js | 90 --- .../src/inspector/HideElementPoolDirective.js | 55 -- .../plot/src/inspector/InspectorRegion.js | 67 -- .../plot/src/inspector/PlotBrowseRegion.js | 41 -- .../plot/src/inspector/PlotEditRegion.js | 39 -- .../plot/src/inspector/PlotInspector.js | 39 -- .../src/inspector/PlotLegendFormController.js | 79 --- .../src/inspector/PlotModelFormController.js | 181 ----- .../src/inspector/PlotOptionsController.js | 93 --- .../src/inspector/PlotSeriesFormController.js | 139 ---- .../src/inspector/PlotYAxisFormController.js | 104 --- src/plugins/plot/src/inspector/Region.js | 99 --- src/plugins/plot/src/lib/color.js | 208 ------ src/plugins/plot/src/lib/eventHelpers.js | 104 --- src/plugins/plot/src/lib/extend.js | 70 -- src/plugins/plot/src/plot/LinearScale.js | 88 --- .../plot/src/plot/MCTPlotController.js | 616 ------------------ src/plugins/plot/src/plot/MCTPlotDirective.js | 46 -- .../plot/src/plot/MCTTicksController.js | 279 -------- .../plot/src/plot/MCTTicksDirective.js | 43 -- .../plot/src/telemetry/MCTOverlayPlot.js | 37 -- .../plot/src/telemetry/PlotController.js | 342 ---------- .../src/telemetry/StackedPlotController.js | 167 ----- .../{vue => }/stackedPlot/StackedPlot.vue | 4 +- .../StackedPlotCompositionPolicy.js | 30 + .../{vue => }/stackedPlot/StackedPlotItem.vue | 4 +- .../stackedPlot/StackedPlotViewProvider.js | 4 +- .../plot/{vue/single => }/tickUtils.js | 11 +- src/plugins/plot/vue/single/plugin.js | 36 - src/plugins/plugins.js | 5 +- src/plugins/timeline/TimelineObjectView.vue | 1 - src/plugins/timeline/TimelineViewLayout.vue | 14 - 109 files changed, 206 insertions(+), 7254 deletions(-) rename src/{plugins/plot/src => adapter}/services/ExportImageService.js (100%) rename src/plugins/plot/{vue/single => }/LinearScale.js (100%) rename src/plugins/plot/{vue/single => }/MctPlot.vue (99%) rename src/plugins/plot/{vue/single => }/MctTicks.vue (100%) rename src/plugins/plot/{vue/single => }/Plot.vue (100%) rename src/plugins/plot/{vue/single => }/PlotViewProvider.js (97%) rename src/plugins/plot/{vue/single => }/axis/XAxis.vue (100%) rename src/plugins/plot/{vue/single => }/axis/YAxis.vue (100%) rename src/plugins/plot/{vue/single => }/chart/MCTChartAlarmPointSet.js (100%) rename src/plugins/plot/{vue/single => }/chart/MCTChartLineLinear.js (100%) rename src/plugins/plot/{vue/single => }/chart/MCTChartLineStepAfter.js (100%) rename src/plugins/plot/{vue/single => }/chart/MCTChartPointSet.js (100%) rename src/plugins/plot/{vue/single => }/chart/MCTChartSeriesElement.js (100%) rename src/plugins/plot/{vue/single => }/chart/MctChart.vue (100%) rename src/plugins/plot/{vue/single => }/configuration/Collection.js (100%) rename src/plugins/plot/{vue/single => }/configuration/LegendModel.js (100%) rename src/plugins/plot/{vue/single => }/configuration/Model.js (100%) rename src/plugins/plot/{vue/single => }/configuration/PlotConfigurationModel.js (100%) rename src/plugins/plot/{vue/single => }/configuration/PlotSeries.js (100%) rename src/plugins/plot/{vue/single => }/configuration/SeriesCollection.js (100%) rename src/plugins/plot/{vue/single => }/configuration/XAxisModel.js (100%) rename src/plugins/plot/{vue/single => }/configuration/YAxisModel.js (99%) rename src/plugins/plot/{vue/single => }/configuration/configStore.js (100%) rename src/plugins/plot/{vue/single => }/draw/Draw2D.js (100%) rename src/plugins/plot/{vue/single => }/draw/DrawLoader.js (100%) rename src/plugins/plot/{vue/single => }/draw/DrawWebGL.js (100%) rename src/plugins/plot/{vue/single => }/draw/MarkerShapes.js (100%) rename src/plugins/plot/{vue => }/inspector/PlotOptions.vue (91%) rename src/plugins/plot/{vue => }/inspector/PlotOptionsBrowse.vue (96%) rename src/plugins/plot/{vue => }/inspector/PlotOptionsEdit.vue (83%) rename src/plugins/plot/{vue => }/inspector/PlotOptionsItem.vue (87%) rename src/plugins/plot/{vue => }/inspector/PlotsInspectorViewProvider.js (78%) rename src/plugins/plot/{vue => }/inspector/forms/LegendForm.vue (98%) rename src/plugins/plot/{vue => }/inspector/forms/SeriesForm.vue (94%) rename src/plugins/plot/{vue => }/inspector/forms/YAxisForm.vue (98%) rename src/plugins/plot/{vue => }/inspector/forms/formUtil.js (100%) rename src/plugins/plot/{vue/single => }/legend/PlotLegend.vue (100%) rename src/plugins/plot/{vue/single => }/legend/PlotLegendItemCollapsed.vue (100%) rename src/plugins/plot/{vue/single => }/legend/PlotLegendItemExpanded.vue (100%) rename src/plugins/plot/{vue/single => }/lib/Color.js (100%) rename src/plugins/plot/{vue/single => }/lib/ColorHelper.js (100%) rename src/plugins/plot/{vue/single => }/lib/ColorPalette.js (100%) rename src/plugins/plot/{vue/single => }/lib/eventHelpers.js (100%) create mode 100644 src/plugins/plot/overlayPlot/OverlayPlotCompositionPolicy.js rename src/plugins/plot/{vue => }/overlayPlot/OverlayPlotViewProvider.js (92%) rename src/plugins/plot/{vue/single => }/pluginSpec.js (99%) delete mode 100644 src/plugins/plot/res/templates/mct-plot.html delete mode 100644 src/plugins/plot/res/templates/plot-options-browse.html delete mode 100644 src/plugins/plot/res/templates/plot-options-edit.html delete mode 100644 src/plugins/plot/res/templates/plot-options.html delete mode 100644 src/plugins/plot/res/templates/plot.html delete mode 100644 src/plugins/plot/res/templates/stacked-plot.html delete mode 100644 src/plugins/plot/src/PlotViewPolicy.js delete mode 100644 src/plugins/plot/src/chart/MCTChartAlarmPointSet.js delete mode 100644 src/plugins/plot/src/chart/MCTChartController.js delete mode 100644 src/plugins/plot/src/chart/MCTChartDirective.js delete mode 100644 src/plugins/plot/src/chart/MCTChartLineLinear.js delete mode 100644 src/plugins/plot/src/chart/MCTChartLineStepAfter.js delete mode 100644 src/plugins/plot/src/chart/MCTChartPointSet.js delete mode 100644 src/plugins/plot/src/chart/MCTChartSeriesElement.js delete mode 100644 src/plugins/plot/src/configuration/Collection.js delete mode 100644 src/plugins/plot/src/configuration/LegendModel.js delete mode 100644 src/plugins/plot/src/configuration/Model.js delete mode 100644 src/plugins/plot/src/configuration/PlotConfigurationModel.js delete mode 100644 src/plugins/plot/src/configuration/PlotSeries.js delete mode 100644 src/plugins/plot/src/configuration/SeriesCollection.js delete mode 100644 src/plugins/plot/src/configuration/XAxisModel.js delete mode 100644 src/plugins/plot/src/configuration/YAxisModel.js delete mode 100644 src/plugins/plot/src/configuration/configStore.js delete mode 100644 src/plugins/plot/src/draw/Draw2D.js delete mode 100644 src/plugins/plot/src/draw/DrawLoader.js delete mode 100644 src/plugins/plot/src/draw/DrawWebGL.js delete mode 100644 src/plugins/plot/src/draw/MarkerShapes.js delete mode 100644 src/plugins/plot/src/inspector/HideElementPoolDirective.js delete mode 100644 src/plugins/plot/src/inspector/InspectorRegion.js delete mode 100644 src/plugins/plot/src/inspector/PlotBrowseRegion.js delete mode 100644 src/plugins/plot/src/inspector/PlotEditRegion.js delete mode 100644 src/plugins/plot/src/inspector/PlotInspector.js delete mode 100644 src/plugins/plot/src/inspector/PlotLegendFormController.js delete mode 100644 src/plugins/plot/src/inspector/PlotModelFormController.js delete mode 100644 src/plugins/plot/src/inspector/PlotOptionsController.js delete mode 100644 src/plugins/plot/src/inspector/PlotSeriesFormController.js delete mode 100644 src/plugins/plot/src/inspector/PlotYAxisFormController.js delete mode 100644 src/plugins/plot/src/inspector/Region.js delete mode 100644 src/plugins/plot/src/lib/color.js delete mode 100644 src/plugins/plot/src/lib/eventHelpers.js delete mode 100644 src/plugins/plot/src/lib/extend.js delete mode 100644 src/plugins/plot/src/plot/LinearScale.js delete mode 100644 src/plugins/plot/src/plot/MCTPlotController.js delete mode 100644 src/plugins/plot/src/plot/MCTPlotDirective.js delete mode 100644 src/plugins/plot/src/plot/MCTTicksController.js delete mode 100644 src/plugins/plot/src/plot/MCTTicksDirective.js delete mode 100644 src/plugins/plot/src/telemetry/MCTOverlayPlot.js delete mode 100644 src/plugins/plot/src/telemetry/PlotController.js delete mode 100644 src/plugins/plot/src/telemetry/StackedPlotController.js rename src/plugins/plot/{vue => }/stackedPlot/StackedPlot.vue (97%) create mode 100644 src/plugins/plot/stackedPlot/StackedPlotCompositionPolicy.js rename src/plugins/plot/{vue => }/stackedPlot/StackedPlotItem.vue (89%) rename src/plugins/plot/{vue => }/stackedPlot/StackedPlotViewProvider.js (93%) rename src/plugins/plot/{vue/single => }/tickUtils.js (91%) delete mode 100644 src/plugins/plot/vue/single/plugin.js diff --git a/index.html b/index.html index 916c24d1f2..3a69c14d0b 100644 --- a/index.html +++ b/index.html @@ -88,7 +88,6 @@ openmct.install(openmct.plugins.ExampleImagery()); openmct.install(openmct.plugins.PlanLayout()); openmct.install(openmct.plugins.Timeline()); - openmct.install(openmct.plugins.PlotVue()); openmct.install(openmct.plugins.UTCTimeSystem()); openmct.install(openmct.plugins.AutoflowView({ type: "telemetry.panel" diff --git a/src/adapter/bundle.js b/src/adapter/bundle.js index 0fc7c2d110..894e8df910 100644 --- a/src/adapter/bundle.js +++ b/src/adapter/bundle.js @@ -36,7 +36,8 @@ define([ './views/installLegacyViews', './policies/LegacyCompositionPolicyAdapter', './actions/LegacyActionAdapter', - './services/LegacyPersistenceAdapter' + './services/LegacyPersistenceAdapter', + './services/ExportImageService' ], function ( ActionDialogDecorator, AdapterCapability, @@ -53,7 +54,8 @@ define([ installLegacyViews, legacyCompositionPolicyAdapter, LegacyActionAdapter, - LegacyPersistenceAdapter + LegacyPersistenceAdapter, + ExportImageService ) { return { name: 'src/adapter', @@ -82,6 +84,13 @@ define([ "identifierService", "cacheService" ] + }, + { + "key": "exportImageService", + "implementation": ExportImageService, + "depends": [ + "dialogService" + ] } ], components: [ diff --git a/src/plugins/plot/src/services/ExportImageService.js b/src/adapter/services/ExportImageService.js similarity index 100% rename from src/plugins/plot/src/services/ExportImageService.js rename to src/adapter/services/ExportImageService.js diff --git a/src/adapter/views/TypeInspectorViewProvider.js b/src/adapter/views/TypeInspectorViewProvider.js index 86aa9f2f9f..6ff740e703 100644 --- a/src/adapter/views/TypeInspectorViewProvider.js +++ b/src/adapter/views/TypeInspectorViewProvider.js @@ -24,13 +24,6 @@ define([ return false; } - //TODO: Remove this when plots Angular implementation is deprecated - let parent = selection[0].length > 1 && selection[0][1].context.item; - if (parent && parent.type === 'time-strip') { - return (selectionContext.item.type === typeDefinition.key) - && (typeDefinition.key !== 'telemetry.plot.overlay'); - } - return selectionContext.item.type === typeDefinition.key; }, view: function (selection) { diff --git a/src/api/objects/ObjectAPI.js b/src/api/objects/ObjectAPI.js index a19ad50f82..d383a2e746 100644 --- a/src/api/objects/ObjectAPI.js +++ b/src/api/objects/ObjectAPI.js @@ -486,6 +486,12 @@ ObjectAPI.prototype.getOriginalPath = function (identifier, path = []) { }); }; +ObjectAPI.prototype.isObjectPathToALink = function (domainObject, objectPath) { + return objectPath !== undefined + && objectPath.length > 1 + && domainObject.location !== this.makeKeyString(objectPath[1].identifier); +}; + /** * Uniquely identifies a domain object. * diff --git a/src/plugins/plot/vue/single/LinearScale.js b/src/plugins/plot/LinearScale.js similarity index 100% rename from src/plugins/plot/vue/single/LinearScale.js rename to src/plugins/plot/LinearScale.js diff --git a/src/plugins/plot/vue/single/MctPlot.vue b/src/plugins/plot/MctPlot.vue similarity index 99% rename from src/plugins/plot/vue/single/MctPlot.vue rename to src/plugins/plot/MctPlot.vue index 15315f0478..0459840b33 100644 --- a/src/plugins/plot/vue/single/MctPlot.vue +++ b/src/plugins/plot/MctPlot.vue @@ -65,8 +65,7 @@
- diff --git a/src/plugins/plot/vue/single/MctTicks.vue b/src/plugins/plot/MctTicks.vue similarity index 100% rename from src/plugins/plot/vue/single/MctTicks.vue rename to src/plugins/plot/MctTicks.vue diff --git a/src/plugins/plot/vue/single/Plot.vue b/src/plugins/plot/Plot.vue similarity index 100% rename from src/plugins/plot/vue/single/Plot.vue rename to src/plugins/plot/Plot.vue diff --git a/src/plugins/plot/vue/single/PlotViewProvider.js b/src/plugins/plot/PlotViewProvider.js similarity index 97% rename from src/plugins/plot/vue/single/PlotViewProvider.js rename to src/plugins/plot/PlotViewProvider.js index f0446d26ce..239450f83b 100644 --- a/src/plugins/plot/vue/single/PlotViewProvider.js +++ b/src/plugins/plot/PlotViewProvider.js @@ -48,7 +48,7 @@ export default function PlotViewProvider(openmct) { name: 'Plot', cssClass: 'icon-telemetry', canView(domainObject, objectPath) { - return isCompactView(objectPath) && hasTelemetry(domainObject, openmct); + return hasTelemetry(domainObject, openmct); }, view: function (domainObject, objectPath) { diff --git a/src/plugins/plot/vue/single/axis/XAxis.vue b/src/plugins/plot/axis/XAxis.vue similarity index 100% rename from src/plugins/plot/vue/single/axis/XAxis.vue rename to src/plugins/plot/axis/XAxis.vue diff --git a/src/plugins/plot/vue/single/axis/YAxis.vue b/src/plugins/plot/axis/YAxis.vue similarity index 100% rename from src/plugins/plot/vue/single/axis/YAxis.vue rename to src/plugins/plot/axis/YAxis.vue diff --git a/src/plugins/plot/vue/single/chart/MCTChartAlarmPointSet.js b/src/plugins/plot/chart/MCTChartAlarmPointSet.js similarity index 100% rename from src/plugins/plot/vue/single/chart/MCTChartAlarmPointSet.js rename to src/plugins/plot/chart/MCTChartAlarmPointSet.js diff --git a/src/plugins/plot/vue/single/chart/MCTChartLineLinear.js b/src/plugins/plot/chart/MCTChartLineLinear.js similarity index 100% rename from src/plugins/plot/vue/single/chart/MCTChartLineLinear.js rename to src/plugins/plot/chart/MCTChartLineLinear.js diff --git a/src/plugins/plot/vue/single/chart/MCTChartLineStepAfter.js b/src/plugins/plot/chart/MCTChartLineStepAfter.js similarity index 100% rename from src/plugins/plot/vue/single/chart/MCTChartLineStepAfter.js rename to src/plugins/plot/chart/MCTChartLineStepAfter.js diff --git a/src/plugins/plot/vue/single/chart/MCTChartPointSet.js b/src/plugins/plot/chart/MCTChartPointSet.js similarity index 100% rename from src/plugins/plot/vue/single/chart/MCTChartPointSet.js rename to src/plugins/plot/chart/MCTChartPointSet.js diff --git a/src/plugins/plot/vue/single/chart/MCTChartSeriesElement.js b/src/plugins/plot/chart/MCTChartSeriesElement.js similarity index 100% rename from src/plugins/plot/vue/single/chart/MCTChartSeriesElement.js rename to src/plugins/plot/chart/MCTChartSeriesElement.js diff --git a/src/plugins/plot/vue/single/chart/MctChart.vue b/src/plugins/plot/chart/MctChart.vue similarity index 100% rename from src/plugins/plot/vue/single/chart/MctChart.vue rename to src/plugins/plot/chart/MctChart.vue diff --git a/src/plugins/plot/vue/single/configuration/Collection.js b/src/plugins/plot/configuration/Collection.js similarity index 100% rename from src/plugins/plot/vue/single/configuration/Collection.js rename to src/plugins/plot/configuration/Collection.js diff --git a/src/plugins/plot/vue/single/configuration/LegendModel.js b/src/plugins/plot/configuration/LegendModel.js similarity index 100% rename from src/plugins/plot/vue/single/configuration/LegendModel.js rename to src/plugins/plot/configuration/LegendModel.js diff --git a/src/plugins/plot/vue/single/configuration/Model.js b/src/plugins/plot/configuration/Model.js similarity index 100% rename from src/plugins/plot/vue/single/configuration/Model.js rename to src/plugins/plot/configuration/Model.js diff --git a/src/plugins/plot/vue/single/configuration/PlotConfigurationModel.js b/src/plugins/plot/configuration/PlotConfigurationModel.js similarity index 100% rename from src/plugins/plot/vue/single/configuration/PlotConfigurationModel.js rename to src/plugins/plot/configuration/PlotConfigurationModel.js diff --git a/src/plugins/plot/vue/single/configuration/PlotSeries.js b/src/plugins/plot/configuration/PlotSeries.js similarity index 100% rename from src/plugins/plot/vue/single/configuration/PlotSeries.js rename to src/plugins/plot/configuration/PlotSeries.js diff --git a/src/plugins/plot/vue/single/configuration/SeriesCollection.js b/src/plugins/plot/configuration/SeriesCollection.js similarity index 100% rename from src/plugins/plot/vue/single/configuration/SeriesCollection.js rename to src/plugins/plot/configuration/SeriesCollection.js diff --git a/src/plugins/plot/vue/single/configuration/XAxisModel.js b/src/plugins/plot/configuration/XAxisModel.js similarity index 100% rename from src/plugins/plot/vue/single/configuration/XAxisModel.js rename to src/plugins/plot/configuration/XAxisModel.js diff --git a/src/plugins/plot/vue/single/configuration/YAxisModel.js b/src/plugins/plot/configuration/YAxisModel.js similarity index 99% rename from src/plugins/plot/vue/single/configuration/YAxisModel.js rename to src/plugins/plot/configuration/YAxisModel.js index cc808f296c..6285c63e60 100644 --- a/src/plugins/plot/vue/single/configuration/YAxisModel.js +++ b/src/plugins/plot/configuration/YAxisModel.js @@ -166,7 +166,6 @@ export default class YAxisModel extends Model { * Update yAxis format, values, and label from known series. */ updateFromSeries(series) { - this.unset('displayRange'); const plotModel = this.plot.get('domainObject'); const label = _.get(plotModel, 'configuration.yAxis.label'); const sampleSeries = series.first(); diff --git a/src/plugins/plot/vue/single/configuration/configStore.js b/src/plugins/plot/configuration/configStore.js similarity index 100% rename from src/plugins/plot/vue/single/configuration/configStore.js rename to src/plugins/plot/configuration/configStore.js diff --git a/src/plugins/plot/vue/single/draw/Draw2D.js b/src/plugins/plot/draw/Draw2D.js similarity index 100% rename from src/plugins/plot/vue/single/draw/Draw2D.js rename to src/plugins/plot/draw/Draw2D.js diff --git a/src/plugins/plot/vue/single/draw/DrawLoader.js b/src/plugins/plot/draw/DrawLoader.js similarity index 100% rename from src/plugins/plot/vue/single/draw/DrawLoader.js rename to src/plugins/plot/draw/DrawLoader.js diff --git a/src/plugins/plot/vue/single/draw/DrawWebGL.js b/src/plugins/plot/draw/DrawWebGL.js similarity index 100% rename from src/plugins/plot/vue/single/draw/DrawWebGL.js rename to src/plugins/plot/draw/DrawWebGL.js diff --git a/src/plugins/plot/vue/single/draw/MarkerShapes.js b/src/plugins/plot/draw/MarkerShapes.js similarity index 100% rename from src/plugins/plot/vue/single/draw/MarkerShapes.js rename to src/plugins/plot/draw/MarkerShapes.js diff --git a/src/plugins/plot/vue/inspector/PlotOptions.vue b/src/plugins/plot/inspector/PlotOptions.vue similarity index 91% rename from src/plugins/plot/vue/inspector/PlotOptions.vue rename to src/plugins/plot/inspector/PlotOptions.vue index 20fd584197..0aa28000bd 100644 --- a/src/plugins/plot/vue/inspector/PlotOptions.vue +++ b/src/plugins/plot/inspector/PlotOptions.vue @@ -31,8 +31,8 @@