Commit graph

526 commits

Author SHA1 Message Date
Matt Nash
1b9d645810 Issue #1101 fix gfe keybindings for frame change in collaboration
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

Former-commit-id: ba698ae69a [formerly 018f590c70] [formerly ba698ae69a [formerly 018f590c70] [formerly ada6ecf5f3 [formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]]
Former-commit-id: ada6ecf5f3
Former-commit-id: cac1c2bb2e [formerly 1242054a50]
Former-commit-id: 5c568beda7
2012-08-27 12:16:38 -05:00
Steve Harris
f77517a280 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 2e6842016b [formerly 3ee334378c] [formerly 2e6842016b [formerly 3ee334378c] [formerly 076dccf42d [formerly 534486bf918d5384d062d7501f0f1c4a0b4f0172]]]
Former-commit-id: 076dccf42d
Former-commit-id: 65b91e1506 [formerly a93487ab96]
Former-commit-id: ccac12a757
2012-08-27 11:32:45 -05:00
Steve Harris
3f44e46a6f Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 51eb89eb2a [formerly 91e39617cb] [formerly 51eb89eb2a [formerly 91e39617cb] [formerly a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: dbcb28ce77 [formerly 87a602dfee]
Former-commit-id: 0b647c0c9d
2012-08-27 09:53:55 -05:00
Nate Jensen
73ebf63e4e Merge "Issue #1096 fix memory leaks in CcfpResource" into development
Former-commit-id: eac562204d [formerly 94b7f40d1d] [formerly eac562204d [formerly 94b7f40d1d] [formerly 168bee4bd7 [formerly 0f98c3bfbf041cd46311517f2819ca2d81b1cd34]]]
Former-commit-id: 168bee4bd7
Former-commit-id: 977664c699 [formerly a2f594e354]
Former-commit-id: 22b6406fe4
2012-08-27 09:21:50 -05:00
Nate Jensen
89ee6e08d2 Issue #1096 fix memory leaks in CcfpResource
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc

Former-commit-id: 7b62f6ac75 [formerly 73f428e4d5] [formerly 7b62f6ac75 [formerly 73f428e4d5] [formerly 047441f91c [formerly 5e9d7763442ab91cb8d33c16139eb5bca9b033ea]]]
Former-commit-id: 047441f91c
Former-commit-id: 0cc8e95b0c [formerly 347c13143b]
Former-commit-id: 226092da3f
2012-08-23 18:18:23 -05:00
Max Schenkelberg
713f9be08b Issue #28 Changed ResourceList so it can be extended to allow duplicates. Removed deleted files from ISerializableObject files. Made TileSetRenderable properly issue refresh when images were still being requested. Made true color code work by only showing intersecting areas of all bands on screen. Made so shader files would be reread in if edited.
Change-Id: Ib2ce27522c59f25ce1cef65e6d7665e28963f081

Former-commit-id: 1f84ddbddf [formerly 75b2cdff47] [formerly 1f84ddbddf [formerly 75b2cdff47] [formerly c4812b7745 [formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]]]
Former-commit-id: c4812b7745
Former-commit-id: 6f96fa5045 [formerly 7f506ce81d]
Former-commit-id: 8e894dba11
2012-08-23 17:37:12 -05:00
David Gillingham
d1801d7942 Issue #1087: Enable DRT for CAVE operational mode.
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9

Former-commit-id: f3a33e3df4 [formerly f7182ae9c7] [formerly f3a33e3df4 [formerly f7182ae9c7] [formerly ec2d211800 [formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]]]
Former-commit-id: ec2d211800
Former-commit-id: 3b41cd02f4 [formerly cbd3bfacfa]
Former-commit-id: 1856f2b941
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
e1a3c762b7 Issue #1006 Implemented urban areas. Cherry picked from development on SS builds
Conflicts:

	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java

Change-Id: Ife20e07ccffeb6e6f5cc4aabdc6c57c9ed6e9ff8

Former-commit-id: 20c65a4677 [formerly 1b45f1b6d9] [formerly 20c65a4677 [formerly 1b45f1b6d9] [formerly f646b185da [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]]
Former-commit-id: f646b185da
Former-commit-id: da1f3fe29b [formerly a09fa0b649]
Former-commit-id: acf62bb8d9
2012-08-23 09:27:46 -05:00
Ben Steffensmeier
d608483d9f Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
Former-commit-id: 596b48c490 [formerly e1c07b5803] [formerly 596b48c490 [formerly e1c07b5803] [formerly a988fdf5de [formerly 61aab7b55f9868e69b43c5250515ce0d5b01d6e5]]]
Former-commit-id: a988fdf5de
Former-commit-id: da05d2dd24 [formerly 4f16803030]
Former-commit-id: 6ab6152235
2012-08-22 13:02:56 -05:00
Steve Harris
c9652b48f1 Issue #915 Set the user data. (cherry picked from development_on_ss_builds)
Conflicts:

	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java


Former-commit-id: 04c8c3ca55 [formerly 8e3ecc1efd] [formerly 04c8c3ca55 [formerly 8e3ecc1efd] [formerly b8629a0f20 [formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]]
Former-commit-id: b8629a0f20
Former-commit-id: d974aaf277 [formerly 9565d18b96]
Former-commit-id: bbe382231f
2012-08-22 13:01:08 -05:00
Max Schenkelberg
fec3be6b57 Issue #28 Finished True Color Dialog and resource to allow overriding and persisting in bundle custom ranges set from the dialog.
Change-Id: Ia2629964d8c31d18ec469b0f5030efb9fd87445e

Former-commit-id: e404398ea6 [formerly f381871fc4] [formerly e404398ea6 [formerly f381871fc4] [formerly 6e1059f8be [formerly a34c116fbbad86f758882461dd96da9c6ab14cdd]]]
Former-commit-id: 6e1059f8be
Former-commit-id: 919000d0dd [formerly ed033f8657]
Former-commit-id: 587ad5d2e4
2012-08-21 11:36:35 -05:00
Max Schenkelberg
dcbab7d58f Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014

Former-commit-id: fc06265360 [formerly b69d2cad1c] [formerly fc06265360 [formerly b69d2cad1c] [formerly 1b406ecfca [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]]
Former-commit-id: 1b406ecfca
Former-commit-id: 47cefd1513 [formerly aa9df46a1d]
Former-commit-id: 362d34bee0
2012-08-20 14:47:14 -05:00
Ron Anderson
f69d7b9c64 Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.

Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff

Former-commit-id: 16231374f8 [formerly d7a818fd1d] [formerly 16231374f8 [formerly d7a818fd1d] [formerly 7662d249ab [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]
Former-commit-id: 7662d249ab
Former-commit-id: 6e3674f9fc [formerly d3693827a1]
Former-commit-id: 1b655b0826
2012-08-17 12:41:49 -05:00
Ron Anderson
b78c280ac8 Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: 93c632c1ff [formerly 1321db6a99] [formerly 93c632c1ff [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]
Former-commit-id: 819b9c8e56
Former-commit-id: e5952c1c99 [formerly 6eafdda705]
Former-commit-id: f7b9190b51
2012-08-17 12:20:08 -05:00
Steve Harris
8413f8d96c Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
Former-commit-id: 735ed2ecd9 [formerly fa77df807d] [formerly 735ed2ecd9 [formerly fa77df807d] [formerly 596d19466b [formerly 55326667ca13a37c7802849484949382e65a6329]]]
Former-commit-id: 596d19466b
Former-commit-id: b0b8a13e60 [formerly 20fda57d37]
Former-commit-id: 9e75c7e5f1
2012-08-16 10:27:51 -05:00
root
84a8231c49 Merge branch 'reconcile' into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java

Former-commit-id: d170ae704b [formerly b93989daaf] [formerly d170ae704b [formerly b93989daaf] [formerly ba40e18fb2 [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]]
Former-commit-id: ba40e18fb2
Former-commit-id: fd69b031d2 [formerly 3e9d1fa430]
Former-commit-id: 64c3ccb4a4
2012-08-15 22:29:07 +00:00
root
0eb9520e15 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209]
Former-commit-id: 1792158ef8
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
2256ec871d Issue #1065 fix contexts to deactivate when unrecognized views activate.
Former-commit-id: e8524301b5 [formerly 6d9d0a406f] [formerly e8524301b5 [formerly 6d9d0a406f] [formerly 4203807a77 [formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]]
Former-commit-id: 4203807a77
Former-commit-id: d7597d8cf7 [formerly 8a170234b8]
Former-commit-id: 62979089d3
2012-08-15 16:36:05 -05:00
Nate Jensen
b0eb5c1493 Merge "Issue #1033 do not load grib data on tileset creation but instead load allow it to load async." into development_on_ss_builds
Former-commit-id: b94597d03c [formerly 9c1597b554] [formerly b94597d03c [formerly 9c1597b554] [formerly 6897b1d480 [formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]]]
Former-commit-id: 6897b1d480
Former-commit-id: 3b31bc0500 [formerly b7bc962da4]
Former-commit-id: ca08f538e8
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
e64c4d343f Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
Former-commit-id: 9c41e73ee5 [formerly cb99170685] [formerly 9c41e73ee5 [formerly cb99170685] [formerly b194a17abc [formerly 97d786afadf136f75ffd6a440d35b628e144b888]]]
Former-commit-id: b194a17abc
Former-commit-id: 98728915f8 [formerly 74acf329c4]
Former-commit-id: 48a5389b2f
2012-08-15 15:25:46 -05:00
Jonathan Sanchez
49c757f958 Issue #915 Set the user data.
Former-commit-id: f37a75f265 [formerly 865136f6ef] [formerly f37a75f265 [formerly 865136f6ef] [formerly 03ed8ee0b0 [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]]
Former-commit-id: 03ed8ee0b0
Former-commit-id: f1749f4fcc [formerly e584d728f0]
Former-commit-id: 38bb2743e5
2012-08-15 14:05:50 -05:00
Nate Jensen
826b645296 Merge "Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container" into development
Former-commit-id: d70d78d664 [formerly 2cb82b7170] [formerly d70d78d664 [formerly 2cb82b7170] [formerly 91e0ba8c23 [formerly d252760b0e39002e53a5fce809b38521ca2351aa]]]
Former-commit-id: 91e0ba8c23
Former-commit-id: 1da09f201e [formerly 5b26d1e93e]
Former-commit-id: ebad112688
2012-08-14 16:52:40 -05:00
Steve Harris
f6ec677a1b Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 27fa10e133 [formerly e3927a11c7] [formerly 27fa10e133 [formerly e3927a11c7] [formerly e530637aa3 [formerly 43d4642bc39a053d40fce9b6aff1d11f3d313dd7]]]
Former-commit-id: e530637aa3
Former-commit-id: 118113bd60 [formerly 1687889756]
Former-commit-id: 03ebee99f8
2012-08-14 16:26:00 -05:00
Ben Steffensmeier
0181083df2 Issue #1058 fix reprojection of wind vectors
Former-commit-id: 28aae9f11f [formerly ba9d0b25b5] [formerly 28aae9f11f [formerly ba9d0b25b5] [formerly 9c727d2e33 [formerly 8fdc9841f9033720aa0ceb6389e7b1403d75a2d5]]]
Former-commit-id: 9c727d2e33
Former-commit-id: 2ac8180928 [formerly e65832b2bf]
Former-commit-id: 5112b6ce69
2012-08-14 16:15:19 -05:00
David Gillingham
67586ea006 Issue #1055: Fix coop precip breakage from Wes2Bridge db changes.
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad

Former-commit-id: e541c86f1b [formerly f40fc68c28] [formerly e541c86f1b [formerly f40fc68c28] [formerly 79a77a38a4 [formerly 03f9de1860008cd1a2b4b60576802a67a8a447fa]]]
Former-commit-id: 79a77a38a4
Former-commit-id: 5ce4e54db9 [formerly dd80a94061]
Former-commit-id: 18c572c983
2012-08-14 16:15:10 -05:00
Ben Steffensmeier
5c560e5a56 Issue #1018 change product browser to handle no editor conditions better.
Change-Id: I3235ebb6d50eee26c75d31ce91e2a01c2d49b300

Former-commit-id: 6267bdb915 [formerly 4d20aa0e82] [formerly 6267bdb915 [formerly 4d20aa0e82] [formerly 7559065a1d [formerly 7cb30aa5c00eea5b95b6c4b39653fabeaccdd872]]]
Former-commit-id: 7559065a1d
Former-commit-id: 48963ebc07 [formerly 850203f715]
Former-commit-id: 7f5bd99b0c
2012-08-14 15:23:34 -05:00
Lee Venable
3187523b41 Merge "Issue #1055: Fix coop precip breakage from Wes2Bridge db changes." into development_on_ss_builds
Former-commit-id: fe9a85cefb [formerly 457d099cca] [formerly fe9a85cefb [formerly 457d099cca] [formerly 2c2a3f4aec [formerly cf7be4b4a2a49f365258f1ac6262b64e86e705e4]]]
Former-commit-id: 2c2a3f4aec
Former-commit-id: b42d389cb2 [formerly a3651c5813]
Former-commit-id: 5f180a03cc
2012-08-14 14:26:10 -05:00
Ben Steffensmeier
dfd6d73cc2 Issue #1058 fix reprojection of wind vectors
Former-commit-id: 283781ba03 [formerly c25c08c8e7] [formerly 283781ba03 [formerly c25c08c8e7] [formerly 09c412d754 [formerly 315965383123120bffe1faa1d63fdfb7b633bc97]]]
Former-commit-id: 09c412d754
Former-commit-id: 6207cd7310 [formerly ea551d3866]
Former-commit-id: e0561a1a35
2012-08-14 13:44:21 -05:00
David Gillingham
767fdf56a1 Issue #1055: Fix coop precip breakage from Wes2Bridge db changes.
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad

Former-commit-id: 06e789e986 [formerly b587c1ea4f] [formerly 06e789e986 [formerly b587c1ea4f] [formerly f2795370d1 [formerly da6811db78e3fcf57acc25e417ec8319c1dceecf]]]
Former-commit-id: f2795370d1
Former-commit-id: 35ac266c34 [formerly e51d931a5a]
Former-commit-id: 2ba2b982a0
2012-08-14 13:36:51 -05:00
Ben Steffensmeier
d6c42b28bf Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
Former-commit-id: 474fe44037 [formerly a4c46c7f55] [formerly 474fe44037 [formerly a4c46c7f55] [formerly 0857d971b5 [formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]]
Former-commit-id: 0857d971b5
Former-commit-id: 08021bcfc2 [formerly a02bb2c092]
Former-commit-id: a17bae6f40
2012-08-14 10:25:38 -05:00
Max Schenkelberg
3d43480508 Issue #28 Implemented generic true color resource with new extension. Wrote new, more efficient, accurate, and scalable TileSet rendering/managing code to replace AbstractTileSet which VIIRS uses since it took over 10s to load a single frame of data with AbstractTileSet and around 20-30s to load a single true color frame of VIIRS. Put true color code in separate projects to encapsulate functionality. Resources need not depend on these projects, they just have to set the ImagingProvider in their ImagingCapability and true color resource can be loaded through a bundle file.
Change-Id: I624edb115b02611470e2e434e27759c45600111c

Former-commit-id: d6522f8e3a [formerly 93e8619fa5] [formerly d6522f8e3a [formerly 93e8619fa5] [formerly 09b0db0a13 [formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]]
Former-commit-id: 09b0db0a13
Former-commit-id: 107efcaee3 [formerly 784c43ab7c]
Former-commit-id: 79f15e475e
2012-08-13 12:20:05 -05:00
Ben Steffensmeier
f87969cbee Issue #1004 change plots to synchronize with dispose instead of joining since join allows paint to happen
Change-Id: I6011a5fedc155ab8d515d3c6eb5d368f582c59bd

Former-commit-id: 6f178a9150 [formerly 603a9c90e4] [formerly 6f178a9150 [formerly 603a9c90e4] [formerly 559efb19fb [formerly aece671b35405e1f278439c9a1a8230dad5cf4c2]]]
Former-commit-id: 559efb19fb
Former-commit-id: d52dd42ab2 [formerly 3f258a2bf8]
Former-commit-id: fa8ea385d9
2012-08-13 09:54:22 -05:00
Ben Steffensmeier
32287c896b Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 573cc270e8 [formerly c6a121962f] [formerly 573cc270e8 [formerly c6a121962f] [formerly 1e527f83f0 [formerly 06c2c85159598ca803c663de97caed4b6841c135]]]
Former-commit-id: 1e527f83f0
Former-commit-id: 0af9fd4fe2 [formerly c9ff69014b]
Former-commit-id: dc8d05c1be
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
62aafd3542 Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 8d118c392a [formerly 525c0b21a9] [formerly 8d118c392a [formerly 525c0b21a9] [formerly b53fe917bc [formerly 045952304218c867d8fe89df9828f70632df2d00]]]
Former-commit-id: b53fe917bc
Former-commit-id: 54b3078ad1 [formerly 4ed3d04e64]
Former-commit-id: fafea907c7
2012-08-09 17:50:23 -05:00
Ben Steffensmeier
de38003e6c Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
Former-commit-id: 3f92e385a6 [formerly 3abfef55cc] [formerly 3f92e385a6 [formerly 3abfef55cc] [formerly c1bacb33b1 [formerly 6cb8e45b4f3a78abcfeee982306684eef025fd3d]]]
Former-commit-id: c1bacb33b1
Former-commit-id: 0e48e6e4fd [formerly f711cfdae2]
Former-commit-id: 30702ea3c6
2012-08-09 17:45:19 -05:00
Nate Jensen
5e82400554 Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds
Former-commit-id: 32cc46ec4e [formerly eeaa2c798f] [formerly 32cc46ec4e [formerly eeaa2c798f] [formerly 4211a8deac [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]]
Former-commit-id: 4211a8deac
Former-commit-id: c0fa1e8cf2 [formerly 2cc3c63ba7]
Former-commit-id: 0df3ab80eb
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
aa740ef6a8 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 64caa963b1 [formerly 066a5af2a6] [formerly 64caa963b1 [formerly 066a5af2a6] [formerly ad1415948f [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]]
Former-commit-id: ad1415948f
Former-commit-id: e03eb5f5c9 [formerly 65c33256d9]
Former-commit-id: 70f8f93f81
2012-08-09 17:16:38 -05:00
Jonathan Sanchez
1986477214 Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.


Former-commit-id: 4f2d6630c1 [formerly 6507a97665] [formerly 4f2d6630c1 [formerly 6507a97665] [formerly fa7795d17f [formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]]]
Former-commit-id: fa7795d17f
Former-commit-id: 3952dfc7ac [formerly 7ad6329fe0]
Former-commit-id: 8a006c6093
2012-08-09 08:26:21 -05:00
Ben Steffensmeier
873a7d64b6 Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: cac790ac5a [formerly 97ba96759c] [formerly cac790ac5a [formerly 97ba96759c] [formerly 5da238c8b9 [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]]
Former-commit-id: 5da238c8b9
Former-commit-id: 8cdf1f8d1c [formerly b6cc71bf75]
Former-commit-id: 726e934763
2012-08-08 14:41:33 -05:00
Jonathan Sanchez
6d4683e90d Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.

Former-commit-id: 17a3198056 [formerly 051b63c3e9] [formerly 17a3198056 [formerly 051b63c3e9] [formerly df301c2e03 [formerly cfaece96bd77aef32073400c1abaf0bf8cd3f103]]]
Former-commit-id: df301c2e03
Former-commit-id: cc261d9ce2 [formerly 200ed3c3fb]
Former-commit-id: e2d5a0b384
2012-08-07 14:50:15 -05:00
Ben Steffensmeier
1dc30083ca Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
Former-commit-id: 0a974b26c2 [formerly c9774a4f03] [formerly 0a974b26c2 [formerly c9774a4f03] [formerly 83d6cde368 [formerly 4c5e5e0d54c523723edd16b756dc1caf208f5cd6]]]
Former-commit-id: 83d6cde368
Former-commit-id: f47d533ac3 [formerly ea70488664]
Former-commit-id: d645fc787e
2012-08-07 12:03:13 -05:00
Steve Harris
b77e7400c8 Merge branch 'development' into development_on_ss_builds
Former-commit-id: f540dbfb87 [formerly 32ee17d124] [formerly f540dbfb87 [formerly 32ee17d124] [formerly 515c8ec596 [formerly 69faa80856ac4c63f9cc79ccd7370e129093f091]]]
Former-commit-id: 515c8ec596
Former-commit-id: 5e30a4282c [formerly 533d58b312]
Former-commit-id: e3da0259e8
2012-08-06 12:57:56 -05:00
Steve Harris
3f8544203f Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 60c0cfc3b3 [formerly d90c5f989d] [formerly 60c0cfc3b3 [formerly d90c5f989d] [formerly f3babcf1a1 [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]]
Former-commit-id: f3babcf1a1
Former-commit-id: 2f3ef9f4da [formerly 62e9207ba7]
Former-commit-id: 0428530b73
2012-08-06 11:13:47 -05:00
Max Schenkelberg
335d2a0942 Issue #626 Fixed GLStats to print proper message name. Fixed SatelliteDao to correctly use UnsignedByteArrayWrapper to properly reflect data. Modified UnsignedShortArrayWrapper to extend ShortArrayWrapper like Byte/UnsignedByteArrayWrapper does. Fixed DataTime legend generation when time range is not even hour increment
Change-Id: Ie79883c1d901f24042234fe5e79b5ae903e5792b

Former-commit-id: ae3b62ca12 [formerly 36bf80d13e] [formerly ae3b62ca12 [formerly 36bf80d13e] [formerly 0031d21292 [formerly b0466e68bea4102f397db214bb58b66c10a338ed]]]
Former-commit-id: 0031d21292
Former-commit-id: 1aa6d193b4 [formerly 482dfb4711]
Former-commit-id: 92df0af108
2012-08-06 09:44:44 -05:00
Steve Harris
9fd142b98e Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 9e2d161f8d [formerly f0b7d5e4c5] [formerly 9e2d161f8d [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]
Former-commit-id: 85f82b18b3
Former-commit-id: 52e0da2293 [formerly b2432e096f]
Former-commit-id: dcc56b8a23
2012-08-06 09:38:26 -05:00
Steve Harris
78d66ba6df 12.8.1-10 baseline
Former-commit-id: 6244359a80 [formerly b5e8fee24d] [formerly 6244359a80 [formerly b5e8fee24d] [formerly ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: 78d34d65d2 [formerly d5563fc340]
Former-commit-id: 46daa48f1c
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
9737533feb Issue #1006 Implemented urban areas.
Former-commit-id: 06ce1c6dd5 [formerly dbd30e3b67] [formerly 06ce1c6dd5 [formerly dbd30e3b67] [formerly 62db15b6f4 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]]]
Former-commit-id: 62db15b6f4
Former-commit-id: 1af2520b91 [formerly f26cce33a9]
Former-commit-id: 549b50ea40
2012-08-06 08:41:52 -05:00
Steve Harris
b62ac9c78e Merge branch 'development' into development_on_ss_builds
Former-commit-id: 54c505dd8e [formerly 24799cd93d] [formerly 54c505dd8e [formerly 24799cd93d] [formerly a1071e3204 [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]
Former-commit-id: a1071e3204
Former-commit-id: dbe07ca70c [formerly 8f4ddad22c]
Former-commit-id: d507458b9b
2012-08-06 08:23:04 -05:00
Ben Steffensmeier
e6a6c5345e Issue #988 set statem bits on underlieing image for GLDelegate Image
Former-commit-id: 6e3cd8976b [formerly 0f7dd0f4cd] [formerly 6e3cd8976b [formerly 0f7dd0f4cd] [formerly 5fe65c6538 [formerly 39444045f7cc4f4e4fac86b15ca7b98cf2cb9ded]]]
Former-commit-id: 5fe65c6538
Former-commit-id: 83effa4f85 [formerly 6ccc09e0b4]
Former-commit-id: b03eceb82a
2012-08-03 16:39:33 -05:00
Ben Steffensmeier
a1c0547c50 Issue #978 GChange GridResource to use its own times rather than descriptor times.
Former-commit-id: c5c9e8b05c [formerly 8346805ed2] [formerly c5c9e8b05c [formerly 8346805ed2] [formerly 090b9f5ccb [formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]]]
Former-commit-id: 090b9f5ccb
Former-commit-id: 5954717c26 [formerly 942b0e5315]
Former-commit-id: 42e01d8b1b
2012-08-03 15:52:47 -05:00