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

Merge branch 'unidata_17.1.1-osx' of github.com:Unidata/awips2 into unidata_17.1.1-osx

Browse source
This commit is contained in:
Michael James 2018-04-05 15:02:51 -06:00
commit 57f096963d
6 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,4 +1,5 @@
.metadata/
.DS_Store
.gitignore
ldm/Debug
test-bin/

14
cave/com.raytheon.uf.viz.truecolor.gl/localization/glsl/truecolor.glsl
View file

@ -29,7 +29,7 @@ int toBitMask(float alpha) {
}
float fromBitMask(int bitMask) {
return bitMask / maskMultiplier;
return float(bitMask) / maskMultiplier;
}
vec4 getFinalColor() {
@ -68,8 +68,6 @@ vec4 applyColorBand(int colorband) {
float cmapValue = dataToColorMapValue(dataValue, dataMappingDataValues, dataMappingColorValues, dataMappingValues);
float index = pow(getColorMappingIndex(cmapValue, colorMapping), gamma);
int currentMask = toBitMask(a);
int bitValue = (1 << band);
if (colorband == RED_BAND && index > r) {
r = index;
} else if (colorband == GREEN_BAND && index > g) {
@ -77,11 +75,13 @@ vec4 applyColorBand(int colorband) {
} else if (colorband == BLUE_BAND && index > b) {
b = index;
}
if ((currentMask & bitValue) == 0) {
// alpha does not contain this bit yet!
a = fromBitMask(currentMask | bitValue);
int bitValue = int(pow(2.0,float(band)));
int currentMask = toBitMask(a);
if ((currentMask - (bitValue * int(floor(float(currentMask/bitValue))))) == 0) {
a = fromBitMask(bitValue);
}
// a mod n = a - (n * Fix(a/n))
// currentMask & bitValue = currentMask - (bitValue * (currentMask/bitValue))
}
return vec4(r, g, b, a);

6
cave/com.raytheon.viz.awipstools/localization/bundles/tools/Home.xml
View file

@ -23,7 +23,11 @@
<displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<descriptor xsi:type="mapDescriptor">
<resource>
<loadProperties/>
<loadProperties loadWithoutData="true">
<capabilities>
<capability xsi:type="colorableCapability" colorAsString="#ffffff"/>
</capabilities>
</loadProperties>
<resourceData xsi:type="genericToolsResourceData">
<name>Home Location</name>
<classT>com.raytheon.viz.awipstools.ui.layer.HomeToolLayer</classT>

0
cave/com.raytheon.viz.product.awips/icons/awips.png → cave/com.raytheon.viz.product.awips/icons/unidata_awips_logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

5
docs/css/extra.css
View file

@ -1,3 +1,8 @@
.md-content a {
color: #0091ea;
}
table {
width:100%;
font-size: 1.6rem;
}

8
edexOsgi/com.raytheon.edex.plugin.radar/utility/common_static/base/radarInfo.txt
View file

@ -81,10 +81,10 @@
38 |16 |0 |4.0 |460 |CZ |Composite Refl |MODE=CZ-1km:{S} Composite Refl ({U}) {B}bit;MODE=CZ-4bit:{S} 4km Composite Ref ({U});MODE=CZ-Pg:{S} Comb Att Table Page {P}/{P#};MODE=CZ-alt:{S} Comp Refl {B}bit ({U});MODE=VIL:{S} VIL/Comp Ref ({U})|MODE=CZ-1km:{S} Comp Refl {B}bit;MODE=CZ-4bit:{S} 4km Comp Ref;MODE=CZ-Pg:{S} CZ 4km Pg {P}/{P#};MODE=CZ-alt:{S} Comp Refl;MODE=VIL:{S} VIL/Comp|Raster | | | | |Z | | | | |4 |dBZ |
41 |16 |0 |4.0 |230 |ET |Echo Tops |{S} Echo Tops ({U}) |{S} Echo Tops |Raster | | | | | | | | | |6 |ft*1000 |
135|256 |0 |1.0 |460 |EET |Enhanced Echo Tops |{S} Enhanced Echo Tops ({U}) |{S} Enh Echo Tops |Radial | | | | | | | | | |44 |ft*1000 | y
43 |16 |0 |1.0 |230 |SWR |Svr Wx Anal - Ref |Svr Wx Anal - Ref |SWR |Radial |y | |y | | | | | | |52 | |
44 |16 |0 |0.25 |230 |SWV |Svr Wx Anal - Vel |Svr Wx Anal - Vel |SWV |Radial |y | |y | |V | | | | |53 | |
45 |8 |0 |0.25 |230 |SWW |Svr Wx Anal - SW |Svr Wx Anal - SW |SWW |Radial |y | |y | | | | | | |54 | |
46 |16 |0 |0.5 |230 |SWS |Svr Wx Anal - Shear |Svr Wx Anal - Shear |SWS |Radial |y | |y | | | | | | |55 | |
43 |16 |0 |1.0 |230 |SWR |Svr Wx Analysis - Ref |Svr Wx Analysis - Ref |SWR |Radial |y | |y | | | | | | |52 | |
44 |16 |0 |0.25 |230 |SWV |Svr Wx Analysis - Vel |Svr Wx Analysis - Vel |SWV |Radial |y | |y | |V | | | | |53 | |
45 |8 |0 |0.25 |230 |SWW |Svr Wx Analysis - SW |Svr Wx Analysis - SW |SWW |Radial |y | |y | | | | | | |54 | |
46 |16 |0 |0.5 |230 |SWS |Svr Wx Analysis - Shear |Svr Wx Analysis - Shear |SWS |Radial |y | |y | | | | | | |55 | |
47 |0 |0 |4.0 |230 |SWP |Severe Wx Prob |Severe Wx Prob |SWP |Graphic| | | | | | | | | |37 | |
48 |8 |0 |0.0 |0 |VWP |VAD Wind Profile |{S} VAD Wind Profile ({U}) |{S} VAD Winds |XY | | | | | | | | | |40 |kts |
50 |16 |0 |1.0 |230 |RCS |Ref X-Sect |{S} Xsect Refl ({U}) |{S} Refl xsect |XY | | | | | |y | | | |56 |dBZ |