From 6406bcdd055c1cfbe1e4cd7f68fad9026379b4ae Mon Sep 17 00:00:00 2001 From: Mike Duff Date: Tue, 17 Dec 2013 09:41:30 -0600 Subject: [PATCH] Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph Former-commit-id: 9b73b9db1ff2e7aeab888118348c66090ef7e2ae --- .../bandwidth/ui/BandwidthCanvasComp.java | 18 ++++++++++++++---- .../bandwidth/ui/BandwidthImageMgr.java | 4 +++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthCanvasComp.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthCanvasComp.java index 9db73f1013..118714b9b7 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthCanvasComp.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthCanvasComp.java @@ -102,6 +102,7 @@ import com.raytheon.uf.viz.datadelivery.utils.DataDeliveryUtils; * Oct 28, 2013 2430 mpduff Add % of bandwidth utilized graph. * Nov 19, 2013 1531 mpduff Made graph resizable. * Nov 25, 2013 2545 mpduff Default to Opsnet if Network not available yet. + * Dec 17, 2013 2633 mpduff Fix redraw problems. * * * @author lvenable @@ -390,6 +391,7 @@ public class BandwidthCanvasComp extends Composite implements IDialogClosed, cs = new CanvasSettings(740, heightWithBuffer, graphSize.x, graphSize.y, xSpaceBuffer, ySpaceBuffer); canvasSettingsMap.put(CanvasImages.GRAPH, cs); + graphCanvasSize.x = cs.getCanvasWidth(); graphCanvasSize.y = cs.getCanvasHeight(); graphCanvasSettings = cs; @@ -405,7 +407,7 @@ public class BandwidthCanvasComp extends Composite implements IDialogClosed, canvasSettingsMap.put(CanvasImages.Y_LABEL, cs); // Create the X header canvas settings - cs = new CanvasSettings(740, 60, 740, 60, 20, 0); + cs = new CanvasSettings(740, 60, graphSize.x, 60, 20, 0); canvasSettingsMap.put(CanvasImages.X_HEADER, cs); // Create the y header canvas settings @@ -421,7 +423,7 @@ public class BandwidthCanvasComp extends Composite implements IDialogClosed, canvasSettingsMap.put(CanvasImages.UTILIZATION_GRAPH, cs); // Create the Utilization header canvas settings - cs = new CanvasSettings(740, utilizationHeaderHeight, 740, + cs = new CanvasSettings(740, utilizationHeaderHeight, graphSize.x, utilizationHeaderHeight, xSpaceBuffer, 0); canvasSettingsMap.put(CanvasImages.UTILIZATION_HEADER, cs); } @@ -1416,8 +1418,8 @@ public class BandwidthCanvasComp extends Composite implements IDialogClosed, imageMgr.setCanvasSetting(entry.getKey(), entry.getValue()); } - imageMgr.generateImages(bgd); updateCanvases(); + imageMgr.generateImages(bgd); } /** @@ -1553,7 +1555,10 @@ public class BandwidthCanvasComp extends Composite implements IDialogClosed, VizApp.runAsync(new Runnable() { @Override public void run() { - setGraphData(graphDataUtil.getGraphData(false)); + setGraphData(graphDataUtil.getGraphData(true)); + updateCanvasSettings(); + updateCanvases(); + layout(); } }); } @@ -1622,6 +1627,9 @@ public class BandwidthCanvasComp extends Composite implements IDialogClosed, - getCanvasHeight(CanvasImages.UTILIZATION_HEADER) - getCanvasHeight(CanvasImages.UTILIZATION_GRAPH); + this.graphCanvasSettings.setImageWidth(graphCanvasWidth); + this.graphCanvasSettings.setImageHeight(graphCanvasHeight); + // X Header canvas CanvasSettings settings = this .getCanvasSettings(CanvasImages.X_HEADER); @@ -1671,6 +1679,8 @@ public class BandwidthCanvasComp extends Composite implements IDialogClosed, settings = this.getCanvasSettings(CanvasImages.GRAPH); settings.updateCanvas(graphCanvasWidth, graphCanvasHeight, graphSize.x, graphSize.y); + graphCanvasSettings.setDrawWidth(graphSize.x); + graphCanvasSettings.setDrawHeight(graphSize.y); ((GridData) graphCanvas.getLayoutData()).widthHint = graphCanvasWidth; ((GridData) graphCanvas.getLayoutData()).heightHint = graphCanvasHeight; diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthImageMgr.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthImageMgr.java index 26e51559c2..804eade797 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthImageMgr.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthImageMgr.java @@ -51,6 +51,7 @@ import com.raytheon.uf.viz.core.RGBColors; * Jan 28, 2013 1529 djohnson Add hasSubscriptionNameChecked(). * Oct 28, 2013 2430 mpduff Add % of bandwidth utilized graph. * Nov 19, 2013 1531 mpduff Update the settings. + * Dec 17, 2013 2633 mpduff Keep data used to regenerate images. * * * @@ -143,7 +144,7 @@ public class BandwidthImageMgr implements IGraphOptions { private final Composite parentComp; - private final BandwidthGraphData graphData; + private BandwidthGraphData graphData; /** * Constructor. @@ -256,6 +257,7 @@ public class BandwidthImageMgr implements IGraphOptions { * The graph data object */ public void generateImages(BandwidthGraphData graphData) { + this.graphData = graphData; for (CanvasImages ci : CanvasImages.values()) { canvasImgMap.get(ci).regenerateImage(graphData); }