Nate Jensen
22b6406fe4
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: 94b7f40d1d
[formerly 94b7f40d1d
[formerly 0f98c3bfbf041cd46311517f2819ca2d81b1cd34]]
Former-commit-id: 168bee4bd7
Former-commit-id: a2f594e354
2012-08-27 09:21:50 -05:00
Nate Jensen
226092da3f
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 73f428e4d5
[formerly 73f428e4d5
[formerly 5e9d7763442ab91cb8d33c16139eb5bca9b033ea]]
Former-commit-id: 047441f91c
Former-commit-id: 347c13143b
2012-08-23 18:18:23 -05:00
Max Schenkelberg
8e894dba11
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: 75b2cdff47
[formerly 75b2cdff47
[formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]]
Former-commit-id: c4812b7745
Former-commit-id: 7f506ce81d
2012-08-23 17:37:12 -05:00
Roger Ferrel
fde1f13434
Issue #875 Refactor location of PointsToolLayer and supporting classes.
...
Issue #875 Code review comment fixes.
Change-Id: I1a120093602c0bd77b016fa72731e6ec7528a153
Former-commit-id: 07a1da2568
[formerly 07a1da2568
[formerly 5712a415bcd280d6884a14fd07ac0bdb5daa40bf]]
Former-commit-id: df0a9b39cb
Former-commit-id: ad4a690592
2012-08-23 13:17:54 -05:00
David Gillingham
1856f2b941
Issue #1087 : Enable DRT for CAVE operational mode.
...
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9
Former-commit-id: f7182ae9c7
[formerly f7182ae9c7
[formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]]
Former-commit-id: ec2d211800
Former-commit-id: cbd3bfacfa
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
acf62bb8d9
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: 1b45f1b6d9
[formerly 1b45f1b6d9
[formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]
Former-commit-id: f646b185da
Former-commit-id: a09fa0b649
2012-08-23 09:27:46 -05:00
Nate Jensen
18639218ed
Merge "Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards." into development
...
Former-commit-id: 20c69ffef3
[formerly 20c69ffef3
[formerly dad3bad6ebf34dd33b8d566a06c4f10a089ef35b]]
Former-commit-id: 21df8f9986
Former-commit-id: fbcb1eab54
2012-08-23 08:47:40 -05:00
Richard Peter
4a1c27bd22
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: 6c1690e063
[formerly 6c1690e063
[formerly 6aa68692dc050d61946be620a6f629c186e0fdaf]]
Former-commit-id: 4c56f4e20d
Former-commit-id: 252e8e7e2e
2012-08-22 17:07:17 -05:00
Ron Anderson
90733f03a0
Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards.
...
Change-Id: Ie311cf19850cf4205f30282741a96c0cdc9f3c9c
Former-commit-id: 5abacc273d
[formerly 5abacc273d
[formerly 9c439cc43ffe38fcecaae552ad820f310b7f4267]]
Former-commit-id: 576ccd6a38
Former-commit-id: 19f956b93f
2012-08-22 16:41:19 -05:00
Steve Harris
5656ac11a1
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: 13f70884f3
[formerly 13f70884f3
[formerly aa64613b0d04bca36310817989c79d12f0f107db]]
Former-commit-id: 9425f73c71
Former-commit-id: de16453f4f
2012-08-22 16:06:02 -05:00
Steve Harris
8f1120f6d8
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: b8ab6066f6
[formerly b8ab6066f6
[formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b77a4d40d7
Former-commit-id: b2c0dd1abb
2012-08-22 16:00:33 -05:00
James Korman
36e4ea8147
Issue #798 - Correct for hdfFileId
...
Former-commit-id: 56d6b1e886
[formerly 56d6b1e886
[formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]]
Former-commit-id: c2c228b429
Former-commit-id: 654ecefd3e
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
d8680dc631
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: a501aacb3b
[formerly a501aacb3b
[formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]]
Former-commit-id: a5c57e8d24
Former-commit-id: c7bc786a60
2012-08-22 13:03:24 -05:00
Ben Steffensmeier
6ab6152235
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: e1c07b5803
[formerly e1c07b5803
[formerly 61aab7b55f9868e69b43c5250515ce0d5b01d6e5]]
Former-commit-id: a988fdf5de
Former-commit-id: 4f16803030
2012-08-22 13:02:56 -05:00
Steve Harris
bbe382231f
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: 8e3ecc1efd
[formerly 8e3ecc1efd
[formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]
Former-commit-id: b8629a0f20
Former-commit-id: 9565d18b96
2012-08-22 13:01:08 -05:00
Steve Harris
445d1a6a0d
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: d38f8b80f0
[formerly d38f8b80f0
[formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 77369f78a6
2012-08-21 16:17:58 -05:00
Steve Harris
9b5c2094ed
12.9.1-5 baseline
...
Former-commit-id: 61f269f54c
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00
Roger Ferrel
85109fae11
Issue #875 Modification based on reviewers comments.
...
Issue #875 Implement Drag and Drop and converted point files to JAXB.
Change-Id: I3056794e1c77a02117998ac3f2d242c3ede3392b
Former-commit-id: ca52d45911
[formerly ca52d45911
[formerly ea356c6c0ff3962542aad451a7a1ec65a5921628]]
Former-commit-id: 23a67f458a
Former-commit-id: 544ea1ff53
2012-08-21 11:56:50 -05:00
Max Schenkelberg
587ad5d2e4
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: f381871fc4
[formerly f381871fc4
[formerly a34c116fbbad86f758882461dd96da9c6ab14cdd]]
Former-commit-id: 6e1059f8be
Former-commit-id: ed033f8657
2012-08-21 11:36:35 -05:00
Nate Jensen
9141879a98
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: 87c70d25e8
[formerly 87c70d25e8
[formerly 3c0e8a73dc372214352fab8ac91e2b68f11f78f2]]
Former-commit-id: 1efe57fd02
Former-commit-id: 521fc26db3
2012-08-21 11:02:22 -05:00
Steve Harris
9a2724e8f6
Merge "Issue #989 - Adding markings to jasper" into development
...
Former-commit-id: 0693643152
[formerly 0693643152
[formerly becc2dc6e147ae6f7caeaa872b8d9948b47dab1a]]
Former-commit-id: c2b21a4251
Former-commit-id: fc77903de7
2012-08-20 16:29:50 -05:00
Steve Harris
65b74111f1
Issue #989 - Adding markings to jasper
...
Former-commit-id: ccc150c980
[formerly ccc150c980
[formerly 306b93cb3b73ae963b5900c8200d29a659689a74]]
Former-commit-id: 9e8f59f31d
Former-commit-id: 15462e7a38
2012-08-20 16:26:51 -05:00
Max Schenkelberg
362d34bee0
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: b69d2cad1c
[formerly b69d2cad1c
[formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]
Former-commit-id: 1b406ecfca
Former-commit-id: aa9df46a1d
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
d9f68af5ad
Issue #666 fix collaboration message compose problems with ncp keybindings
...
Former-commit-id: 3f0b2e474c
[formerly 3f0b2e474c
[formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]
Former-commit-id: 8e971abbd8
Former-commit-id: 2c5cfe6d98
2012-08-17 16:16:20 -05:00
Ron Anderson
1b655b0826
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: d7a818fd1d
[formerly d7a818fd1d
[formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]
Former-commit-id: 7662d249ab
Former-commit-id: d3693827a1
2012-08-17 12:41:49 -05:00
Ron Anderson
f7b9190b51
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 1321db6a99
[formerly 1321db6a99
[formerly 9287cf98369abb8a674fd5bab99439d055218a05]]
Former-commit-id: 819b9c8e56
Former-commit-id: 6eafdda705
2012-08-17 12:20:08 -05:00
Bryan Kowal
1078d7b553
Remove the usage of the old method to build the edex ost rpm.
...
Former-commit-id: 44328f1702
[formerly 44328f1702
[formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]]
Former-commit-id: 01e7976a52
Former-commit-id: 69a16eb369
2012-08-16 14:27:11 -05:00
Steve Harris
9e75c7e5f1
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
...
Former-commit-id: fa77df807d
[formerly fa77df807d
[formerly 55326667ca13a37c7802849484949382e65a6329]]
Former-commit-id: 596d19466b
Former-commit-id: 20fda57d37
2012-08-16 10:27:51 -05:00
root
d1f2ac6698
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: 342bda7e5f
[formerly 342bda7e5f
[formerly 2368421395496141fdc6467fd165babc282b65ac]]
Former-commit-id: 6eec24180e
Former-commit-id: b3217ad886
2012-08-15 22:29:38 +00:00
root
64c3ccb4a4
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: b93989daaf
[formerly b93989daaf
[formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]
Former-commit-id: ba40e18fb2
Former-commit-id: 3e9d1fa430
2012-08-15 22:29:07 +00:00
root
1792158ef8
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: cb46f57879
[formerly cb46f57879
[formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
62979089d3
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: 6d9d0a406f
[formerly 6d9d0a406f
[formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]
Former-commit-id: 4203807a77
Former-commit-id: 8a170234b8
2012-08-15 16:36:05 -05:00
Benjamin Phillippe
e23523ad80
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: 72c63e1a6f
[formerly 72c63e1a6f
[formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]
Former-commit-id: 7bad34f906
Former-commit-id: 91493ee0b9
2012-08-15 16:22:39 -05:00
Nate Jensen
ca08f538e8
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: 9c1597b554
[formerly 9c1597b554
[formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]]
Former-commit-id: 6897b1d480
Former-commit-id: b7bc962da4
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
48a5389b2f
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: cb99170685
[formerly cb99170685
[formerly 97d786afadf136f75ffd6a440d35b628e144b888]]
Former-commit-id: b194a17abc
Former-commit-id: 74acf329c4
2012-08-15 15:25:46 -05:00
Steve Harris
de9b64b501
12.9.1-4 baseline
...
Former-commit-id: dcda3a2290
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: 33b95fb96d
Former-commit-id: 9990bf909b
2012-08-15 15:19:10 -05:00
Steve Harris
8c5c5ad6eb
12.9.1-3 baseline
...
Former-commit-id: 36d80b1f60
[formerly 36d80b1f60
[formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 84bbf2573e
Former-commit-id: edbbacfa8a
2012-08-15 14:26:10 -05:00
Steve Harris
ed416f241e
12.9.1-2 baseline
...
Former-commit-id: d1d877d319
[formerly d1d877d319
[formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]
Former-commit-id: a198b3a807
Former-commit-id: 448ed038c2
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
38bb2743e5
Issue #915 Set the user data.
...
Former-commit-id: 865136f6ef
[formerly 865136f6ef
[formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]
Former-commit-id: 03ed8ee0b0
Former-commit-id: e584d728f0
2012-08-15 14:05:50 -05:00
Steve Harris
63bcadf121
12.9.1-1 baseline
...
Former-commit-id: 31ae7ea218
[formerly 31ae7ea218
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
2012-08-15 13:59:00 -05:00
Steve Harris
14923a89e9
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 346d775f57
[formerly 346d775f57
[formerly 25026a4d9955b76039bf25861380cadebff19665]]
Former-commit-id: f7f97d9f54
Former-commit-id: 031b655ab5
2012-08-15 13:35:47 -05:00
Nate Jensen
ebad112688
Merge "Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container" into development
...
Former-commit-id: 2cb82b7170
[formerly 2cb82b7170
[formerly d252760b0e39002e53a5fce809b38521ca2351aa]]
Former-commit-id: 91e0ba8c23
Former-commit-id: 5b26d1e93e
2012-08-14 16:52:40 -05:00
Ron Anderson
3d0d4e9b09
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 17f636c2a2
[formerly 17f636c2a2
[formerly 373ac200fcd1c9a39244a2775d95c7b891334632]]
Former-commit-id: 81abb2c60b
Former-commit-id: 7cde30681b
2012-08-14 16:27:11 -05:00
Steve Harris
03ebee99f8
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: e3927a11c7
[formerly e3927a11c7
[formerly 43d4642bc39a053d40fce9b6aff1d11f3d313dd7]]
Former-commit-id: e530637aa3
Former-commit-id: 1687889756
2012-08-14 16:26:00 -05:00
Ben Steffensmeier
242cc34efe
Issue #947 revert changes to dataTime format
...
Former-commit-id: 50cb7383a6
[formerly 50cb7383a6
[formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]]
Former-commit-id: 70ba8d82db
Former-commit-id: 77b7c4c517
2012-08-14 16:20:36 -05:00
Ron Anderson
13d7576686
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 71d74b1dcf
[formerly 71d74b1dcf
[formerly 564b72997c59a665398c8687d6bafdb54c469881]]
Former-commit-id: 985167892d
Former-commit-id: 9bf0166f13
2012-08-14 16:20:23 -05:00
Nate Jensen
7961babdb2
Merge "Issue #947 revert changes to dataTime format" into development_on_ss_builds
...
Former-commit-id: 571e16bd23
[formerly 571e16bd23
[formerly 22a06b47664b0f7b7592022345cc7e3ead147036]]
Former-commit-id: 80f1766f9a
Former-commit-id: b6e459615b
2012-08-14 16:15:55 -05:00
Ben Steffensmeier
5112b6ce69
Issue #1058 fix reprojection of wind vectors
...
Former-commit-id: ba9d0b25b5
[formerly ba9d0b25b5
[formerly 8fdc9841f9033720aa0ceb6389e7b1403d75a2d5]]
Former-commit-id: 9c727d2e33
Former-commit-id: e65832b2bf
2012-08-14 16:15:19 -05:00
David Gillingham
18c572c983
Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes.
...
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: f40fc68c28
[formerly f40fc68c28
[formerly 03f9de1860008cd1a2b4b60576802a67a8a447fa]]
Former-commit-id: 79a77a38a4
Former-commit-id: dd80a94061
2012-08-14 16:15:10 -05:00
Ben Steffensmeier
f50c979293
Issue #947 revert changes to dataTime format
...
Former-commit-id: ce689ad5fa
[formerly ce689ad5fa
[formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]
Former-commit-id: 434193b34b
Former-commit-id: 15977fdba2
2012-08-14 16:12:02 -05:00