xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'unidata_20.3.2' of github.com:Unidata/awips2 into unidata_20.3.2-windows

Browse source
This commit is contained in:
Tiffany Meyer 2023-04-17 16:18:17 -05:00
commit cc21e5bd9f
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DChangeLegendModeHandler.java
View file

@ -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)
*
* </pre>
*
@ -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: {

5
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
View file

@ -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
*
* </pre>
*
@ -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();
}
/**

1
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/build.properties
View file

@ -3,4 +3,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
res/,\
utility/