From 944e7a50252bae73bbd1c2aa31cbf64cfc24250a Mon Sep 17 00:00:00 2001 From: Evan Polster Date: Wed, 28 Jan 2015 23:29:26 +0000 Subject: [PATCH] VLab Issue #6222. Ensemble Tool Feature: 14.4.1 cosmetic and bug fix; fixes #6222 Change-Id: I0af8db16244969e80ed81b82e83544bb94188387 Former-commit-id: 026366fc59ade2c6759f981e34a9967fe423e94f [formerly 252765c247d14129f7bad04221628a57ca2c780b [formerly 0235002dc0ab3b297cb31017a8ce8409fb27e65d] [formerly 026366fc59ade2c6759f981e34a9967fe423e94f [formerly 24dee8480063cf90e5c261e848d9cbcddf6b9459]]] Former-commit-id: 252765c247d14129f7bad04221628a57ca2c780b [formerly 0235002dc0ab3b297cb31017a8ce8409fb27e65d] Former-commit-id: 252765c247d14129f7bad04221628a57ca2c780b Former-commit-id: ae1bab442d1874cb46023e0a220f08aa5ac68670 --- gsd/gov.noaa.gsd.viz.ensemble/plugin.xml | 6 +- .../display/calculate/Calculation.java | 4 +- .../ui/viewer/EnsembleToolViewer.java | 157 ++++++++---------- 3 files changed, 73 insertions(+), 94 deletions(-) diff --git a/gsd/gov.noaa.gsd.viz.ensemble/plugin.xml b/gsd/gov.noaa.gsd.viz.ensemble/plugin.xml index 10dcbf98d7..422be66371 100644 --- a/gsd/gov.noaa.gsd.viz.ensemble/plugin.xml +++ b/gsd/gov.noaa.gsd.viz.ensemble/plugin.xml @@ -7,7 +7,7 @@ point="org.eclipse.ui.commands"> + name="Ensemble Tool"> @@ -35,9 +35,9 @@ commandId="gov.noaa.gsd.viz.ensemble.activate.layer" icon="icons/EnsembleTool.gif" id="gov.noaa.gsd.viz.ensemble.tool.viewer" - label="Ensembles" + label="Ensemble Tool" style="push" - tooltip="Ensemble Tools"> + tooltip="Ensemble Tool"> children = getEnsembleMemberGenericResources(ensembleName); // TODO: poor-man's way of knowing what type of flavor this ensemble is - if (ensembleName.toLowerCase().indexOf("gfsensemble") >= 0) { + if ((ensembleName.indexOf("GEFS") >= 0) + || (ensembleName.indexOf("GFS Ensemble") >= 0)) { updateGEFSEnsembleColors(ensembleName, children); - } else if (ensembleName.toLowerCase().indexOf("sref") >= 0) { + } else if (ensembleName.indexOf("SREF") >= 0) { updateSREFColors(ensembleName, children); - } else { - return; } } @@ -2027,40 +2010,35 @@ public class EnsembleToolViewer extends ViewPart implements IRefreshListener { private void updateSREFColors(String ensembleName, final List children) { - final Cursor currCursor = ensembleTree.getCursor(); - - VizApp.runAsync(new Runnable() { + VizApp.runSync(new Runnable() { @Override public void run() { - ensembleTree.setCursor(waitCursor); + updateCursor(waitCursor); EnsembleSREFColorChooser cd = new EnsembleSREFColorChooser( owner.getShell()); - cd.create(); - int result = cd.open(); - if (result != IDialogConstants.OK_ID) { - return; - } - - Color currColor = null; - for (GenericResourceHolder gRsc : children) { - if (gRsc instanceof GridResourceHolder) { - AbstractVizResource rsc = gRsc.getRsc(); - String ensId = gRsc.getEnsembleIdRaw(); - if ((ensId != null) && (ensId.length() > 1)) { - currColor = ChosenSREFColors.getInstance() - .getGradientByEnsembleId(ensId); - rsc.getCapability(ColorableCapability.class) - .setColor(currColor.getRGB()); - rsc.issueRefresh(); + cd.setBlockOnOpen(true); + if (cd.open() == Window.OK) { + Color currColor = null; + for (GenericResourceHolder gRsc : children) { + if (gRsc instanceof GridResourceHolder) { + AbstractVizResource rsc = gRsc.getRsc(); + String ensId = gRsc.getEnsembleIdRaw(); + if ((ensId != null) && (ensId.length() > 1)) { + currColor = ChosenSREFColors.getInstance() + .getGradientByEnsembleId(ensId); + rsc.getCapability(ColorableCapability.class) + .setColor(currColor.getRGB()); + rsc.issueRefresh(); + } } } + ensemblesTreeViewer.refresh(); } - ensemblesTreeViewer.refresh(); - ensembleTree.setCursor(currCursor); + updateCursor(normalCursor); } }); @@ -2070,46 +2048,43 @@ public class EnsembleToolViewer extends ViewPart implements IRefreshListener { private void updateGEFSEnsembleColors(String ensembleName, final List children) { - final Cursor currCursor = ensembleTree.getCursor(); - - VizApp.runAsync(new Runnable() { + VizApp.runSync(new Runnable() { @Override public void run() { - ensembleTree.setCursor(waitCursor); + updateCursor(waitCursor); EnsembleGEFSColorChooser cd = new EnsembleGEFSColorChooser( owner.getShell()); - cd.create(); - int result = cd.open(); - if (result != IDialogConstants.OK_ID) { - return; - } + cd.setBlockOnOpen(true); + if (cd.open() == Window.OK) { - Color currColor = null; - int count = 0; - for (GenericResourceHolder gRsc : children) { - if (gRsc instanceof GridResourceHolder) { - count++; - AbstractVizResource rsc = gRsc.getRsc(); - if (count == 1) { - currentEnsembleRsc = rsc; - } - String ensId = gRsc.getEnsembleIdRaw(); - if ((ensId != null) && (ensId.length() > 1)) { - currColor = ChosenGEFSColors.getInstance() - .getGradientByEnsembleId(ensId); - rsc.getCapability(ColorableCapability.class) - .setColor(currColor.getRGB()); - rsc.getCapability(OutlineCapability.class); - rsc.issueRefresh(); + // EditorUtil.getActiveEditor(). + Color currColor = null; + int count = 0; + for (GenericResourceHolder gRsc : children) { + if (gRsc instanceof GridResourceHolder) { + count++; + AbstractVizResource rsc = gRsc.getRsc(); + if (count == 1) { + currentEnsembleRsc = rsc; + } + String ensId = gRsc.getEnsembleIdRaw(); + if ((ensId != null) && (ensId.length() > 1)) { + currColor = ChosenGEFSColors.getInstance() + .getGradientByEnsembleId(ensId); + rsc.getCapability(ColorableCapability.class) + .setColor(currColor.getRGB()); + rsc.getCapability(OutlineCapability.class); + rsc.issueRefresh(); + } } } + ensemblesTreeViewer.refresh(); } - ensemblesTreeViewer.refresh(); - ensembleTree.setCursor(currCursor); + updateCursor(normalCursor); } }); @@ -3516,4 +3491,8 @@ public class EnsembleToolViewer extends ViewPart implements IRefreshListener { } } + private void updateCursor(Cursor c) { + ensembleTree.setCursor(c); + } + }