Nate Jensen
22b6406fe4
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: 94b7f40d1d94b7f40d1d168bee4bd7a2f594e354
2012-08-27 09:21:50 -05:00
Nate Jensen
226092da3f
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 73f428e4d573f428e4d5047441f91c347c13143b
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: 75b2cdff4775b2cdff47c4812b77457f506ce81d
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: 07a1da256807a1da2568df0a9b39cbad4a690592
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: f7182ae9c7f7182ae9c7ec2d211800cbd3bfacfa
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: 1b45f1b6d91b45f1b6d9f646b185daa09fa0b649
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: 20c69ffef320c69ffef321df8f9986fbcb1eab54
2012-08-23 08:47:40 -05:00
Richard Peter
4a1c27bd22
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: 6c1690e0636c1690e0634c56f4e20d252e8e7e2e
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: 5abacc273d5abacc273d576ccd6a3819f956b93f
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: 13f70884f313f70884f39425f73c71de16453f4f
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: b8ab6066f6b8ab6066f6b77a4d40d7b2c0dd1abb
2012-08-22 16:00:33 -05:00
James Korman
36e4ea8147
Issue #798 - Correct for hdfFileId
...
Former-commit-id: 56d6b1e88656d6b1e886c2c228b429654ecefd3e
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: a501aacb3ba501aacb3ba5c57e8d24c7bc786a60
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: e1c07b5803e1c07b5803a988fdf5de4f16803030
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: 8e3ecc1efd8e3ecc1efdb8629a0f209565d18b96
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: d38f8b80f0d38f8b80f044a7cb75e777369f78a6
2012-08-21 16:17:58 -05:00
Steve Harris
9b5c2094ed
12.9.1-5 baseline
...
Former-commit-id: 61f269f54c61f269f54cf2fac3942872824561cb
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: ca52d45911ca52d4591123a67f458a544ea1ff53
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: f381871fc4f381871fc46e1059f8beed033f8657
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: 87c70d25e887c70d25e81efe57fd02521fc26db3
2012-08-21 11:02:22 -05:00
Steve Harris
9a2724e8f6
Merge "Issue #989 - Adding markings to jasper" into development
...
Former-commit-id: 06936431520693643152c2b21a4251fc77903de7
2012-08-20 16:29:50 -05:00
Steve Harris
65b74111f1
Issue #989 - Adding markings to jasper
...
Former-commit-id: ccc150c980ccc150c9809e8f59f31d15462e7a38
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: b69d2cad1cb69d2cad1c1b406ecfcaaa9df46a1d
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
d9f68af5ad
Issue #666 fix collaboration message compose problems with ncp keybindings
...
Former-commit-id: 3f0b2e474c3f0b2e474c8e971abbd82c5cfe6d98
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: d7a818fd1dd7a818fd1d7662d249abd3693827a1
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: 1321db6a991321db6a99819b9c8e566eafdda705
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: 44328f170244328f170201e7976a5269a16eb369
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: fa77df807dfa77df807d596d19466b20fda57d37
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: 342bda7e5f342bda7e5f6eec24180eb3217ad886
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: b93989daafb93989daafba40e18fb23e9d1fa430
2012-08-15 22:29:07 +00:00
root
1792158ef8
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: cb46f57879cb46f578795a453ee9848a66b2f209
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
62979089d3
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: 6d9d0a406f6d9d0a406f4203807a778a170234b8
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: 72c63e1a6f72c63e1a6f7bad34f90691493ee0b9
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: 9c1597b5549c1597b5546897b1d480b7bc962da4
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: cb99170685cb99170685b194a17abc74acf329c4
2012-08-15 15:25:46 -05:00
Steve Harris
de9b64b501
12.9.1-4 baseline
...
Former-commit-id: dcda3a2290dcda3a229033b95fb96d9990bf909b
2012-08-15 15:19:10 -05:00
Steve Harris
8c5c5ad6eb
12.9.1-3 baseline
...
Former-commit-id: 36d80b1f6036d80b1f6084bbf2573eedbbacfa8a
2012-08-15 14:26:10 -05:00
Steve Harris
ed416f241e
12.9.1-2 baseline
...
Former-commit-id: d1d877d319d1d877d319a198b3a807448ed038c2
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
38bb2743e5
Issue #915 Set the user data.
...
Former-commit-id: 865136f6ef865136f6ef03ed8ee0b0e584d728f0
2012-08-15 14:05:50 -05:00
Steve Harris
63bcadf121
12.9.1-1 baseline
...
Former-commit-id: 31ae7ea21831ae7ea21879ce6cfd970c5d9e2416
2012-08-15 13:59:00 -05:00
Steve Harris
14923a89e9
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 346d775f57346d775f57f7f97d9f54031b655ab5
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: 2cb82b71702cb82b717091e0ba8c235b26d1e93e
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: 17f636c2a217f636c2a281abb2c60b7cde30681b
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: e3927a11c7e3927a11c7e530637aa31687889756
2012-08-14 16:26:00 -05:00
Ben Steffensmeier
242cc34efe
Issue #947 revert changes to dataTime format
...
Former-commit-id: 50cb7383a650cb7383a670ba8d82db77b7c4c517
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: 71d74b1dcf71d74b1dcf985167892d9bf0166f13
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: 571e16bd23571e16bd2380f1766f9ab6e459615b
2012-08-14 16:15:55 -05:00
Ben Steffensmeier
5112b6ce69
Issue #1058 fix reprojection of wind vectors
...
Former-commit-id: ba9d0b25b5ba9d0b25b59c727d2e33e65832b2bf
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: f40fc68c28f40fc68c2879a77a38a4dd80a94061
2012-08-14 16:15:10 -05:00
Ben Steffensmeier
f50c979293
Issue #947 revert changes to dataTime format
...
Former-commit-id: ce689ad5face689ad5fa434193b34b15977fdba2
2012-08-14 16:12:02 -05:00
