Compare commits

..

5 Commits

Author SHA1 Message Date
Deep Tailor
1205e6977c enable import-export 2019-12-11 11:31:37 -08:00
Deep Tailor
cee8b5ce1f port minmax filter fix to vista-4.3.0 2019-12-11 10:49:20 -08:00
Deep Tailor
8d45d86d7a fix bugs caused by shouldUseMinMax reported by VISTA 2019-12-03 15:41:11 -08:00
Nikhil
fab8bb516a Plot label height adjustment. (#2524)
* Plot label height adjustment.

* initialize xaxis label.

* Plot label height adjustment.

* initialize xaxis label.

* Fixes incorrect width applied to the plot's X axis wrapper
2019-10-30 18:09:56 -07:00
Joel McKinnon
6d526eaf42 Fix lint errors (#2520)
* Fixed linting errors
* Disabled broken test
2019-10-29 15:49:55 -07:00
6 changed files with 13 additions and 26 deletions

View File

@@ -72,6 +72,8 @@ define([
]
}
});
openmct.legacyRegistry.enable('platform/import-export');
};
};
});

View File

@@ -214,11 +214,7 @@
</div>
</div>
<div class="gl-plot-axis-area gl-plot-x"
ng-style="{
left: (tickWidth - 30) + 'px'
}">
<div class="gl-plot-axis-area gl-plot-x">
<mct-ticks axis="xAxis">
<div ng-repeat="tick in ticks track by tick.value"
class="gl-plot-tick gl-plot-x-tick-label"

View File

@@ -140,8 +140,14 @@ define([
* @returns {Promise}
*/
fetch: function (options) {
const strategy = options.shouldUseMinMax ? 'minMax' : undefined;
let strategy;
if (this.model.interpolate !== 'none') {
strategy = 'minMax';
}
options = _.extend({}, { size: 1000, strategy, filters: this.filters }, options || {});
if (!this.unsubscribe) {
this.unsubscribe = this.openmct
.telemetry
@@ -378,19 +384,6 @@ define([
delete this.unsubscribe;
}
this.fetch();
},
/**
* Clears the plot series, unsubscribes and resubscribes
* @public
*/
refresh: function () {
this.reset();
if (this.unsubscribe) {
this.unsubscribe();
delete this.unsubscribe;
}
this.fetch();
}
});

View File

@@ -31,6 +31,7 @@ define([
var XAxisModel = Model.extend({
initialize: function (options) {
this.plot = options.plot;
this.set('label', options.model.name || '');
this.on('change:range', function (newValue, oldValue, model) {
if (!model.get('frozen')) {
model.set('displayRange', newValue);

View File

@@ -102,8 +102,7 @@ define([
this.startLoading();
var options = {
size: this.$element[0].offsetWidth,
domain: this.config.xAxis.get('key'),
shouldUseMinMax: this.shouldUseMinMax(series)
domain: this.config.xAxis.get('key')
};
series.load(options)
@@ -161,10 +160,6 @@ define([
return config;
};
PlotController.prototype.shouldUseMinMax = function (series) {
return series.model.interpolate !== 'none';
};
PlotController.prototype.onTimeSystemChange = function (timeSystem) {
this.config.xAxis.set('key', timeSystem.key);
};

View File

@@ -56,7 +56,7 @@ $tabularTdPadTB: 2px;
$plotYBarW: 60px;
$plotYLabelMinH: 20px;
$plotYLabelW: 10px;
$plotXBarH: 20px;
$plotXBarH: 35px;
$plotLegendH: 20px;
$plotSwatchD: 8px;
$plotDisplayArea: (0, 0, $plotXBarH, $plotYBarW); // 1: Top, 2: right, 3: bottom, 4: left