bug4615: Clearing the result charts before another result is displayed

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsChartConfigurationPanel.java

@@ -1,7 +1,7 @@
 package com.sap.sailing.gwt.ui.datamining.presentation;
 
 import com.google.gwt.dom.client.Style.Unit;
-import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.CheckBox;
 import com.google.gwt.user.client.ui.DoubleBox;
@@ -25,7 +25,7 @@ public class ManeuverSpeedDetailsChartConfigurationPanel extends HorizontalPanel
 
     private static final String NUMBER_BOX_WIDTH = "40px";
 
-    public ManeuverSpeedDetailsChartConfigurationPanel(ClickHandler applyButtonClickHandler,
+    public ManeuverSpeedDetailsChartConfigurationPanel(Runnable applyConfigurationCallback,
             StringMessages stringMessages) {
         setHorizontalAlignment(ALIGN_LEFT);
         setVerticalAlignment(ALIGN_MIDDLE);
@@ -48,7 +48,7 @@ public class ManeuverSpeedDetailsChartConfigurationPanel extends HorizontalPanel
         add(new Label(stringMessages.zeroTo360AxisLabeling() + ":"));
         add(zeroTo360AxisLabelingCheckBox);
 
-        Button applyButton = new Button(stringMessages.apply(), applyButtonClickHandler);
+        Button applyButton = new Button(stringMessages.apply(), (ClickEvent e) -> applyConfigurationCallback.run());
         add(applyButton);
     }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsResultsPresenter.java

@@ -40,11 +40,11 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults
 
     private final DockLayoutPanel dockLayoutPanel;
 
-    private Chart polarChart;
+    private final Chart polarChart;
     private final SimpleLayoutPanel polarChartWrapperPanel;
 
-    private Chart lineChart;
-    private Chart dataCountHistogramChart;
+    private final Chart lineChart;
+    private final Chart dataCountHistogramChart;
     private final DockLayoutPanel rightSideChartsWrapperPanel;
 
     private final ManeuverSpeedDetailsChartConfigurationPanel chartConfigPanel;
@@ -52,39 +52,25 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults
     private Integer minDataCount;
 
     private Double minValue;
-
     private Double maxValue;
-
-    private boolean zeroTo360AxisLabeling = false;
+    
+    private int xAxisMin;
+    private int xAxisMax;
 
     private QueryResultDTO<?> result;
 
     public ManeuverSpeedDetailsResultsPresenter(Component<?> parent, ComponentContext<?> context,
             StringMessages stringMessages) {
         super(parent, context, stringMessages);
+        xAxisMin = -179;
+        xAxisMax = 180;
 
-        chartConfigPanel = new ManeuverSpeedDetailsChartConfigurationPanel(new ClickHandler() {
-
-            @Override
-            public void onClick(ClickEvent event) {
-                minDataCount = chartConfigPanel.getMinDataCount();
-                minValue = chartConfigPanel.getMinValue();
-                maxValue = chartConfigPanel.getMaxValue();
-                zeroTo360AxisLabeling = chartConfigPanel.isZeroTo360AxisLabeling();
-                if (result != null) {
-                    redrawAllCharts();
-                }
-            }
-
-        }, stringMessages);
-
+        chartConfigPanel = new ManeuverSpeedDetailsChartConfigurationPanel(this::applyConfiguration, stringMessages);
         addControl(chartConfigPanel);
 
         ChartToCsvExporter chartToCsvExporter = new ChartToCsvExporter(stringMessages.csvCopiedToClipboard());
-
         Button exportStatisticsCurveToCsvButton = new Button(stringMessages.exportStatisticsCurveToCsv(),
                 new ClickHandler() {
-
                     @Override
                     public void onClick(ClickEvent event) {
                         chartToCsvExporter.exportChartAsCsvToClipboard(lineChart);
@@ -92,6 +78,8 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults
                 });
         addControl(exportStatisticsCurveToCsvButton);
 
+        polarChart = ChartFactory.createPolarChart();
+        polarChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax);
         polarChartWrapperPanel = new SimpleLayoutPanel() {
             @Override
             public void onResize() {
@@ -99,11 +87,13 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults
                 polarChart.redraw();
             }
         };
+        polarChartWrapperPanel.add(polarChart);
 
+        lineChart = ChartFactory.createLineChartForPolarData(stringMessages);
+        lineChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax);
         dataCountHistogramChart = ChartFactory.createDataCountHistogramChart(
                 stringMessages.TWA() + " (" + stringMessages.degreesShort() + ")", stringMessages);
-        dataCountHistogramChart.getXAxis().setMin(-179);
-        dataCountHistogramChart.getXAxis().setMax(180);
+        dataCountHistogramChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax);
         rightSideChartsWrapperPanel = new DockLayoutPanel(Unit.PCT) {
             @Override
             public void onResize() {
@@ -113,40 +103,27 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults
                 dataCountHistogramChart.redraw();
             }
         };
+        rightSideChartsWrapperPanel.addNorth(lineChart, 50);
+        rightSideChartsWrapperPanel.addSouth(dataCountHistogramChart, 50);
+        
         dockLayoutPanel = new DockLayoutPanel(Unit.PCT);
         dockLayoutPanel.addWest(polarChartWrapperPanel, 40);
         dockLayoutPanel.addEast(rightSideChartsWrapperPanel, 60);
-
-        redrawAllCharts();
-
     }
-
-    private void redrawAllCharts() {
-        if (polarChart != null) {
-            polarChartWrapperPanel.remove(polarChart);
-        }
-        if (lineChart != null) {
-            rightSideChartsWrapperPanel.remove(lineChart);
-        }
-        if (dataCountHistogramChart != null) {
-            rightSideChartsWrapperPanel.remove(dataCountHistogramChart);
-        }
-
-        int xAxisMin = zeroTo360AxisLabeling ? 0 : -179;
-        int xAxisMax = zeroTo360AxisLabeling ? 359 : 180;
-
-        polarChart = ChartFactory.createPolarChart();
-        lineChart = ChartFactory.createLineChartForPolarData(stringMessages);
-        dataCountHistogramChart = ChartFactory.createDataCountHistogramChart(
-                stringMessages.TWA() + " (" + stringMessages.degreesShort() + ")", stringMessages);
+    
+    private void applyConfiguration() {
+        minDataCount = chartConfigPanel.getMinDataCount();
+        minValue = chartConfigPanel.getMinValue();
+        maxValue = chartConfigPanel.getMaxValue();
+        
+        boolean zeroTo360AxisLabeling = chartConfigPanel.isZeroTo360AxisLabeling();
+        xAxisMin = zeroTo360AxisLabeling ? 0 : -179;
+        xAxisMax = zeroTo360AxisLabeling ? 359 : 180;
+        
         polarChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax);
         lineChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax);
         dataCountHistogramChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax);
-
-        polarChartWrapperPanel.add(polarChart);
-        rightSideChartsWrapperPanel.addNorth(lineChart, 50);
-        rightSideChartsWrapperPanel.addSouth(dataCountHistogramChart, 50);
-
+        
         if (result != null) {
             internalShowResults(result);
         }
@@ -159,6 +136,10 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults
 
     @Override
     protected void internalShowResults(QueryResultDTO<?> result) {
+        polarChart.removeAllSeries(false);
+        lineChart.removeAllSeries(false);
+        dataCountHistogramChart.removeAllSeries(false);
+        
         this.result = result;
         Map<GroupKey, ?> results = result.getResults();
         List<GroupKey> sortedNaturally = new ArrayList<GroupKey>(results.keySet());
@@ -176,8 +157,6 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults
             Series polarSeries = polarChart.createSeries();
             Series histogramSeries = dataCountHistogramChart.createSeries();
             Series valueSeries = lineChart.createSeries();
-            int xAxisMin = zeroTo360AxisLabeling ? 0 : -179;
-            int xAxisMax = zeroTo360AxisLabeling ? 359 : 180;
             for (int convertedTWA = xAxisMin; convertedTWA <= xAxisMax; convertedTWA++) {
                 int i = convertedTWA < 0 ? convertedTWA + 360 : convertedTWA;
                 double value = valuePerTWA[i];
@@ -199,8 +178,11 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults
             histogramSeries.setVisible(false, false);
             valueSeries.setVisible(false, false);
             lineChart.addSeries(valueSeries, false, false);
-            dataCountHistogramChart.addSeries(histogramSeries);
+            dataCountHistogramChart.addSeries(histogramSeries, false, false);
         }
+        polarChart.redraw();
+        lineChart.redraw();
+        dataCountHistogramChart.redraw();
         // Initially resize the chart. Otherwise it's too big. FIXME with a better solution
         Timer timer = new Timer() {
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java

@@ -84,6 +84,9 @@ public class NumberPairResultsPresenter extends AbstractSailingResultsPresenter<
 
     @Override
     protected void internalShowResults(QueryResultDTO<?> res) {
+        chart.removeAllSeries(false);
+        seriesMappedByGroupKey.clear();
+        
         result = res;
         createAndAddSeriesToChart();
         for (Entry<GroupKey, ?> resultEntry : result.getResults().entrySet()) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java

@@ -108,6 +108,10 @@ public class PolarBackendResultsPresenter extends AbstractSailingResultsPresente
 
     @Override
     protected void internalShowResults(QueryResultDTO<?> result) {
+        polarChart.removeAllSeries(false);
+        speedChart.removeAllSeries(false);
+        angleChart.removeAllSeries(false);
+        
         final Set<Series> seriesToHideAfterRendering = new HashSet<>();
         Map<GroupKey, ?> results = result.getResults();
         List<GroupKey> sortedNaturally = new ArrayList<GroupKey>(results.keySet());

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarResultsPresenter.java

@@ -113,7 +113,6 @@ public class PolarResultsPresenter extends AbstractSailingResultsPresenter<Setti
 
         Button exportStatisticsCurveToCsvButton = new Button(stringMessages.exportStatisticsCurveToCsv(),
                 new ClickHandler() {
-
                     @Override
                     public void onClick(ClickEvent event) {
                         chartToCsvExporter.exportChartAsCsvToClipboard(polarChart);
@@ -124,9 +123,18 @@ public class PolarResultsPresenter extends AbstractSailingResultsPresenter<Setti
         setSeriesShowAndHideHandler();
     }
 
+    private void setSeriesShowAndHideHandler() {
+        SeriesPlotOptions seriesPlotOptions = new SeriesPlotOptions();
+        seriesPlotOptions.setSeriesShowEventHandler(createSeriesShowEventHandler());
+        seriesPlotOptions.setSeriesHideEventHandler(createSeriesHideEventHandler());
+        seriesPlotOptions.setPointSelectEventHandler(createPointSelectEventHandler());
+        seriesPlotOptions.setPointUnselectEventHandler(createPointUnselectEventHandler());
+        seriesPlotOptions.setAllowPointSelect(true);
+        polarChart.setSeriesPlotOptions(seriesPlotOptions);
+    }
+
     private PointUnselectEventHandler createPointUnselectEventHandler() {
         return new PointUnselectEventHandler() {
-
             @Override
             public boolean onUnselect(PointUnselectEvent pointUnselectEvent) {
                 long angle = pointUnselectEvent.getXAsLong();
@@ -140,7 +148,6 @@ public class PolarResultsPresenter extends AbstractSailingResultsPresenter<Setti
 
     private PointSelectEventHandler createPointSelectEventHandler() {
         return new PointSelectEventHandler() {
-
             @Override
             public boolean onSelect(PointSelectEvent pointSelectEvent) {
                 long angle = pointSelectEvent.getXAsLong();
@@ -152,19 +159,8 @@ public class PolarResultsPresenter extends AbstractSailingResultsPresenter<Setti
         };
     }
 
-    private void setSeriesShowAndHideHandler() {
-        SeriesPlotOptions seriesPlotOptions = new SeriesPlotOptions();
-        seriesPlotOptions.setSeriesShowEventHandler(createSeriesShowEventHandler());
-        seriesPlotOptions.setSeriesHideEventHandler(createSeriesHideEventHandler());
-        seriesPlotOptions.setPointSelectEventHandler(createPointSelectEventHandler());
-        seriesPlotOptions.setPointUnselectEventHandler(createPointUnselectEventHandler());
-        seriesPlotOptions.setAllowPointSelect(true);
-        polarChart.setSeriesPlotOptions(seriesPlotOptions);
-    }
-
     private SeriesShowEventHandler createSeriesShowEventHandler() {
         return new SeriesShowEventHandler() {
-
             @Override
             public boolean onShow(SeriesShowEvent seriesShowEvent) {
                 String id = seriesShowEvent.getSeriesId();
@@ -178,7 +174,6 @@ public class PolarResultsPresenter extends AbstractSailingResultsPresenter<Setti
 
     private SeriesHideEventHandler createSeriesHideEventHandler() {
         return new SeriesHideEventHandler() {
-
             @Override
             public boolean onHide(SeriesHideEvent seriesHideEvent) {
                 String id = seriesHideEvent.getSeriesId();
@@ -197,6 +192,12 @@ public class PolarResultsPresenter extends AbstractSailingResultsPresenter<Setti
 
     @Override
     protected void internalShowResults(QueryResultDTO<?> result) {
+        polarChart.removeAllSeries(false);
+        dataCountHistogramChart.removeAllSeries(false);
+        dataCountPerAngleHistogramChart.removeAllSeries(false);
+        histogramSeriesForPolarSeries.clear();
+        perAngleHistogramSeriesForAngle.clear();
+        
         Map<GroupKey, ?> results = result.getResults();
         List<GroupKey> sortedNaturally = new ArrayList<GroupKey>(results.keySet());
         Collections.sort(sortedNaturally, new Comparator<GroupKey>() {