Richard Peter
7969ef9648
Merge branch 'development_on_RHEL5' (GOES-R) into development
...
Conflicts:
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
nativeLib/edexBridge/edexBridge.cpp
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: e82e1137f9
[formerly f5f75ec629
[formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]
Former-commit-id: f5f75ec629
Former-commit-id: 760f215e8c
2013-12-03 16:25:31 -06:00
Ben Steffensmeier
dcfdc9a24b
Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
...
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0
Former-commit-id: 3696896b49
[formerly 927801985a
[formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]
Former-commit-id: 927801985a
Former-commit-id: 8a7d3ceab1
2013-11-25 11:31:57 -06:00
Nate Jensen
462878bf86
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 78b01f61c4
[formerly dd99aa3f47
[formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]
Former-commit-id: dd99aa3f47
Former-commit-id: 757ca42a5f
2013-11-14 17:41:24 -06:00
Nate Jensen
9517c96d68
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: c5cf68cc45
[formerly 9acda0b9f2
[formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]
Former-commit-id: 9acda0b9f2
Former-commit-id: a4eb19fc79
2013-11-14 13:29:30 -06:00
Brian Clements
75f633875a
Issue #2404 Moved colormap parameter factory to common
...
moved grid level translator from viz to common
updated references to moved classes
created grid style util for common styling code
updated style manager to look in common for files
moved data plugin style rules to common
Former-commit-id: 75448f8a42
[formerly 2f25116c10
[formerly 7cdff04cc4d60b50a2a2c08499ee329586031e0f]]
Former-commit-id: 2f25116c10
Former-commit-id: 4c5d2b051d
2013-09-27 09:41:51 -05:00
Matt Nash
31413ab72a
Issue #2251 make style rules pluggable
...
Change-Id: I3adc5c94eb4a13686b346d231248faebc696c865
Former-commit-id: cb7d5a4c70
[formerly dd7111d7d3
[formerly 9e31d3facd4d4807db060d6e1de29215b11a448e]]
Former-commit-id: dd7111d7d3
Former-commit-id: c4a6097e8b
2013-09-10 09:50:56 -05:00
Matt Nash
e2d8355f77
Issue #2251 move style rules and preferences to common
...
Change-Id: I50bd92d1ed4e08d7d6204b7fa1cca0e8f1645030
Former-commit-id: f0a32e82a1
[formerly 06e04a419d
[formerly 982f297ab19ebcb5e49f662c30b44992e63569cb]]
Former-commit-id: 06e04a419d
Former-commit-id: e6af6c447f
2013-09-10 09:28:11 -05:00