Commit graph

796 commits

Author SHA1 Message Date
Bryan Kowal
a10099b0a4 Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 8444e742df [formerly 35aff16e89] [formerly 137b27d3ff] [formerly 3e1556a981 [formerly 137b27d3ff [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]]
Former-commit-id: 3e1556a981
Former-commit-id: be92c88a0768d80b1afd3036de3111dbf50f3e10 [formerly a34225c4c9]
Former-commit-id: 7ec6eb66ab
2012-09-05 14:44:36 -05:00
Max Schenkelberg
e7b2f69ff3 Issue #29 Changed how TileLevel calculate pixel density to make densities more consistent between granules on display. Changed TileSetRenderable level change threshold to smaller value so displays look less pixelated with new pixel density calculation. Fixed FileTreeView from throwing errors if two definitions with same name defined which came to light from NPP build
Change-Id: I66b556b74e1a856dace5447c4b9f090d026c493c

Former-commit-id: e06d1dabef [formerly a14d5d4c86] [formerly c183a0e614] [formerly 28d6308444 [formerly c183a0e614 [formerly a4dd750d4bbdaae4a548c9a296436cc783d2d71a]]]
Former-commit-id: 28d6308444
Former-commit-id: b4ace038bdcc2b915892986d414af1d5d5480636 [formerly 87bcbdb4cc]
Former-commit-id: 45d6b7bcb5
2012-09-05 11:51:38 -05:00
Ben Steffensmeier
49524b9109 Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8

Former-commit-id: 513bd44ba0 [formerly dc6f5805ef] [formerly 4272f4c885] [formerly c618ee9057 [formerly 4272f4c885 [formerly 5da7b54e1bff66ed46400bc624b9d881d0b967ce]]]
Former-commit-id: c618ee9057
Former-commit-id: 1e8fa5942894142a7af4316bb2f69d7081706dc3 [formerly e0a4fe2c43]
Former-commit-id: 66e9b24e51
2012-09-04 13:41:10 -05:00
Steve Harris
20e088a957 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]
Former-commit-id: f224e3e8ad
2012-09-04 12:11:03 -05:00
Steve Harris
9f4fa7bf83 12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]
Former-commit-id: e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
15fa63819d 12.9.1-12 baseline
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]
Former-commit-id: 150bc967a5
Former-commit-id: 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e]
Former-commit-id: 782941ccc1
2012-09-04 11:47:38 -05:00
Steve Harris
a3a1864f56 Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]
Former-commit-id: 34cbde4124
Former-commit-id: b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246]
Former-commit-id: ffe253196a
2012-08-30 14:40:34 -05:00
Steve Harris
503b7bf15c 12.9.1-11 baseline
Former-commit-id: a2bb1dabe0 [formerly d07c18918d] [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]
Former-commit-id: fc405efab7
Former-commit-id: aa38e16cc24dec9189539c27650c276ab78f3c78 [formerly a14374fcd4]
Former-commit-id: dc5ec3d16d
2012-08-30 14:36:12 -05:00
Steve Harris
c704490769 12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]
Former-commit-id: f43a5af47f
2012-08-30 14:28:27 -05:00
Max Schenkelberg
e2e9969448 Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4

Former-commit-id: d0160a4aa9 [formerly 81531873e0] [formerly 13865fc3fd3e7a29ef34b445e9f98c2789cdb34f [formerly 00de2922e1]] [formerly 0de737ad64 [formerly 00de2922e1 [formerly b9568b79f531250c859b77296115da32b628318d]]]
Former-commit-id: 0de737ad64
Former-commit-id: 9a6b2c20c8248d78d8c7b88d4e7f58d9f1001bcb [formerly b75fad8e30]
Former-commit-id: ef8ed151a9
2012-08-29 18:17:30 -05:00
Nate Jensen
e313a785b0 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 b47baedad4 [formerly 96393309eb [formerly c06f87cd60290f34b0c9b1ac955f0b72f9de5c5b]]]
Former-commit-id: b47baedad4
Former-commit-id: 692922c7e7a4bbe072430e65deae743517f3f114 [formerly e6661037f5]
Former-commit-id: 45134743b6
2012-08-29 16:09:50 -05:00
Max Schenkelberg
50a53cf8b6 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 81f78fa819 [formerly f8aef2b067 [formerly 3ff192dfb09a0e4512287d45df864375e3900ca1]]]
Former-commit-id: 81f78fa819
Former-commit-id: c78f2cc0795ac993cd9b82670d6a70aae5a945ff [formerly 99c8b1a968]
Former-commit-id: e593c9d56e
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
80ffe1feff Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
Former-commit-id: 669d1023a8 [formerly e3bb8c80c9] [formerly 1f587e39f4] [formerly 37d2411b26 [formerly 1f587e39f4 [formerly e3c5526f9b12ae38c12094e7ebf9f9d6823f3257]]]
Former-commit-id: 37d2411b26
Former-commit-id: a91944b28e23d60c494612c968dc56c1620456c7 [formerly 36dd387007]
Former-commit-id: 68235d0744
2012-08-29 14:24:21 -05:00
Matt Nash
d35027f45e Issue #1101 fix gfe keybindings for frame change in collaboration
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

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

Former-commit-id: 7439c24618 [formerly 7b62f6ac75] [formerly 73f428e4d5] [formerly 047441f91c [formerly 73f428e4d5 [formerly 5e9d7763442ab91cb8d33c16139eb5bca9b033ea]]]
Former-commit-id: 047441f91c
Former-commit-id: 801d77ec89944e6f04cdd301015c751823cf9554 [formerly 347c13143b]
Former-commit-id: 0cc8e95b0c
2012-08-23 18:18:23 -05:00
Max Schenkelberg
8fb5b29881 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 c4812b7745 [formerly 75b2cdff47 [formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]]]
Former-commit-id: c4812b7745
Former-commit-id: 991a8632682c94855dfb4abec915f0eae9146f28 [formerly 7f506ce81d]
Former-commit-id: 6f96fa5045
2012-08-23 17:37:12 -05:00
David Gillingham
b33e97efd3 Issue #1087: Enable DRT for CAVE operational mode.
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9

Former-commit-id: a03dfbea98 [formerly f3a33e3df4] [formerly f7182ae9c7] [formerly ec2d211800 [formerly f7182ae9c7 [formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]]]
Former-commit-id: ec2d211800
Former-commit-id: 6b68db4233ced16f4cebc0b40b285c958108b1b8 [formerly cbd3bfacfa]
Former-commit-id: 3b41cd02f4
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
137c2871ad 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 f646b185da [formerly 1b45f1b6d9 [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]]
Former-commit-id: f646b185da
Former-commit-id: 1c449e3e548384fc5bac6858d0c0c2448e8c91fe [formerly a09fa0b649]
Former-commit-id: da1f3fe29b
2012-08-23 09:27:46 -05:00
Nate Jensen
b3601437d5 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 21df8f9986 [formerly 20c69ffef3 [formerly dad3bad6ebf34dd33b8d566a06c4f10a089ef35b]]]
Former-commit-id: 21df8f9986
Former-commit-id: e8f857394d2a2bbbd4b6a347346aa0ecbb2aeeff [formerly fbcb1eab54]
Former-commit-id: 701dbef8d6
2012-08-23 08:47:40 -05:00
Richard Peter
f8c069352b Merge "Issue #798 - Correct for hdfFileId" into development
Former-commit-id: f9878c21f7 [formerly 0dd2c44c9c] [formerly 6c1690e063] [formerly 4c56f4e20d [formerly 6c1690e063 [formerly 6aa68692dc050d61946be620a6f629c186e0fdaf]]]
Former-commit-id: 4c56f4e20d
Former-commit-id: aa9cb1756d6fdff94be46dc7b16cb3fc2c90806e [formerly 252e8e7e2e]
Former-commit-id: 46cd0f5110
2012-08-22 17:07:17 -05:00
Ron Anderson
61060e0eac 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 5dee9e148da7d121bce3d77688170128789acdee [formerly 5abacc273d]] [formerly 576ccd6a38 [formerly 5abacc273d [formerly 9c439cc43ffe38fcecaae552ad820f310b7f4267]]]
Former-commit-id: 576ccd6a38
Former-commit-id: 4168707c865619b3aa1f92f5986758f9dfd9ffdf [formerly 19f956b93f]
Former-commit-id: b6117e9945
2012-08-22 16:41:19 -05:00
Steve Harris
cef1cd081f 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 9425f73c71 [formerly 13f70884f3 [formerly aa64613b0d04bca36310817989c79d12f0f107db]]]
Former-commit-id: 9425f73c71
Former-commit-id: f6fea8385be99f0d8a7dfa5a524af6d134db5dc0 [formerly de16453f4f]
Former-commit-id: 3e9ee884ab
2012-08-22 16:06:02 -05:00
Steve Harris
fffd905412 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e1cf4b0b9a [formerly 7a4f4ac493] [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]
Former-commit-id: b77a4d40d7
Former-commit-id: 49afa39c09674dd9b84bfb0d70e9a7be354e2f85 [formerly b2c0dd1abb]
Former-commit-id: 34fa4b5804
2012-08-22 16:00:33 -05:00
James Korman
ce2d764418 Issue #798 - Correct for hdfFileId
Former-commit-id: 7d61470ce7 [formerly 6d250cf9f3] [formerly 56d6b1e886] [formerly c2c228b429 [formerly 56d6b1e886 [formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]]]
Former-commit-id: c2c228b429
Former-commit-id: a916e362db2cd43e97c1bd5342c3a7bf8e191bc2 [formerly 654ecefd3e]
Former-commit-id: ea24ef83b8
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
a7872b1c6d Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: e69aa93735 [formerly 04389b9f21] [formerly a501aacb3b] [formerly a5c57e8d24 [formerly a501aacb3b [formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]]]
Former-commit-id: a5c57e8d24
Former-commit-id: 6425b9202293405230f8ab681a2ceb8043b34140 [formerly c7bc786a60]
Former-commit-id: 5d988cc5c1
2012-08-22 13:03:24 -05:00
Ben Steffensmeier
f204baba47 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 a988fdf5de [formerly e1c07b5803 [formerly 61aab7b55f9868e69b43c5250515ce0d5b01d6e5]]]
Former-commit-id: a988fdf5de
Former-commit-id: 4ae8b37adf188b82d73261cd1e97bb73d37e2f3a [formerly 4f16803030]
Former-commit-id: da05d2dd24
2012-08-22 13:02:56 -05:00
Steve Harris
0e79416277 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 b8629a0f20 [formerly 8e3ecc1efd [formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]]
Former-commit-id: b8629a0f20
Former-commit-id: 9c4d41d56393145d694a3b135f570872b089f630 [formerly 9565d18b96]
Former-commit-id: d974aaf277
2012-08-22 13:01:08 -05:00
Steve Harris
a6797a478a 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 44a7cb75e7 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 531735b4428be30c033b6b463b0342df571ead88 [formerly 77369f78a6]
Former-commit-id: b335416e06
2012-08-21 16:17:58 -05:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Max Schenkelberg
c3f6bc5225 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 6e1059f8be [formerly f381871fc4 [formerly a34c116fbbad86f758882461dd96da9c6ab14cdd]]]
Former-commit-id: 6e1059f8be
Former-commit-id: 064f75dfd8ee176652d6449f808d0b3ac5a57c6f [formerly ed033f8657]
Former-commit-id: 919000d0dd
2012-08-21 11:36:35 -05:00
Nate Jensen
920b051a5b 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 1efe57fd02 [formerly 87c70d25e8 [formerly 3c0e8a73dc372214352fab8ac91e2b68f11f78f2]]]
Former-commit-id: 1efe57fd02
Former-commit-id: 2736a0139278a031106188c5c08456c5726df424 [formerly 521fc26db3]
Former-commit-id: 9c9f9a4989
2012-08-21 11:02:22 -05:00
Steve Harris
6a62dd4e04 Merge "Issue #989 - Adding markings to jasper" into development
Former-commit-id: a8cd465f23 [formerly 9165608ba0] [formerly 0693643152] [formerly c2b21a4251 [formerly 0693643152 [formerly becc2dc6e147ae6f7caeaa872b8d9948b47dab1a]]]
Former-commit-id: c2b21a4251
Former-commit-id: 55653476b3998024bf1ad56471ef5dfaf42a09f6 [formerly fc77903de7]
Former-commit-id: 94e981ae8b
2012-08-20 16:29:50 -05:00
Steve Harris
a432d3a698 Issue #989 - Adding markings to jasper
Former-commit-id: 63c4a840ad [formerly 5ce7935576] [formerly ccc150c980] [formerly 9e8f59f31d [formerly ccc150c980 [formerly 306b93cb3b73ae963b5900c8200d29a659689a74]]]
Former-commit-id: 9e8f59f31d
Former-commit-id: d2f6f22e548d976113736d69ce571161ca4a89d9 [formerly 15462e7a38]
Former-commit-id: a7266b63fc
2012-08-20 16:26:51 -05:00
Max Schenkelberg
56496dc03e 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 1b406ecfca [formerly b69d2cad1c [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]]
Former-commit-id: 1b406ecfca
Former-commit-id: 71e7ec51b8b8299ebc4b78fb5367003fc83ce4f5 [formerly aa9df46a1d]
Former-commit-id: 47cefd1513
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
89255891cc Issue #666 fix collaboration message compose problems with ncp keybindings
Former-commit-id: 977d5587cb [formerly 25b00010e1] [formerly 3f0b2e474c] [formerly 8e971abbd8 [formerly 3f0b2e474c [formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]]
Former-commit-id: 8e971abbd8
Former-commit-id: a03fb3fc1578ffe96414fa4161300406218521d7 [formerly 2c5cfe6d98]
Former-commit-id: f6e7d795f9
2012-08-17 16:16:20 -05:00
Ron Anderson
21b48541c3 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 7662d249ab [formerly d7a818fd1d [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]
Former-commit-id: 7662d249ab
Former-commit-id: eadb27af146fe75ce647766fdd43f9aa8948307f [formerly d3693827a1]
Former-commit-id: 6e3674f9fc
2012-08-17 12:41:49 -05:00
Ron Anderson
0a32c7c683 Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: c71ee18e6e [formerly 93c632c1ff] [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 1321db6a99 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]
Former-commit-id: 819b9c8e56
Former-commit-id: 5cae0d5653a03ef5095386e62d4e0139bdd634e9 [formerly 6eafdda705]
Former-commit-id: e5952c1c99
2012-08-17 12:20:08 -05:00
Bryan Kowal
3e500e71a6 Remove the usage of the old method to build the edex ost rpm.
Former-commit-id: 31ec3cbee0 [formerly d5c16eb8ce] [formerly 44328f1702] [formerly 01e7976a52 [formerly 44328f1702 [formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]]]
Former-commit-id: 01e7976a52
Former-commit-id: f928d8f3a6488da251855ae1cb97a15af51db335 [formerly 69a16eb369]
Former-commit-id: f81ba4737c
2012-08-16 14:27:11 -05:00
Steve Harris
4d2094072e Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
Former-commit-id: 1bcd43a447 [formerly 735ed2ecd9] [formerly fa77df807d] [formerly 596d19466b [formerly fa77df807d [formerly 55326667ca13a37c7802849484949382e65a6329]]]
Former-commit-id: 596d19466b
Former-commit-id: 2447699b9373672878bdc3d1b593c32f627a3309 [formerly 20fda57d37]
Former-commit-id: b0b8a13e60
2012-08-16 10:27:51 -05:00
root
c7a8b1e7fd 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 6eec24180e [formerly 342bda7e5f [formerly 2368421395496141fdc6467fd165babc282b65ac]]]
Former-commit-id: 6eec24180e
Former-commit-id: 688200e149897d55c1b90b9f2d6fb48f7cfa67a2 [formerly b3217ad886]
Former-commit-id: f0cb647101
2012-08-15 22:29:38 +00:00
root
c8d09a5973 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 ba40e18fb2 [formerly b93989daaf [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]]
Former-commit-id: ba40e18fb2
Former-commit-id: b304e3656660b7049f012ff5306eb9b118135fb1 [formerly 3e9d1fa430]
Former-commit-id: fd69b031d2
2012-08-15 22:29:07 +00:00
root
791f3f5b85 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]
Former-commit-id: 537dbadf64
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
a50be67e0e Issue #1065 fix contexts to deactivate when unrecognized views activate.
Former-commit-id: e65418717f [formerly e8524301b5] [formerly 2c40ab1f8c26cfd8f57817473987d3fbf3e8c49b [formerly 6d9d0a406f]] [formerly 4203807a77 [formerly 6d9d0a406f [formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]]
Former-commit-id: 4203807a77
Former-commit-id: 0f7510411fcfebd4307421621a6b66de713609a0 [formerly 8a170234b8]
Former-commit-id: d7597d8cf7
2012-08-15 16:36:05 -05:00
Benjamin Phillippe
ebdadf4b89 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: ec41ec59ee [formerly dd8ed9eca0] [formerly 72c63e1a6f] [formerly 7bad34f906 [formerly 72c63e1a6f [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]]
Former-commit-id: 7bad34f906
Former-commit-id: c02cc2e93c8e648fd97f9f7d42aacefcb2dffcb0 [formerly 91493ee0b9]
Former-commit-id: 11bf8bb4c7
2012-08-15 16:22:39 -05:00
Nate Jensen
0321bf5fe3 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 6897b1d480 [formerly 9c1597b554 [formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]]]
Former-commit-id: 6897b1d480
Former-commit-id: 03020103f952139717e6611a3b60d333734a6753 [formerly b7bc962da4]
Former-commit-id: 3b31bc0500
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
2c1640fde4 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 b194a17abc [formerly cb99170685 [formerly 97d786afadf136f75ffd6a440d35b628e144b888]]]
Former-commit-id: b194a17abc
Former-commit-id: 2ef9a5e297cead370e230dc243b7a36dec6a00bc [formerly 74acf329c4]
Former-commit-id: 98728915f8
2012-08-15 15:25:46 -05:00
Steve Harris
80655bf0a3 12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]
Former-commit-id: d7d60cc623
2012-08-15 15:19:10 -05:00