From 97d68673ab6724a817ba7f13c2bc5bfa505bbd55 Mon Sep 17 00:00:00 2001 From: ucar-tmeyer Date: Wed, 12 Apr 2023 15:16:39 +0000 Subject: [PATCH 1/3] Re-add 3-way toggle for legend (products, none, maps) --- .../uf/viz/d2d/core/legend/D2DChangeLegendModeHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DChangeLegendModeHandler.java b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DChangeLegendModeHandler.java index 6a3276e3a9..7e895d7f4e 100644 --- a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DChangeLegendModeHandler.java +++ b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DChangeLegendModeHandler.java @@ -32,6 +32,7 @@ import com.raytheon.uf.viz.d2d.core.legend.D2DLegendResource.LegendMode; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Oct 24, 2011 mschenke Initial creation + * Apr 14, 2023 tiffanym@ucar Bring over MJ change for 3-way toggle for products, none, maps (Jun 14, 2017) * * * @@ -79,11 +80,11 @@ public class D2DChangeLegendModeHandler extends AbstractD2DLegendInputHandler { if (!cancel && prefManager.handleClick(TOGGLE_LEGEND_PREF, mouseButton)) { switch (resource.getLegendMode()) { case MAP: { - resource.getLegendAction(LegendMode.NONE).run(); + resource.getLegendAction(LegendMode.PRODUCT).run(); break; } case NONE: { - resource.getLegendAction(LegendMode.PRODUCT).run(); + resource.getLegendAction(LegendMode.MAP).run(); break; } case PRODUCT: { From 4419644e055c20b5ed617040dfb856215f725923 Mon Sep 17 00:00:00 2001 From: ucar-tmeyer Date: Wed, 12 Apr 2023 20:20:55 +0000 Subject: [PATCH 2/3] Updated build.properties file so this plugin would build in an ADE since the utility directory was moved to a different plugin --- .../com.raytheon.uf.common.dataplugin.satellite/build.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/build.properties b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/build.properties index 73974cda80..fc1777864a 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/build.properties +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/build.properties @@ -3,4 +3,3 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ res/,\ - utility/ From 1fe9f494183647c890c610bfc0d750ebe7c807ac Mon Sep 17 00:00:00 2001 From: srcarter3 Date: Mon, 17 Apr 2023 12:14:46 -0700 Subject: [PATCH 3/3] Small changes for WarngenDialog - increase default list length - re-enable single-clicking to select multiple options in the product list --- .../src/com/raytheon/viz/warngen/gui/WarngenDialog.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java index bfa86974af..7fc23749dd 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java @@ -276,6 +276,8 @@ import com.raytheon.viz.warngen.util.FollowUpUtil; * for the bottom buttons to be centered * Jun 28, 2022 srcarter@ucar Small change to disable the "UPDATE LIST" * combobox (not used in Unidata version) + * Apr 17, 2023 srcarter@ucar Re-enable single clicking for multiple selections + * in bullet list. Increase default size of list * * * @@ -563,7 +565,7 @@ public class WarngenDialog extends CaveSWTDialog GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); gd.widthHint = BULLETLIST_WIDTH_IN_CHARS * charWidth; - gd.heightHint = lineHeight * 4; + gd.heightHint = lineHeight * 7; bulletList.setLayoutData(gd); bulletListManager.recreateBullets( warngenLayer.getConfiguration().getBullets(), @@ -2037,6 +2039,7 @@ public class WarngenDialog extends CaveSWTDialog private void bulletListSelected() { bulletListManager.updateSelectedIndices(bulletList.getSelectionIndex(), warngenLayer.state.followupData != null); + updateBulletList(); } /**