Matt Nash
04ce96d74e
Issue #1101 fix gfe keybindings for frame change in collaboration
...
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a
Former-commit-id: ada6ecf5f3
[formerly 018f590c70
[formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]
Former-commit-id: 018f590c70
Former-commit-id: ba698ae69a
2012-08-27 12:16:38 -05:00
Steve Harris
948b22090c
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 076dccf42d
[formerly 3ee334378c
[formerly 534486bf918d5384d062d7501f0f1c4a0b4f0172]]
Former-commit-id: 3ee334378c
Former-commit-id: 2e6842016b
2012-08-27 11:32:45 -05:00
Steve Harris
772c4359da
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: a71dac6cad
[formerly 91e39617cb
[formerly b9db13cf5bff60511d815f92f0239a4313498265]]
Former-commit-id: 91e39617cb
Former-commit-id: 51eb89eb2a
2012-08-27 09:53:55 -05:00
Nate Jensen
07ac473e55
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: 168bee4bd7
[formerly 94b7f40d1d
[formerly 0f98c3bfbf041cd46311517f2819ca2d81b1cd34]]
Former-commit-id: 94b7f40d1d
Former-commit-id: eac562204d
2012-08-27 09:21:50 -05:00
Nate Jensen
7439c24618
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 047441f91c
[formerly 73f428e4d5
[formerly 5e9d7763442ab91cb8d33c16139eb5bca9b033ea]]
Former-commit-id: 73f428e4d5
Former-commit-id: 7b62f6ac75
2012-08-23 18:18:23 -05:00
Max Schenkelberg
97759c7ce1
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: c4812b7745
[formerly 75b2cdff47
[formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]]
Former-commit-id: 75b2cdff47
Former-commit-id: 1f84ddbddf
2012-08-23 17:37:12 -05:00
David Gillingham
a03dfbea98
Issue #1087 : Enable DRT for CAVE operational mode.
...
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9
Former-commit-id: ec2d211800
[formerly f7182ae9c7
[formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]]
Former-commit-id: f7182ae9c7
Former-commit-id: f3a33e3df4
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
caaa78a981
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: f646b185da
[formerly 1b45f1b6d9
[formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]
Former-commit-id: 1b45f1b6d9
Former-commit-id: 20c65a4677
2012-08-23 09:27:46 -05:00
Nate Jensen
3146f03455
Merge "Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards." into development
...
Former-commit-id: 21df8f9986
[formerly 20c69ffef3
[formerly dad3bad6ebf34dd33b8d566a06c4f10a089ef35b]]
Former-commit-id: 20c69ffef3
Former-commit-id: dab98d0625
2012-08-23 08:47:40 -05:00
Richard Peter
f9878c21f7
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: 4c56f4e20d
[formerly 6c1690e063
[formerly 6aa68692dc050d61946be620a6f629c186e0fdaf]]
Former-commit-id: 6c1690e063
Former-commit-id: 0dd2c44c9c
2012-08-22 17:07:17 -05:00
Ron Anderson
25b6e47dbd
Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards.
...
Change-Id: Ie311cf19850cf4205f30282741a96c0cdc9f3c9c
Former-commit-id: 576ccd6a38
[formerly 5abacc273d
[formerly 9c439cc43ffe38fcecaae552ad820f310b7f4267]]
Former-commit-id: 5abacc273d
Former-commit-id: 82e45b58fa
2012-08-22 16:41:19 -05:00
Steve Harris
bdf8d89d33
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: 9425f73c71
[formerly 13f70884f3
[formerly aa64613b0d04bca36310817989c79d12f0f107db]]
Former-commit-id: 13f70884f3
Former-commit-id: fbe4210245
2012-08-22 16:06:02 -05:00
Steve Harris
e1cf4b0b9a
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: b77a4d40d7
[formerly b8ab6066f6
[formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b8ab6066f6
Former-commit-id: 7a4f4ac493
2012-08-22 16:00:33 -05:00
James Korman
7d61470ce7
Issue #798 - Correct for hdfFileId
...
Former-commit-id: c2c228b429
[formerly 56d6b1e886
[formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]]
Former-commit-id: 56d6b1e886
Former-commit-id: 6d250cf9f3
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
e69aa93735
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: a5c57e8d24
[formerly a501aacb3b
[formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]]
Former-commit-id: a501aacb3b
Former-commit-id: 04389b9f21
2012-08-22 13:03:24 -05:00
Ben Steffensmeier
bc054637f1
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: a988fdf5de
[formerly e1c07b5803
[formerly 61aab7b55f9868e69b43c5250515ce0d5b01d6e5]]
Former-commit-id: e1c07b5803
Former-commit-id: 596b48c490
2012-08-22 13:02:56 -05:00
Steve Harris
deb39fdbea
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: b8629a0f20
[formerly 8e3ecc1efd
[formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]
Former-commit-id: 8e3ecc1efd
Former-commit-id: 04c8c3ca55
2012-08-22 13:01:08 -05:00
Steve Harris
57c1be9f5a
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: 44a7cb75e7
[formerly d38f8b80f0
[formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: d38f8b80f0
Former-commit-id: 084ac9fbd4
2012-08-21 16:17:58 -05:00
Steve Harris
77cbd6c1e5
12.9.1-5 baseline
...
Former-commit-id: f2fac39428
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
2012-08-21 15:27:03 -05:00
Max Schenkelberg
6e575aa450
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: 6e1059f8be
[formerly f381871fc4
[formerly a34c116fbbad86f758882461dd96da9c6ab14cdd]]
Former-commit-id: f381871fc4
Former-commit-id: e404398ea6
2012-08-21 11:36:35 -05:00
Nate Jensen
3413c389cc
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: 1efe57fd02
[formerly 87c70d25e8
[formerly 3c0e8a73dc372214352fab8ac91e2b68f11f78f2]]
Former-commit-id: 87c70d25e8
Former-commit-id: e29017c389
2012-08-21 11:02:22 -05:00
Steve Harris
a8cd465f23
Merge "Issue #989 - Adding markings to jasper" into development
...
Former-commit-id: c2b21a4251
[formerly 0693643152
[formerly becc2dc6e147ae6f7caeaa872b8d9948b47dab1a]]
Former-commit-id: 0693643152
Former-commit-id: 9165608ba0
2012-08-20 16:29:50 -05:00
Steve Harris
63c4a840ad
Issue #989 - Adding markings to jasper
...
Former-commit-id: 9e8f59f31d
[formerly ccc150c980
[formerly 306b93cb3b73ae963b5900c8200d29a659689a74]]
Former-commit-id: ccc150c980
Former-commit-id: 5ce7935576
2012-08-20 16:26:51 -05:00
Max Schenkelberg
79d98841a0
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: 1b406ecfca
[formerly b69d2cad1c
[formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]
Former-commit-id: b69d2cad1c
Former-commit-id: fc06265360
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
977d5587cb
Issue #666 fix collaboration message compose problems with ncp keybindings
...
Former-commit-id: 8e971abbd8
[formerly 3f0b2e474c
[formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]
Former-commit-id: 3f0b2e474c
Former-commit-id: 25b00010e1
2012-08-17 16:16:20 -05:00
Ron Anderson
0a6de388dd
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: 7662d249ab
[formerly d7a818fd1d
[formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]
Former-commit-id: d7a818fd1d
Former-commit-id: 16231374f8
2012-08-17 12:41:49 -05:00
Ron Anderson
c71ee18e6e
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 819b9c8e56
[formerly 1321db6a99
[formerly 9287cf98369abb8a674fd5bab99439d055218a05]]
Former-commit-id: 1321db6a99
Former-commit-id: 93c632c1ff
2012-08-17 12:20:08 -05:00
Bryan Kowal
31ec3cbee0
Remove the usage of the old method to build the edex ost rpm.
...
Former-commit-id: 01e7976a52
[formerly 44328f1702
[formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]]
Former-commit-id: 44328f1702
Former-commit-id: d5c16eb8ce
2012-08-16 14:27:11 -05:00
Steve Harris
1bcd43a447
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
...
Former-commit-id: 596d19466b
[formerly fa77df807d
[formerly 55326667ca13a37c7802849484949382e65a6329]]
Former-commit-id: fa77df807d
Former-commit-id: 735ed2ecd9
2012-08-16 10:27:51 -05:00
root
e2b7a1679b
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: 6eec24180e
[formerly 342bda7e5f
[formerly 2368421395496141fdc6467fd165babc282b65ac]]
Former-commit-id: 342bda7e5f
Former-commit-id: ac8888ae10
2012-08-15 22:29:38 +00:00
root
b6e17e9b02
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: ba40e18fb2
[formerly b93989daaf
[formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]
Former-commit-id: b93989daaf
Former-commit-id: d170ae704b
2012-08-15 22:29:07 +00:00
root
bb7b5341dd
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: 5a453ee984
[formerly cb46f57879
[formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: cb46f57879
Former-commit-id: 0987fc6b3d
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
e65418717f
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: 4203807a77
[formerly 6d9d0a406f
[formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]
Former-commit-id: 6d9d0a406f
Former-commit-id: e8524301b5
2012-08-15 16:36:05 -05:00
Benjamin Phillippe
ec41ec59ee
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: 7bad34f906
[formerly 72c63e1a6f
[formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]
Former-commit-id: 72c63e1a6f
Former-commit-id: dd8ed9eca0
2012-08-15 16:22:39 -05:00
Nate Jensen
a94964d940
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: 6897b1d480
[formerly 9c1597b554
[formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]]
Former-commit-id: 9c1597b554
Former-commit-id: b94597d03c
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
8dffbba06e
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: b194a17abc
[formerly cb99170685
[formerly 97d786afadf136f75ffd6a440d35b628e144b888]]
Former-commit-id: cb99170685
Former-commit-id: 9c41e73ee5
2012-08-15 15:25:46 -05:00
Steve Harris
71b024e3a1
12.9.1-4 baseline
...
Former-commit-id: 33b95fb96d
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: dcda3a2290
Former-commit-id: 36c108e960
2012-08-15 15:19:10 -05:00
Steve Harris
8083b81729
12.9.1-3 baseline
...
Former-commit-id: 84bbf2573e
[formerly 36d80b1f60
[formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 36d80b1f60
Former-commit-id: c11f7d396e
2012-08-15 14:26:10 -05:00
Steve Harris
ecba93c959
12.9.1-2 baseline
...
Former-commit-id: a198b3a807
[formerly d1d877d319
[formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]
Former-commit-id: d1d877d319
Former-commit-id: 27871051e3
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
55ac7d7684
Issue #915 Set the user data.
...
Former-commit-id: 03ed8ee0b0
[formerly 865136f6ef
[formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]
Former-commit-id: 865136f6ef
Former-commit-id: f37a75f265
2012-08-15 14:05:50 -05:00
Steve Harris
b9fb1c89d4
12.9.1-1 baseline
...
Former-commit-id: 79ce6cfd97
[formerly 31ae7ea218
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
2012-08-15 13:59:00 -05:00
Nate Jensen
a14db247fb
Merge "Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container" into development
...
Former-commit-id: 91e0ba8c23
[formerly 2cb82b7170
[formerly d252760b0e39002e53a5fce809b38521ca2351aa]]
Former-commit-id: 2cb82b7170
Former-commit-id: d70d78d664
2012-08-14 16:52:40 -05:00
Ron Anderson
9b35518fe5
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 81abb2c60b
[formerly 17f636c2a2
[formerly 373ac200fcd1c9a39244a2775d95c7b891334632]]
Former-commit-id: 17f636c2a2
Former-commit-id: bac68cc1de
2012-08-14 16:27:11 -05:00
Steve Harris
39dbd45d38
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: e530637aa3
[formerly e3927a11c7
[formerly 43d4642bc39a053d40fce9b6aff1d11f3d313dd7]]
Former-commit-id: e3927a11c7
Former-commit-id: 27fa10e133
2012-08-14 16:26:00 -05:00
Ben Steffensmeier
4c45df4e3f
Issue #947 revert changes to dataTime format
...
Former-commit-id: 70ba8d82db
[formerly 50cb7383a6
[formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]]
Former-commit-id: 50cb7383a6
Former-commit-id: 54b538bb07
2012-08-14 16:20:36 -05:00
Ron Anderson
0328f2f50a
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 985167892d
[formerly 71d74b1dcf
[formerly 564b72997c59a665398c8687d6bafdb54c469881]]
Former-commit-id: 71d74b1dcf
Former-commit-id: 5c80f582b3
2012-08-14 16:20:23 -05:00
Nate Jensen
98c132222b
Merge "Issue #947 revert changes to dataTime format" into development_on_ss_builds
...
Former-commit-id: 80f1766f9a
[formerly 571e16bd23
[formerly 22a06b47664b0f7b7592022345cc7e3ead147036]]
Former-commit-id: 571e16bd23
Former-commit-id: 9657ce7e32
2012-08-14 16:15:55 -05:00
Ben Steffensmeier
066f40e606
Issue #1058 fix reprojection of wind vectors
...
Former-commit-id: 9c727d2e33
[formerly ba9d0b25b5
[formerly 8fdc9841f9033720aa0ceb6389e7b1403d75a2d5]]
Former-commit-id: ba9d0b25b5
Former-commit-id: 28aae9f11f
2012-08-14 16:15:19 -05:00
David Gillingham
ac55928e60
Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes.
...
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: 79a77a38a4
[formerly f40fc68c28
[formerly 03f9de1860008cd1a2b4b60576802a67a8a447fa]]
Former-commit-id: f40fc68c28
Former-commit-id: e541c86f1b
2012-08-14 16:15:10 -05:00
Ben Steffensmeier
85bba2f435
Issue #947 revert changes to dataTime format
...
Former-commit-id: 434193b34b
[formerly ce689ad5fa
[formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]
Former-commit-id: ce689ad5fa
Former-commit-id: fd2bf26119
2012-08-14 16:12:02 -05:00