diff --git a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java index e9f47462dd..8420ef138b 100644 --- a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java +++ b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java @@ -73,6 +73,7 @@ import com.raytheon.viz.ui.actions.DummyAction; * when magnification set to 0 * Aug 2, 2013 DR 16427 Qinglu Lin (David's approach) Changing InputPriority.SYSTEM_RESOURCE to * InputPriority.SYSTEM_RESOURCE_LOW in initInternal(). + * Jun 30, 2015 RM14663 kshresth Font size increased for Contour labels. * * * @@ -571,7 +572,7 @@ public class D2DLegendResource extends private float getScaledMagnification() { float magnification = getCapability(MagnificationCapability.class) .getMagnification().floatValue(); - if (magnification < 0.6f) { + if (magnification < 0.9f) { magnification = 1.0f; } else if (magnification > 1.0f) { magnification = 1 + (magnification / 4.0f); diff --git a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java index 393979ee96..47a9948820 100644 --- a/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java +++ b/cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java @@ -71,6 +71,7 @@ import com.vividsolutions.jts.geom.Coordinate; * Aug 23, 2013 2157 dgilling Remove meteolib dependency. * Feb 27, 2014 2791 bsteffen Switch from IDataRecord to DataSource and * reduce loop freezing. + * Jun 30, 2015 RM14663 kshresth Font size increased for Contour labels. * * * @@ -230,19 +231,31 @@ public abstract class ContourRenderable implements IRenderable { if (font == null) { font = target.getDefaultFont(); - font = target.initializeFont(font.getFontName(), - (float) (font.getFontSize() / 1.4 * magnification), + if(magnification < 1.0f) + font = target.initializeFont(font.getFontName(), + (float) (font.getFontSize() / 0.9 * magnification), + null); + else + font = target.initializeFont(font.getFontName(), + (float) (font.getFontSize() / 1.05 * magnification), null); } if (minMaxFont == null) { minMaxFont = target.getDefaultFont(); - minMaxFont = target + if (magnification < 1.0f) + minMaxFont = target .initializeFont( minMaxFont.getFontName(), - (float) (minMaxFont.getFontSize() / 1.3 * magnification), + (float) (minMaxFont.getFontSize() / 0.85 * magnification), new Style[] { Style.BOLD }); + else + minMaxFont = target + .initializeFont( + minMaxFont.getFontName(), + (float) (minMaxFont.getFontSize() / 1.0 * magnification), + new Style[] { Style.BOLD }); } // To convert from i to zoomLevel, take i + 1.0 / 2 so diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml index e29508ab23..115b8289b3 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml @@ -41,7 +41,7 @@ - + PLAN_VIEW @@ -244,7 +244,7 @@ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml index f7216f77fa..cae3709884 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml @@ -5,7 +5,7 @@ - + PLAN_VIEW @@ -79,7 +79,7 @@ - + PLAN_VIEW @@ -152,7 +152,7 @@ - + PLAN_VIEW @@ -227,7 +227,7 @@ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultMesoFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultMesoFamily.xml index 28af21061d..7a188d91c4 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultMesoFamily.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultMesoFamily.xml @@ -8,7 +8,7 @@ - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStormScaleFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStormScaleFamily.xml index d4b4bfd4f6..f37ce21370 100755 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStormScaleFamily.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStormScaleFamily.xml @@ -14,7 +14,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -174,7 +174,7 @@ - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml index 7b61317277..196f83db80 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml @@ -318,7 +318,7 @@ - + PLAN_VIEW @@ -353,7 +353,7 @@ - + PLAN_VIEW @@ -388,7 +388,7 @@ - + PLAN_VIEW @@ -423,7 +423,7 @@ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml index 7c1ef90699..8518d0c5b0 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml @@ -62,7 +62,7 @@ - + - + PLAN_VIEW @@ -85,7 +85,7 @@ - + PLAN_VIEW @@ -163,7 +163,7 @@ - + PLAN_VIEW @@ -232,7 +232,7 @@ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HRRR.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HRRR.xml index ef77757169..59e2537c2e 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HRRR.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HRRR.xml @@ -221,7 +221,7 @@ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HeavyRainFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HeavyRainFamily.xml index 14865ee08f..e5360a4f38 100755 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HeavyRainFamily.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HeavyRainFamily.xml @@ -30,7 +30,7 @@ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml index b8a33acaf2..1fbb95b8c3 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml @@ -22,7 +22,7 @@ - + PLAN_VIEW @@ -57,7 +57,7 @@ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD-MandatoryLevels.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD-MandatoryLevels.xml index b2a144b6cf..e9b7b618f2 100755 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD-MandatoryLevels.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD-MandatoryLevels.xml @@ -530,7 +530,7 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD.xml index 46601c2c03..6c9dbaf7f6 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD.xml @@ -562,7 +562,7 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyE.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyE.xml index 3606173091..ca961fefb7 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyE.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyE.xml @@ -89,7 +89,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + PLAN_VIEW @@ -197,7 +197,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + PLAN_VIEW @@ -239,7 +239,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + PLAN_VIEW @@ -380,7 +380,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + PLAN_VIEW @@ -448,7 +448,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyF.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyF.xml index 3cb2bf9678..c6e2de2518 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyF.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyF.xml @@ -20,7 +20,7 @@ - + PLAN_VIEW @@ -55,7 +55,7 @@ - + PLAN_VIEW @@ -70,7 +70,7 @@ - + PLAN_VIEW @@ -108,7 +108,7 @@ - + PLAN_VIEW @@ -148,7 +148,7 @@ - + PLAN_VIEW @@ -186,7 +186,7 @@ - + PLAN_VIEW @@ -224,7 +224,7 @@ - + PLAN_VIEW @@ -262,7 +262,7 @@ - + PLAN_VIEW @@ -306,7 +306,7 @@ - + PLAN_VIEW @@ -341,7 +341,7 @@ - + PLAN_VIEW @@ -356,7 +356,7 @@ - + PLAN_VIEW @@ -394,7 +394,7 @@ - + PLAN_VIEW @@ -434,7 +434,7 @@ - + PLAN_VIEW @@ -472,7 +472,7 @@ - + PLAN_VIEW @@ -510,7 +510,7 @@ - + PLAN_VIEW @@ -548,7 +548,7 @@ - + PLAN_VIEW @@ -592,7 +592,7 @@ - + PLAN_VIEW @@ -627,7 +627,7 @@ - + PLAN_VIEW @@ -642,7 +642,7 @@ - + PLAN_VIEW @@ -680,7 +680,7 @@ - + PLAN_VIEW @@ -720,7 +720,7 @@ - + PLAN_VIEW @@ -758,7 +758,7 @@ - + PLAN_VIEW @@ -796,7 +796,7 @@ - + PLAN_VIEW @@ -834,7 +834,7 @@ - + PLAN_VIEW @@ -878,7 +878,7 @@ - + PLAN_VIEW @@ -913,7 +913,7 @@ - + PLAN_VIEW @@ -928,7 +928,7 @@ - + PLAN_VIEW @@ -966,7 +966,7 @@ - + PLAN_VIEW @@ -1006,7 +1006,7 @@ - + PLAN_VIEW @@ -1044,7 +1044,7 @@ - + PLAN_VIEW @@ -1082,7 +1082,7 @@ - + PLAN_VIEW @@ -1120,7 +1120,7 @@ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyJ.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyJ.xml index 0483fb5af6..043da53918 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyJ.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyJ.xml @@ -128,7 +128,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + PLAN_VIEW @@ -205,7 +205,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + PLAN_VIEW @@ -353,7 +353,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + PLAN_VIEW @@ -387,7 +387,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + PLAN_VIEW @@ -529,7 +529,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL-MandatoryLevels.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL-MandatoryLevels.xml index 3b3d7557b3..f5e23b7c3b 100755 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL-MandatoryLevels.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL-MandatoryLevels.xml @@ -28,7 +28,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -63,7 +63,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -96,7 +96,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -129,7 +129,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -507,7 +507,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -692,7 +692,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -982,7 +982,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL.xml index 62b9bfbca7..ba10c00f39 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL.xml @@ -26,7 +26,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -61,7 +61,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -94,7 +94,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -127,7 +127,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -505,7 +505,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -690,7 +690,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW @@ -977,7 +977,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyM.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyM.xml index 68db124952..642bffe99e 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyM.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyM.xml @@ -106,7 +106,7 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + PLAN_VIEW @@ -373,7 +373,7 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + PLAN_VIEW @@ -640,7 +640,7 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + PLAN_VIEW @@ -909,7 +909,7 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml index d8350c41e1..b143fb8e23 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml @@ -31,7 +31,7 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - + PLAN_VIEW @@ -66,7 +66,7 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyYY.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyYY.xml index 6f5c9ef50a..0baf16304d 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyYY.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyYY.xml @@ -29,7 +29,7 @@ - + PLAN_VIEW @@ -64,7 +64,7 @@ - + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMET.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMET.xml index 011679b78a..dd09dc47b3 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMET.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMET.xml @@ -75,7 +75,7 @@ - + - + PLAN_VIEW @@ -83,7 +83,7 @@ displayType="IMAGE" loadWithoutData="false"> + interpolationState="true" brightness="0.5" contrast="1.0" /> PLAN_VIEW @@ -165,7 +165,7 @@ - + PLAN_VIEW @@ -209,7 +209,7 @@ displayType="IMAGE" loadWithoutData="false"> + interpolationState="true" brightness="0.5" contrast="1.0" /> PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterFamily.xml index 7c5d1e712e..b0fb8d5a7e 100755 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterFamily.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterFamily.xml @@ -8,7 +8,7 @@ PLAN_VIEW - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterPTypeFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterPTypeFamily.xml index 8c96a80c66..07b29ff814 100755 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterPTypeFamily.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterPTypeFamily.xml @@ -57,7 +57,7 @@ - +