remove percentile plot
Eventually we want to only support what is now called aggregate, but not have to implement different plot types. So instead of supporting percentile plots for dashboards I removed them. You can still get percentile plots together with the scatter plot.
This commit is contained in:
@@ -19,7 +19,6 @@ import org.lucares.pdb.datastore.Proposal;
|
||||
import org.lucares.pdb.plot.api.AxisScale;
|
||||
import org.lucares.pdb.plot.api.Limit;
|
||||
import org.lucares.pdb.plot.api.PlotSettings;
|
||||
import org.lucares.pdb.plot.api.PlotType;
|
||||
import org.lucares.pdbui.domain.Aggregate;
|
||||
import org.lucares.pdbui.domain.AutocompleteProposal;
|
||||
import org.lucares.pdbui.domain.AutocompleteProposalByValue;
|
||||
@@ -160,7 +159,6 @@ public class PdbController implements HardcodedValues, PropertyKeys {
|
||||
@RequestParam(name = "dateFrom", defaultValue = "") final String dateFrom,
|
||||
@RequestParam(name = "dateRange", defaultValue = "1 week") final String dateRange,
|
||||
@RequestParam(name = "axisScale", defaultValue = "LINEAR") final AxisScale axisScale,
|
||||
@RequestParam(name = "plotType", defaultValue = "SCATTER") final PlotType plotType,
|
||||
@RequestParam(name = "aggregate", defaultValue = "NONE") final Aggregate aggregate,
|
||||
@RequestParam(name = "keyOutside", defaultValue = "false") final boolean keyOutside,
|
||||
@RequestParam(name = "width", defaultValue = "1920") final int hidth,
|
||||
@@ -181,7 +179,6 @@ public class PdbController implements HardcodedValues, PropertyKeys {
|
||||
plotSettings.setDateFrom(dateFrom);
|
||||
plotSettings.setDateRange(dateRange);
|
||||
plotSettings.setYAxisScale(axisScale);
|
||||
plotSettings.setPlotType(plotType);
|
||||
plotSettings.setAggregate(PlotSettingsTransformer.toAggregateInternal(aggregate));
|
||||
plotSettings.setKeyOutside(keyOutside);
|
||||
plotSettings.setGenerateThumbnail(false);
|
||||
|
||||
@@ -21,7 +21,6 @@ class PlotSettingsTransformer {
|
||||
result.setDateFrom(request.getDateFrom());
|
||||
result.setDateRange(request.getDateRange());
|
||||
result.setYAxisScale(request.getAxisScale());
|
||||
result.setPlotType(request.getPlotType());
|
||||
result.setAggregate(toAggregateInternal(request.getAggregate()));
|
||||
result.setKeyOutside(request.isKeyOutside());
|
||||
result.setThumbnailMaxWidth(request.getThumbnailMaxWidth());
|
||||
|
||||
@@ -4,7 +4,6 @@ import java.util.List;
|
||||
|
||||
import org.lucares.pdb.plot.api.AxisScale;
|
||||
import org.lucares.pdb.plot.api.Limit;
|
||||
import org.lucares.pdb.plot.api.PlotType;
|
||||
|
||||
public class PlotRequest {
|
||||
private String query;
|
||||
@@ -29,8 +28,6 @@ public class PlotRequest {
|
||||
|
||||
private String dateRange;
|
||||
|
||||
private PlotType plotType = PlotType.SCATTER;
|
||||
|
||||
private Aggregate aggregate = Aggregate.NONE;
|
||||
|
||||
private boolean keyOutside;
|
||||
@@ -133,14 +130,6 @@ public class PlotRequest {
|
||||
this.yAxis = yAxis;
|
||||
}
|
||||
|
||||
public PlotType getPlotType() {
|
||||
return plotType;
|
||||
}
|
||||
|
||||
public void setPlotType(final PlotType plotType) {
|
||||
this.plotType = plotType;
|
||||
}
|
||||
|
||||
public void setAggregate(final Aggregate aggregate) {
|
||||
this.aggregate = aggregate;
|
||||
}
|
||||
|
||||
@@ -594,7 +594,6 @@ Vue.component('search-bar', {
|
||||
'dateFrom': data.searchBar.dateFrom,
|
||||
'dateRange': data.searchBar.dateRange,
|
||||
'axisScale': data.searchBar.axisScale,
|
||||
'plotType': data.searchBar.plotType,
|
||||
'aggregate': data.searchBar.aggregate,
|
||||
'keyOutside': data.searchBar.keyOutside,
|
||||
};
|
||||
@@ -683,15 +682,8 @@ Vue.component('search-bar', {
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="group">
|
||||
<label for="plot-type">Type:</label>
|
||||
<select id="plot-type" v-model="searchBar.plotType">
|
||||
<option value="SCATTER">Scatter</option>
|
||||
<option value="PERCENTILES">Percentiles</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="group" id="group-show-aggregate" v-show="searchBar.plotType == 'SCATTER'">
|
||||
<div class="group" id="group-show-aggregate">
|
||||
<label for="show-aggregate">Aggregate:</label>
|
||||
<select id="show-aggregate" v-model="searchBar.aggregate">
|
||||
<option value="NONE">-</option>
|
||||
@@ -778,7 +770,6 @@ var data = {
|
||||
dateFrom: GetURLParameter('dateFrom', Date.now().add({ days: -7 }).toString("yyyy-MM-dd HH:mm:ss")), // '2018-01-05 09:03:00'
|
||||
dateRange: GetURLParameter('dateRange','1 week'),
|
||||
axisScale: GetURLParameter('axisScale','LOG10'),
|
||||
plotType: GetURLParameter('plotType','SCATTER'),
|
||||
aggregate: GetURLParameter('aggregate','NONE'),
|
||||
keyOutside: GetURLParameterBoolean('keyOutside', 'false'),
|
||||
|
||||
@@ -880,7 +871,6 @@ function createRequest(query, generateThumbnail){
|
||||
request['dateFrom'] = data.searchBar.dateFrom;
|
||||
request['dateRange'] = data.searchBar.dateRange;
|
||||
request['axisScale'] = data.searchBar.axisScale;
|
||||
request['plotType'] = data.searchBar.plotType;
|
||||
request['aggregate'] = data.searchBar.aggregate;
|
||||
request['keyOutside'] = data.searchBar.keyOutside;
|
||||
request['generateThumbnail'] = generateThumbnail;
|
||||
@@ -932,7 +922,6 @@ function updateImageLink(query) {
|
||||
'dateFrom': data.searchBar.dateFrom,
|
||||
'dateRange': data.searchBar.dateRange,
|
||||
'axisScale': data.searchBar.axisScale,
|
||||
'plotType': data.searchBar.plotType,
|
||||
'aggregate': data.searchBar.aggregate,
|
||||
'keyOutside': data.searchBar.keyOutside,
|
||||
'width': Math.floor($('#result').width()),
|
||||
|
||||
Reference in New Issue
Block a user