Skip to content

Commit

Permalink
Revert display of labels in return/volatility chart due to 'malformed…
Browse files Browse the repository at this point in the history
… pattern'

Issue: #1087
  • Loading branch information
buchen committed Jan 20, 2019
1 parent faca55c commit 6a84f83
Showing 1 changed file with 0 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@
public class ReturnsVolatilityChartView extends AbstractHistoricView
{
private static final String KEY_USE_IRR = ReturnsVolatilityChartView.class.getSimpleName() + "-use-irr"; //$NON-NLS-1$
private static final String KEY_SHOW_LABELS = ReturnsVolatilityChartView.class.getSimpleName() + "-show-labels"; //$NON-NLS-1$

private boolean useIRR = false;
private boolean showLabels = false;

private ScatterChart chart;
private LocalResourceManager resources;
Expand All @@ -64,14 +62,12 @@ public class ReturnsVolatilityChartView extends AbstractHistoricView
public void construct()
{
this.useIRR = getPreferenceStore().getBoolean(KEY_USE_IRR);
this.showLabels = getPreferenceStore().getBoolean(KEY_SHOW_LABELS);
}

@PreDestroy
public void destroy()
{
getPreferenceStore().setValue(KEY_USE_IRR, this.useIRR);
getPreferenceStore().setValue(KEY_SHOW_LABELS, this.showLabels);
}

@Override
Expand Down Expand Up @@ -112,15 +108,6 @@ protected void addButtons(ToolBarManager toolBar)
manager.add(irr);
manager.add(new Separator());

manager.add(new LabelOnly(Messages.LabelChartDetailSettings));
Action labels = new SimpleAction(Messages.LabelChartShowLabels, a -> {
this.showLabels = !this.showLabels;
reportingPeriodUpdated();
});
labels.setChecked(this.showLabels);
manager.add(labels);
manager.add(new Separator());

manager.add(new LabelOnly(Messages.LabelDataSeries));
configurator.configMenuAboutToShow(manager);
}));
Expand Down Expand Up @@ -243,12 +230,6 @@ private void setChartSeries()
lineSeries.setSymbolColor(color);
lineSeries.enableArea(series.isShowArea());
lineSeries.setLineStyle(series.getLineStyle());

if (showLabels)
{
lineSeries.getLabel().setFormat(series.getLabel());
lineSeries.getLabel().setVisible(true);
}
});
}

Expand Down

0 comments on commit 6a84f83

Please sign in to comment.