Commit graph

787 commits

Author SHA1 Message Date
Max Schenkelberg
4ae2b6c0e3 Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4

Former-commit-id: d0160a4aa9 [formerly 81531873e0] [formerly 00de2922e1] [formerly d0160a4aa9 [formerly 81531873e0] [formerly 00de2922e1] [formerly 0de737ad64 [formerly 00de2922e1 [formerly b9568b79f531250c859b77296115da32b628318d]]]]
Former-commit-id: 0de737ad64
Former-commit-id: e2e9969448 [formerly ef8ed151a9] [formerly 9a6b2c20c8248d78d8c7b88d4e7f58d9f1001bcb [formerly b75fad8e30]]
Former-commit-id: 60642ef433a57b99d1234624c93e7e1f8efaefed [formerly 48a74eba41]
Former-commit-id: f61b465148
2012-08-29 18:17:30 -05:00
Nate Jensen
5bb78e30fa Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
Former-commit-id: a6afe463af [formerly 4c73903629] [formerly 96393309eb] [formerly a6afe463af [formerly 4c73903629] [formerly 96393309eb] [formerly b47baedad4 [formerly 96393309eb [formerly c06f87cd60290f34b0c9b1ac955f0b72f9de5c5b]]]]
Former-commit-id: b47baedad4
Former-commit-id: e313a785b0 [formerly 45134743b6] [formerly 692922c7e7a4bbe072430e65deae743517f3f114 [formerly e6661037f5]]
Former-commit-id: 88f501602fed0aa170abf9d76285e77d58ebfde3 [formerly 1c53c83f62]
Former-commit-id: 8f479985f3
2012-08-29 16:09:50 -05:00
Max Schenkelberg
0ece0757e3 Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9

Former-commit-id: e03e761b28 [formerly 04c3a1c678] [formerly f8aef2b067] [formerly e03e761b28 [formerly 04c3a1c678] [formerly f8aef2b067] [formerly 81f78fa819 [formerly f8aef2b067 [formerly 3ff192dfb09a0e4512287d45df864375e3900ca1]]]]
Former-commit-id: 81f78fa819
Former-commit-id: 50a53cf8b6 [formerly e593c9d56e] [formerly c78f2cc0795ac993cd9b82670d6a70aae5a945ff [formerly 99c8b1a968]]
Former-commit-id: eea9f8aa0dac4119f9c198b6e6ea08d6f1c45801 [formerly d44378e259]
Former-commit-id: 85319c6284
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
f88a15ae05 Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
Former-commit-id: 669d1023a8 [formerly e3bb8c80c9] [formerly 1f587e39f4] [formerly 669d1023a8 [formerly e3bb8c80c9] [formerly 1f587e39f4] [formerly 37d2411b26 [formerly 1f587e39f4 [formerly e3c5526f9b12ae38c12094e7ebf9f9d6823f3257]]]]
Former-commit-id: 37d2411b26
Former-commit-id: 80ffe1feff [formerly 68235d0744] [formerly a91944b28e23d60c494612c968dc56c1620456c7 [formerly 36dd387007]]
Former-commit-id: 81bcabc15f9c4f2b319eaab7338f813f16a88a56 [formerly b17f2973ca]
Former-commit-id: 9c74b28080
2012-08-29 14:24:21 -05:00
Matt Nash
1071ff2049 Issue #1101 fix gfe keybindings for frame change in collaboration
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

Former-commit-id: 04ce96d74e [formerly ba698ae69a] [formerly 018f590c70] [formerly 04ce96d74e [formerly ba698ae69a] [formerly 018f590c70] [formerly ada6ecf5f3 [formerly 018f590c70 [formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]]]
Former-commit-id: ada6ecf5f3
Former-commit-id: d35027f45e [formerly cac1c2bb2e] [formerly 5dd2067f359bb03dbe5cae64c69ba82ef563a1de [formerly 1242054a50]]
Former-commit-id: c580f22bd8cf1f202bf9fa6adf36dc991f847cf9 [formerly 5c568beda7]
Former-commit-id: 1b9d645810
2012-08-27 12:16:38 -05:00
Steve Harris
713c7f04af Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 948b22090c [formerly 2e6842016b] [formerly 3ee334378c] [formerly 948b22090c [formerly 2e6842016b] [formerly 3ee334378c] [formerly 076dccf42d [formerly 3ee334378c [formerly 534486bf918d5384d062d7501f0f1c4a0b4f0172]]]]
Former-commit-id: 076dccf42d
Former-commit-id: e34edddfbf [formerly 65b91e1506] [formerly 42707840fa34fe9d73bfe6f6f6f9b5aa442077ff [formerly a93487ab96]]
Former-commit-id: 4ff0eea8083ac02fadd1dd00880e4830ea46460a [formerly ccac12a757]
Former-commit-id: f77517a280
2012-08-27 11:32:45 -05:00
Steve Harris
7f13d82b95 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: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]]
Former-commit-id: a71dac6cad
Former-commit-id: fd6e8d5b63 [formerly dbcb28ce77] [formerly 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]]
Former-commit-id: 8e63ec5399842340c4f27680b2ed51ba425ae251 [formerly 0b647c0c9d]
Former-commit-id: 3f44e46a6f
2012-08-27 09:53:55 -05:00
Nate Jensen
2b6c03dfd6 Merge "Issue #1096 fix memory leaks in CcfpResource" into development
Former-commit-id: 07ac473e55 [formerly eac562204d] [formerly 94b7f40d1d] [formerly 07ac473e55 [formerly eac562204d] [formerly 94b7f40d1d] [formerly 168bee4bd7 [formerly 94b7f40d1d [formerly 0f98c3bfbf041cd46311517f2819ca2d81b1cd34]]]]
Former-commit-id: 168bee4bd7
Former-commit-id: 575e5e3806 [formerly 977664c699] [formerly 07a4a5366adf89ce540c10602b6747832bcc42e0 [formerly a2f594e354]]
Former-commit-id: f187c6e1db723226675c6ce1d9296e513ed2ef28 [formerly 22b6406fe4]
Former-commit-id: 73ebf63e4e
2012-08-27 09:21:50 -05:00
Nate Jensen
67ef07fabf Issue #1096 fix memory leaks in CcfpResource
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc

Former-commit-id: 7439c24618 [formerly 7b62f6ac75] [formerly 73f428e4d5] [formerly 7439c24618 [formerly 7b62f6ac75] [formerly 73f428e4d5] [formerly 047441f91c [formerly 73f428e4d5 [formerly 5e9d7763442ab91cb8d33c16139eb5bca9b033ea]]]]
Former-commit-id: 047441f91c
Former-commit-id: 132cc792f4 [formerly 0cc8e95b0c] [formerly 801d77ec89944e6f04cdd301015c751823cf9554 [formerly 347c13143b]]
Former-commit-id: e306b819ff694342c3d2126523aa6327e7ff14a1 [formerly 226092da3f]
Former-commit-id: 89ee6e08d2
2012-08-23 18:18:23 -05:00
Max Schenkelberg
d1bc6e2b45 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: 97759c7ce1 [formerly 1f84ddbddf] [formerly 75b2cdff47] [formerly 97759c7ce1 [formerly 1f84ddbddf] [formerly 75b2cdff47] [formerly c4812b7745 [formerly 75b2cdff47 [formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]]]]
Former-commit-id: c4812b7745
Former-commit-id: 8fb5b29881 [formerly 6f96fa5045] [formerly 991a8632682c94855dfb4abec915f0eae9146f28 [formerly 7f506ce81d]]
Former-commit-id: 8d591ae44fba6435f779585c9883742d906d181e [formerly 8e894dba11]
Former-commit-id: 713f9be08b
2012-08-23 17:37:12 -05:00
David Gillingham
8dbdf09690 Issue #1087: Enable DRT for CAVE operational mode.
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9

Former-commit-id: a03dfbea98 [formerly f3a33e3df4] [formerly f7182ae9c7] [formerly a03dfbea98 [formerly f3a33e3df4] [formerly f7182ae9c7] [formerly ec2d211800 [formerly f7182ae9c7 [formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]]]]
Former-commit-id: ec2d211800
Former-commit-id: b33e97efd3 [formerly 3b41cd02f4] [formerly 6b68db4233ced16f4cebc0b40b285c958108b1b8 [formerly cbd3bfacfa]]
Former-commit-id: abf0993fd7cd743ab5654bfbf8161364ccd1677d [formerly 1856f2b941]
Former-commit-id: d1801d7942
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
b0a7548f0f 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: caaa78a981 [formerly 20c65a4677] [formerly 1b45f1b6d9] [formerly caaa78a981 [formerly 20c65a4677] [formerly 1b45f1b6d9] [formerly f646b185da [formerly 1b45f1b6d9 [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]]]
Former-commit-id: f646b185da
Former-commit-id: 137c2871ad [formerly da1f3fe29b] [formerly 1c449e3e548384fc5bac6858d0c0c2448e8c91fe [formerly a09fa0b649]]
Former-commit-id: 608dd8e51159f71f7b5cc2112bc1c50008509247 [formerly acf62bb8d9]
Former-commit-id: e1a3c762b7
2012-08-23 09:27:46 -05:00
Nate Jensen
86941a545e Merge "Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards." into development
Former-commit-id: 3146f03455 [formerly dab98d0625] [formerly 20c69ffef3] [formerly 3146f03455 [formerly dab98d0625] [formerly 20c69ffef3] [formerly 21df8f9986 [formerly 20c69ffef3 [formerly dad3bad6ebf34dd33b8d566a06c4f10a089ef35b]]]]
Former-commit-id: 21df8f9986
Former-commit-id: b3601437d5 [formerly 701dbef8d6] [formerly e8f857394d2a2bbbd4b6a347346aa0ecbb2aeeff [formerly fbcb1eab54]]
Former-commit-id: dc0e0b3e2dec812f3f47eb726e63dc70c19b81f0 [formerly 18639218ed]
Former-commit-id: 54e452911f
2012-08-23 08:47:40 -05:00
Richard Peter
4a9753cdc3 Merge "Issue #798 - Correct for hdfFileId" into development
Former-commit-id: f9878c21f7 [formerly 0dd2c44c9c] [formerly 6c1690e063] [formerly f9878c21f7 [formerly 0dd2c44c9c] [formerly 6c1690e063] [formerly 4c56f4e20d [formerly 6c1690e063 [formerly 6aa68692dc050d61946be620a6f629c186e0fdaf]]]]
Former-commit-id: 4c56f4e20d
Former-commit-id: f8c069352b [formerly 46cd0f5110] [formerly aa9cb1756d6fdff94be46dc7b16cb3fc2c90806e [formerly 252e8e7e2e]]
Former-commit-id: 44c1fc2df02dd66af0ffe3c3ca67ea2db5e42d78 [formerly 4a1c27bd22]
Former-commit-id: 50ea44a1d3
2012-08-22 17:07:17 -05:00
Ron Anderson
4226b70640 Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards.
Change-Id: Ie311cf19850cf4205f30282741a96c0cdc9f3c9c

Former-commit-id: 25b6e47dbd [formerly 82e45b58fa] [formerly 5abacc273d] [formerly 25b6e47dbd [formerly 82e45b58fa] [formerly 5abacc273d] [formerly 576ccd6a38 [formerly 5abacc273d [formerly 9c439cc43ffe38fcecaae552ad820f310b7f4267]]]]
Former-commit-id: 576ccd6a38
Former-commit-id: 61060e0eac [formerly b6117e9945] [formerly 4168707c865619b3aa1f92f5986758f9dfd9ffdf [formerly 19f956b93f]]
Former-commit-id: 81a139d6130a4d0960f36c5b41824c1bf471a046 [formerly 90733f03a0]
Former-commit-id: 1382e2ebe6
2012-08-22 16:41:19 -05:00
Steve Harris
2a7a7bfe2b Merge branch 'ss_builds' (12.9.1-5 forgotten bin files) into development_on_ss_builds
Conflicts:
	edexOsgi/build.edex/esb/bin/linux-x86-64/wrapper

Former-commit-id: bdf8d89d33 [formerly fbe4210245] [formerly 13f70884f3] [formerly bdf8d89d33 [formerly fbe4210245] [formerly 13f70884f3] [formerly 9425f73c71 [formerly 13f70884f3 [formerly aa64613b0d04bca36310817989c79d12f0f107db]]]]
Former-commit-id: 9425f73c71
Former-commit-id: cef1cd081f [formerly 3e9ee884ab] [formerly f6fea8385be99f0d8a7dfa5a524af6d134db5dc0 [formerly de16453f4f]]
Former-commit-id: 5fb55cc355cf3a4d7f80e83f63c1bdbee59a4df8 [formerly 5656ac11a1]
Former-commit-id: 36d0af113d
2012-08-22 16:06:02 -05:00
Steve Harris
d5bb93d38f 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e1cf4b0b9a [formerly 7a4f4ac493] [formerly b8ab6066f6] [formerly e1cf4b0b9a [formerly 7a4f4ac493] [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]]
Former-commit-id: b77a4d40d7
Former-commit-id: fffd905412 [formerly 34fa4b5804] [formerly 49afa39c09674dd9b84bfb0d70e9a7be354e2f85 [formerly b2c0dd1abb]]
Former-commit-id: f3c30482814339d1bee25e242cd37c19e921ea03 [formerly 8f1120f6d8]
Former-commit-id: d404638d82
2012-08-22 16:00:33 -05:00
James Korman
28108e3193 Issue #798 - Correct for hdfFileId
Former-commit-id: 7d61470ce7 [formerly 6d250cf9f3] [formerly 56d6b1e886] [formerly 7d61470ce7 [formerly 6d250cf9f3] [formerly 56d6b1e886] [formerly c2c228b429 [formerly 56d6b1e886 [formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]]]]
Former-commit-id: c2c228b429
Former-commit-id: ce2d764418 [formerly ea24ef83b8] [formerly a916e362db2cd43e97c1bd5342c3a7bf8e191bc2 [formerly 654ecefd3e]]
Former-commit-id: 48f868c7944e7676145880be8459bd334cda8496 [formerly 36e4ea8147]
Former-commit-id: dc185b6601
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
03f72891ea Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: e69aa93735 [formerly 04389b9f21] [formerly a501aacb3b] [formerly e69aa93735 [formerly 04389b9f21] [formerly a501aacb3b] [formerly a5c57e8d24 [formerly a501aacb3b [formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]]]]
Former-commit-id: a5c57e8d24
Former-commit-id: a7872b1c6d [formerly 5d988cc5c1] [formerly 6425b9202293405230f8ab681a2ceb8043b34140 [formerly c7bc786a60]]
Former-commit-id: 5a08505e3147b8975e055ba6ae9442b1509c6853 [formerly d8680dc631]
Former-commit-id: 1c9dca6062
2012-08-22 13:03:24 -05:00
Ben Steffensmeier
da86f91de9 Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
Former-commit-id: bc054637f1 [formerly 596b48c490] [formerly e1c07b5803] [formerly bc054637f1 [formerly 596b48c490] [formerly e1c07b5803] [formerly a988fdf5de [formerly e1c07b5803 [formerly 61aab7b55f9868e69b43c5250515ce0d5b01d6e5]]]]
Former-commit-id: a988fdf5de
Former-commit-id: f204baba47 [formerly da05d2dd24] [formerly 4ae8b37adf188b82d73261cd1e97bb73d37e2f3a [formerly 4f16803030]]
Former-commit-id: 0a86b5d4e2af9b69ba8a9811a558cbf63f4bc698 [formerly 6ab6152235]
Former-commit-id: d608483d9f
2012-08-22 13:02:56 -05:00
Steve Harris
8e09b55980 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: deb39fdbea [formerly 04c8c3ca55] [formerly 8e3ecc1efd] [formerly deb39fdbea [formerly 04c8c3ca55] [formerly 8e3ecc1efd] [formerly b8629a0f20 [formerly 8e3ecc1efd [formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]]]
Former-commit-id: b8629a0f20
Former-commit-id: 0e79416277 [formerly d974aaf277] [formerly 9c4d41d56393145d694a3b135f570872b089f630 [formerly 9565d18b96]]
Former-commit-id: 2e88d29270fbbd4a255b134882fd00b79d86c41e [formerly bbe382231f]
Former-commit-id: c9652b48f1
2012-08-22 13:01:08 -05:00
Steve Harris
598fdb5d07 Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
	edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
	nativeLib/rary.cots.jasper/jasper-1.900.1/configure
	rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
	rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/i386/build.sh
	tools/scripts/commit-msg
	tools/scripts/git-u-setup
	tools/scripts/uamend
	tools/scripts/ucommit
	tools/scripts/upull
	tools/scripts/upush
	tools/scripts/ustat

Former-commit-id: 57c1be9f5a [formerly 084ac9fbd4] [formerly d38f8b80f0] [formerly 57c1be9f5a [formerly 084ac9fbd4] [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: a6797a478a [formerly b335416e06] [formerly 531735b4428be30c033b6b463b0342df571ead88 [formerly 77369f78a6]]
Former-commit-id: 7d1b3c075694ece999044bcdceef8462a2a837fe [formerly 445d1a6a0d]
Former-commit-id: 85533bdd24
2012-08-21 16:17:58 -05:00
Steve Harris
98059f9ef1 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
2012-08-21 15:27:03 -05:00
Max Schenkelberg
4eb5624fb4 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: 6e575aa450 [formerly e404398ea6] [formerly f381871fc4] [formerly 6e575aa450 [formerly e404398ea6] [formerly f381871fc4] [formerly 6e1059f8be [formerly f381871fc4 [formerly a34c116fbbad86f758882461dd96da9c6ab14cdd]]]]
Former-commit-id: 6e1059f8be
Former-commit-id: c3f6bc5225 [formerly 919000d0dd] [formerly 064f75dfd8ee176652d6449f808d0b3ac5a57c6f [formerly ed033f8657]]
Former-commit-id: 48e614807613f3c9a6adbd16f694a48c87911e13 [formerly 587ad5d2e4]
Former-commit-id: fec3be6b57
2012-08-21 11:36:35 -05:00
Nate Jensen
e606897d0b Merge "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." into development
Former-commit-id: 3413c389cc [formerly e29017c389] [formerly 87c70d25e8] [formerly 3413c389cc [formerly e29017c389] [formerly 87c70d25e8] [formerly 1efe57fd02 [formerly 87c70d25e8 [formerly 3c0e8a73dc372214352fab8ac91e2b68f11f78f2]]]]
Former-commit-id: 1efe57fd02
Former-commit-id: 920b051a5b [formerly 9c9f9a4989] [formerly 2736a0139278a031106188c5c08456c5726df424 [formerly 521fc26db3]]
Former-commit-id: eecb02de5a629f8abeb0c1a70e7d77cebb18757c [formerly 9141879a98]
Former-commit-id: b5203491bb
2012-08-21 11:02:22 -05:00
Steve Harris
7aa51ef55a Merge "Issue #989 - Adding markings to jasper" into development
Former-commit-id: a8cd465f23 [formerly 9165608ba0] [formerly 0693643152] [formerly a8cd465f23 [formerly 9165608ba0] [formerly 0693643152] [formerly c2b21a4251 [formerly 0693643152 [formerly becc2dc6e147ae6f7caeaa872b8d9948b47dab1a]]]]
Former-commit-id: c2b21a4251
Former-commit-id: 6a62dd4e04 [formerly 94e981ae8b] [formerly 55653476b3998024bf1ad56471ef5dfaf42a09f6 [formerly fc77903de7]]
Former-commit-id: 642d49d5a5743f4cde299530aba5f2faafbfdb6a [formerly 9a2724e8f6]
Former-commit-id: 6dd00fb59d
2012-08-20 16:29:50 -05:00
Steve Harris
37d482bf23 Issue #989 - Adding markings to jasper
Former-commit-id: 63c4a840ad [formerly 5ce7935576] [formerly ccc150c980] [formerly 63c4a840ad [formerly 5ce7935576] [formerly ccc150c980] [formerly 9e8f59f31d [formerly ccc150c980 [formerly 306b93cb3b73ae963b5900c8200d29a659689a74]]]]
Former-commit-id: 9e8f59f31d
Former-commit-id: a432d3a698 [formerly a7266b63fc] [formerly d2f6f22e548d976113736d69ce571161ca4a89d9 [formerly 15462e7a38]]
Former-commit-id: 8736b2e18c714aaf0d542d6477bab386c400437e [formerly 65b74111f1]
Former-commit-id: 1f8e7a08f0
2012-08-20 16:26:51 -05:00
Max Schenkelberg
950e2bff73 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: 79d98841a0 [formerly fc06265360] [formerly b69d2cad1c] [formerly 79d98841a0 [formerly fc06265360] [formerly b69d2cad1c] [formerly 1b406ecfca [formerly b69d2cad1c [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]]]
Former-commit-id: 1b406ecfca
Former-commit-id: 56496dc03e [formerly 47cefd1513] [formerly 71e7ec51b8b8299ebc4b78fb5367003fc83ce4f5 [formerly aa9df46a1d]]
Former-commit-id: 408d45a6b996130822ce865675f4446c9ea19f79 [formerly 362d34bee0]
Former-commit-id: dcbab7d58f
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
25e6e3adba Issue #666 fix collaboration message compose problems with ncp keybindings
Former-commit-id: 977d5587cb [formerly 25b00010e1] [formerly 3f0b2e474c] [formerly 977d5587cb [formerly 25b00010e1] [formerly 3f0b2e474c] [formerly 8e971abbd8 [formerly 3f0b2e474c [formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]]]
Former-commit-id: 8e971abbd8
Former-commit-id: 89255891cc [formerly f6e7d795f9] [formerly a03fb3fc1578ffe96414fa4161300406218521d7 [formerly 2c5cfe6d98]]
Former-commit-id: e64790314b952168035c3cd21dd3de3e53fbe357 [formerly d9f68af5ad]
Former-commit-id: 322d74aab7
2012-08-17 16:16:20 -05:00
Ron Anderson
fd53117c14 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: 0a6de388dd [formerly 16231374f8] [formerly d7a818fd1d] [formerly 0a6de388dd [formerly 16231374f8] [formerly d7a818fd1d] [formerly 7662d249ab [formerly d7a818fd1d [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]]
Former-commit-id: 7662d249ab
Former-commit-id: 21b48541c3 [formerly 6e3674f9fc] [formerly eadb27af146fe75ce647766fdd43f9aa8948307f [formerly d3693827a1]]
Former-commit-id: cc064445b1277a5893829a9d2679defa8d74bab9 [formerly 1b655b0826]
Former-commit-id: f69d7b9c64
2012-08-17 12:41:49 -05:00
Ron Anderson
c1d0cbae01 Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: c71ee18e6e [formerly 93c632c1ff] [formerly 1321db6a99] [formerly c71ee18e6e [formerly 93c632c1ff] [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 1321db6a99 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]]
Former-commit-id: 819b9c8e56
Former-commit-id: 0a32c7c683 [formerly e5952c1c99] [formerly 5cae0d5653a03ef5095386e62d4e0139bdd634e9 [formerly 6eafdda705]]
Former-commit-id: e27e7df534ee0ecbb93248c7bad66447e0b16b5e [formerly f7b9190b51]
Former-commit-id: b78c280ac8
2012-08-17 12:20:08 -05:00
Bryan Kowal
c836458e84 Remove the usage of the old method to build the edex ost rpm.
Former-commit-id: 31ec3cbee0 [formerly d5c16eb8ce] [formerly 44328f1702] [formerly 31ec3cbee0 [formerly d5c16eb8ce] [formerly 44328f1702] [formerly 01e7976a52 [formerly 44328f1702 [formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]]]]
Former-commit-id: 01e7976a52
Former-commit-id: 3e500e71a6 [formerly f81ba4737c] [formerly f928d8f3a6488da251855ae1cb97a15af51db335 [formerly 69a16eb369]]
Former-commit-id: 5cba2e23bd383fa1e73e130f34545fcf8c145d4c [formerly 1078d7b553]
Former-commit-id: 29e1bc9993
2012-08-16 14:27:11 -05:00
Steve Harris
48947cc945 Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
Former-commit-id: 1bcd43a447 [formerly 735ed2ecd9] [formerly fa77df807d] [formerly 1bcd43a447 [formerly 735ed2ecd9] [formerly fa77df807d] [formerly 596d19466b [formerly fa77df807d [formerly 55326667ca13a37c7802849484949382e65a6329]]]]
Former-commit-id: 596d19466b
Former-commit-id: 4d2094072e [formerly b0b8a13e60] [formerly 2447699b9373672878bdc3d1b593c32f627a3309 [formerly 20fda57d37]]
Former-commit-id: 0d408d1b5d8d6a0e00b9bcad92b5b644cd644f59 [formerly 9e75c7e5f1]
Former-commit-id: 8413f8d96c
2012-08-16 10:27:51 -05:00
root
d0f911274c Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: e2b7a1679b [formerly ac8888ae10] [formerly 342bda7e5f] [formerly e2b7a1679b [formerly ac8888ae10] [formerly 342bda7e5f] [formerly 6eec24180e [formerly 342bda7e5f [formerly 2368421395496141fdc6467fd165babc282b65ac]]]]
Former-commit-id: 6eec24180e
Former-commit-id: c7a8b1e7fd [formerly f0cb647101] [formerly 688200e149897d55c1b90b9f2d6fb48f7cfa67a2 [formerly b3217ad886]]
Former-commit-id: eb42969b62682f808230b579e5f3d75f037e2892 [formerly d1f2ac6698]
Former-commit-id: a689deb547
2012-08-15 22:29:38 +00:00
root
7b6fb2ec7f 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: b6e17e9b02 [formerly d170ae704b] [formerly b93989daaf] [formerly b6e17e9b02 [formerly d170ae704b] [formerly b93989daaf] [formerly ba40e18fb2 [formerly b93989daaf [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]]]
Former-commit-id: ba40e18fb2
Former-commit-id: c8d09a5973 [formerly fd69b031d2] [formerly b304e3656660b7049f012ff5306eb9b118135fb1 [formerly 3e9d1fa430]]
Former-commit-id: 2d2cd5211b32f326f99a886ca98f22774f097460 [formerly 64c3ccb4a4]
Former-commit-id: 84a8231c49
2012-08-15 22:29:07 +00:00
root
73466bae44 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8]
Former-commit-id: 0eb9520e15
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
16582906da Issue #1065 fix contexts to deactivate when unrecognized views activate.
Former-commit-id: e65418717f [formerly e8524301b5] [formerly 6d9d0a406f] [formerly e65418717f [formerly e8524301b5] [formerly 6d9d0a406f] [formerly 4203807a77 [formerly 6d9d0a406f [formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]]]
Former-commit-id: 4203807a77
Former-commit-id: a50be67e0e [formerly d7597d8cf7] [formerly 0f7510411fcfebd4307421621a6b66de713609a0 [formerly 8a170234b8]]
Former-commit-id: 66a1a85df2f4afc8d3aba14a9291d086df04411b [formerly 62979089d3]
Former-commit-id: 2256ec871d
2012-08-15 16:36:05 -05:00
Benjamin Phillippe
ff6c5dc660 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: ec41ec59ee [formerly dd8ed9eca0] [formerly 72c63e1a6f] [formerly ec41ec59ee [formerly dd8ed9eca0] [formerly 72c63e1a6f] [formerly 7bad34f906 [formerly 72c63e1a6f [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]]]
Former-commit-id: 7bad34f906
Former-commit-id: ebdadf4b89 [formerly 11bf8bb4c7] [formerly c02cc2e93c8e648fd97f9f7d42aacefcb2dffcb0 [formerly 91493ee0b9]]
Former-commit-id: 27079c626ffeaf0adc7ac87aaf5ceaa302211c16 [formerly e23523ad80]
Former-commit-id: bd2023ec70
2012-08-15 16:22:39 -05:00
Nate Jensen
b7cd17640a 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: a94964d940 [formerly b94597d03c] [formerly 9c1597b554] [formerly a94964d940 [formerly b94597d03c] [formerly 9c1597b554] [formerly 6897b1d480 [formerly 9c1597b554 [formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]]]]
Former-commit-id: 6897b1d480
Former-commit-id: 0321bf5fe3 [formerly 3b31bc0500] [formerly 03020103f952139717e6611a3b60d333734a6753 [formerly b7bc962da4]]
Former-commit-id: 8299877b3a8416a8dcc76a45f85321ce495f76dd [formerly ca08f538e8]
Former-commit-id: b0eb5c1493
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
ba78c72f6e Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
Former-commit-id: 8dffbba06e [formerly 9c41e73ee5] [formerly cb99170685] [formerly 8dffbba06e [formerly 9c41e73ee5] [formerly cb99170685] [formerly b194a17abc [formerly cb99170685 [formerly 97d786afadf136f75ffd6a440d35b628e144b888]]]]
Former-commit-id: b194a17abc
Former-commit-id: 2c1640fde4 [formerly 98728915f8] [formerly 2ef9a5e297cead370e230dc243b7a36dec6a00bc [formerly 74acf329c4]]
Former-commit-id: e147955fac3e590b13ad6c4eea7c7fdd49d0a069 [formerly 48a5389b2f]
Former-commit-id: e64c4d343f
2012-08-15 15:25:46 -05:00
Steve Harris
867586657b 12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3 [formerly d7d60cc623] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501]
Former-commit-id: 7e1d1f6e08
2012-08-15 15:19:10 -05:00
Steve Harris
d7acb65c06 12.9.1-3 baseline
Former-commit-id: 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 988563a4b6 [formerly a535b51eba] [formerly 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a]]
Former-commit-id: 60681d51155fd0d8fea0ced04f4dc5174712adca [formerly 8c5c5ad6eb]
Former-commit-id: 03bb51ed0e
2012-08-15 14:26:10 -05:00
Steve Harris
8c620ce4dd 12.9.1-2 baseline
Former-commit-id: ecba93c959 [formerly 27871051e3] [formerly d1d877d319] [formerly ecba93c959 [formerly 27871051e3] [formerly d1d877d319] [formerly a198b3a807 [formerly d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]]
Former-commit-id: a198b3a807
Former-commit-id: 8690f264b6 [formerly de4c812834] [formerly db9021d4da0353e03ade3f0d5a5eae88fce61247 [formerly 448ed038c2]]
Former-commit-id: 007434bc5f036c2f1f728feff774f4546fd4a8a5 [formerly ed416f241e]
Former-commit-id: adf346e7d3
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
c1d52bb83b Issue #915 Set the user data.
Former-commit-id: 55ac7d7684 [formerly f37a75f265] [formerly 865136f6ef] [formerly 55ac7d7684 [formerly f37a75f265] [formerly 865136f6ef] [formerly 03ed8ee0b0 [formerly 865136f6ef [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]]]
Former-commit-id: 03ed8ee0b0
Former-commit-id: b0036d9ad7 [formerly f1749f4fcc] [formerly aede2757d06a4b4752402af488f523f9e9e0e79e [formerly e584d728f0]]
Former-commit-id: 158f1995d650b2e6c15cad816c980ce6972d5eb8 [formerly 38bb2743e5]
Former-commit-id: 49c757f958
2012-08-15 14:05:50 -05:00
Steve Harris
31353e2296 12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
2012-08-15 13:59:00 -05:00
Nate Jensen
b1480daa29 Merge "Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container" into development
Former-commit-id: a14db247fb [formerly d70d78d664] [formerly 2cb82b7170] [formerly a14db247fb [formerly d70d78d664] [formerly 2cb82b7170] [formerly 91e0ba8c23 [formerly 2cb82b7170 [formerly d252760b0e39002e53a5fce809b38521ca2351aa]]]]
Former-commit-id: 91e0ba8c23
Former-commit-id: d834aad044 [formerly 1da09f201e] [formerly 00bff8ae22a58ce9c1926f3f681e442f45f7f40f [formerly 5b26d1e93e]]
Former-commit-id: fb18988c1b9b1007d6781d9cd5e04849a3d5733d [formerly ebad112688]
Former-commit-id: 826b645296
2012-08-14 16:52:40 -05:00
Ron Anderson
6b25274569 Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 9b35518fe5 [formerly bac68cc1de] [formerly 17f636c2a2] [formerly 9b35518fe5 [formerly bac68cc1de] [formerly 17f636c2a2] [formerly 81abb2c60b [formerly 17f636c2a2 [formerly 373ac200fcd1c9a39244a2775d95c7b891334632]]]]
Former-commit-id: 81abb2c60b
Former-commit-id: daab9b6cfc [formerly c8b0719d48] [formerly f95802be5b445fb5325a67b2aad6ff7c3512608e [formerly 7cde30681b]]
Former-commit-id: d0f735c6f0ba4872953d0a07c685f8e0a1475261 [formerly 3d0d4e9b09]
Former-commit-id: 746e006e89
2012-08-14 16:27:11 -05:00
Steve Harris
6c76725af2 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 39dbd45d38 [formerly 27fa10e133] [formerly e3927a11c7] [formerly 39dbd45d38 [formerly 27fa10e133] [formerly e3927a11c7] [formerly e530637aa3 [formerly e3927a11c7 [formerly 43d4642bc39a053d40fce9b6aff1d11f3d313dd7]]]]
Former-commit-id: e530637aa3
Former-commit-id: 7c49cb3c64 [formerly 118113bd60] [formerly c68cbcb1c5cec8f3069be35211a81cf8d1e570ec [formerly 1687889756]]
Former-commit-id: 1404988d60ce6f11cccb2b6365981d4cba5881d0 [formerly 03ebee99f8]
Former-commit-id: f6ec677a1b
2012-08-14 16:26:00 -05:00
Ben Steffensmeier
695a8cf271 Issue #947 revert changes to dataTime format
Former-commit-id: 4c45df4e3f [formerly 54b538bb07] [formerly 50cb7383a6] [formerly 4c45df4e3f [formerly 54b538bb07] [formerly 50cb7383a6] [formerly 70ba8d82db [formerly 50cb7383a6 [formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]]]]
Former-commit-id: 70ba8d82db
Former-commit-id: 3d83dd0e1f [formerly 36455cfbed] [formerly dcd339cd56dee05048a4cc65e0aad47a394b2aa1 [formerly 77b7c4c517]]
Former-commit-id: 1dc0661919f3d208087d6a8b1c809944896dff9c [formerly 242cc34efe]
Former-commit-id: 4a9e7d5e3d
2012-08-14 16:20:36 -05:00
Ron Anderson
58e3f96915 Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 0328f2f50a [formerly 5c80f582b3] [formerly 71d74b1dcf] [formerly 0328f2f50a [formerly 5c80f582b3] [formerly 71d74b1dcf] [formerly 985167892d [formerly 71d74b1dcf [formerly 564b72997c59a665398c8687d6bafdb54c469881]]]]
Former-commit-id: 985167892d
Former-commit-id: 77bfb8a2dd [formerly c90619a3bc] [formerly 4241981581eb1d69e70fae848a376e84169e96cf [formerly 9bf0166f13]]
Former-commit-id: 4a62b310663cf12792dba877978047a1f360353b [formerly 13d7576686]
Former-commit-id: d47eda2d66
2012-08-14 16:20:23 -05:00