Richard Peter
2e90e498f3
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: 7969ef9648
[formerly 760f215e8c
] [formerly f5f75ec629
] [formerly 7969ef9648
[formerly 760f215e8c
] [formerly f5f75ec629
] [formerly e82e1137f9
[formerly f5f75ec629
[formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]]
Former-commit-id: e82e1137f9
Former-commit-id: 2cafd3a81b
[formerly ee03dcf505
] [formerly cecc12c190bbaa908cbfe835a5a9a64a5ba96dba [formerly 94994868fa
]]
Former-commit-id: d636e539a84c2fe845b3dcfc419fff85a3a47055 [formerly b0e694483f
]
Former-commit-id: 30862929e2
2013-12-03 16:25:31 -06:00
Ben Steffensmeier
bdf45ea291
Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
...
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0
Former-commit-id: dcfdc9a24b
[formerly 8a7d3ceab1
] [formerly 927801985a
] [formerly dcfdc9a24b
[formerly 8a7d3ceab1
] [formerly 927801985a
] [formerly 3696896b49
[formerly 927801985a
[formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]]
Former-commit-id: 3696896b49
Former-commit-id: 56456894f1
[formerly ca5e771451
] [formerly a7cbce5b5d72746638add296db468539851abb4e [formerly 70ca78c7b5
]]
Former-commit-id: 8c9b502d3f1a66a2504cb05bd0baf7af764cfd79 [formerly a3f5fcabf6
]
Former-commit-id: d307af23eb
2013-11-25 11:31:57 -06:00
Nate Jensen
6b09f38258
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 462878bf86
[formerly 757ca42a5f
] [formerly dd99aa3f47
] [formerly 462878bf86
[formerly 757ca42a5f
] [formerly dd99aa3f47
] [formerly 78b01f61c4
[formerly dd99aa3f47
[formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]]
Former-commit-id: 78b01f61c4
Former-commit-id: d8f4ecc2d7
[formerly d0d712ec6f
] [formerly dc8aea52f7c970fb95e7d9d99a858f44faa15501 [formerly d96cdbe761
]]
Former-commit-id: ec63b3c149df4d0ab77744254adbda1de3fcf101 [formerly f2c777ff48
]
Former-commit-id: 2e81364691
2013-11-14 17:41:24 -06:00
Nate Jensen
493fa54860
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9517c96d68
[formerly a4eb19fc79
] [formerly 9acda0b9f2
] [formerly 9517c96d68
[formerly a4eb19fc79
] [formerly 9acda0b9f2
] [formerly c5cf68cc45
[formerly 9acda0b9f2
[formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]]
Former-commit-id: c5cf68cc45
Former-commit-id: ddcca3463d
[formerly e41f57da67
] [formerly a2b53d6aca5047e5514931e92e017ed5771c890d [formerly a6be904c69
]]
Former-commit-id: 6f2e3001c41627a8a93fc22d02074369aa136e2d [formerly e83a828209
]
Former-commit-id: 6441290b40
2013-11-14 13:29:30 -06:00
Brian Clements
211a10b732
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: 75f633875a
[formerly 4c5d2b051d
] [formerly 2f25116c10
] [formerly 75f633875a
[formerly 4c5d2b051d
] [formerly 2f25116c10
] [formerly 75448f8a42
[formerly 2f25116c10
[formerly 7cdff04cc4d60b50a2a2c08499ee329586031e0f]]]]
Former-commit-id: 75448f8a42
Former-commit-id: 020e0ad959
[formerly fedd0dc781
] [formerly d4cfc1a33bcf3a62fb5caa53d995204178e1de78 [formerly e8cc15940c
]]
Former-commit-id: 709ced1825803b3b455dac5f222841852fd18389 [formerly 0ba625fbe6
]
Former-commit-id: 6cb6d468fe
2013-09-27 09:41:51 -05:00
Matt Nash
185d791390
Issue #2251 make style rules pluggable
...
Change-Id: I3adc5c94eb4a13686b346d231248faebc696c865
Former-commit-id: 31413ab72a
[formerly c4a6097e8b
] [formerly dd7111d7d3
] [formerly 31413ab72a
[formerly c4a6097e8b
] [formerly dd7111d7d3
] [formerly cb7d5a4c70
[formerly dd7111d7d3
[formerly 9e31d3facd4d4807db060d6e1de29215b11a448e]]]]
Former-commit-id: cb7d5a4c70
Former-commit-id: a5319c7348
[formerly af4bc2a359
] [formerly d2abe9be2e5ebedde25e66b09b787f36f4524874 [formerly b873b6e399
]]
Former-commit-id: b5d91a734d643c42b27026439ec8b33e366edf65 [formerly 35cddbf5f9
]
Former-commit-id: 37b4f67f16
2013-09-10 09:50:56 -05:00
Matt Nash
f0f9bdf1ac
Issue #2251 move style rules and preferences to common
...
Change-Id: I50bd92d1ed4e08d7d6204b7fa1cca0e8f1645030
Former-commit-id: e2d8355f77
[formerly e6af6c447f
] [formerly 06e04a419d
] [formerly e2d8355f77
[formerly e6af6c447f
] [formerly 06e04a419d
] [formerly f0a32e82a1
[formerly 06e04a419d
[formerly 982f297ab19ebcb5e49f662c30b44992e63569cb]]]]
Former-commit-id: f0a32e82a1
Former-commit-id: ffb69f5dbe
[formerly 698e2ee1cc
] [formerly e6c81ce8eb0ae4359aa1fa46ebbd30bd4763c607 [formerly 2e8149bcb2
]]
Former-commit-id: 78c3bb3ab67128ff163541066ef51c6d21a0f319 [formerly d1ea1f569f
]
Former-commit-id: d70677d78e
2013-09-10 09:28:11 -05:00