Commit graph

835 commits

Author SHA1 Message Date
Steve Harris
a71dac6cad 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: b9db13cf5bff60511d815f92f0239a4313498265
2012-08-27 09:53:55 -05:00
Nate Jensen
168bee4bd7 Merge "Issue #1096 fix memory leaks in CcfpResource" into development
Former-commit-id: 0f98c3bfbf041cd46311517f2819ca2d81b1cd34
2012-08-27 09:21:50 -05:00
Nate Jensen
047441f91c Issue #1096 fix memory leaks in CcfpResource
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc

Former-commit-id: 5e9d7763442ab91cb8d33c16139eb5bca9b033ea
2012-08-23 18:18:23 -05:00
Max Schenkelberg
c4812b7745 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: 291edbc6bd69815e003179e9ce708b6fdad254ad
2012-08-23 17:37:12 -05:00
Roger Ferrel
df0a9b39cb Issue #875 Refactor location of PointsToolLayer and supporting classes.
Issue #875 Code review comment fixes.

Change-Id: I1a120093602c0bd77b016fa72731e6ec7528a153

Former-commit-id: 5712a415bcd280d6884a14fd07ac0bdb5daa40bf
2012-08-23 13:17:54 -05:00
David Gillingham
ec2d211800 Issue #1087: Enable DRT for CAVE operational mode.
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9

Former-commit-id: 3f3c778d6f3c5ced13f778746c6a9a46f72c396c
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
f646b185da 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: a7f030f7ee05c60820c1ef82a5093b404e5e97a0
2012-08-23 09:27:46 -05:00
Nate Jensen
21df8f9986 Merge "Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards." into development
Former-commit-id: dad3bad6ebf34dd33b8d566a06c4f10a089ef35b
2012-08-23 08:47:40 -05:00
Richard Peter
4c56f4e20d Merge "Issue #798 - Correct for hdfFileId" into development
Former-commit-id: 6aa68692dc050d61946be620a6f629c186e0fdaf
2012-08-22 17:07:17 -05:00
Ron Anderson
576ccd6a38 Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards.
Change-Id: Ie311cf19850cf4205f30282741a96c0cdc9f3c9c

Former-commit-id: 9c439cc43ffe38fcecaae552ad820f310b7f4267
2012-08-22 16:41:19 -05:00
Steve Harris
9425f73c71 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: aa64613b0d04bca36310817989c79d12f0f107db
2012-08-22 16:06:02 -05:00
Steve Harris
b77a4d40d7 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e977bd92cef6986b14725164c9eaa417ecf359cf
2012-08-22 16:00:33 -05:00
James Korman
c2c228b429 Issue #798 - Correct for hdfFileId
Former-commit-id: 3dd604623685cd5aba9e0a28001004cecef8d29a
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
a5c57e8d24 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: ccb9b1b4e9caf8523706535b141b0e54dd798c70
2012-08-22 13:03:24 -05:00
Ben Steffensmeier
a988fdf5de Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
Former-commit-id: 61aab7b55f9868e69b43c5250515ce0d5b01d6e5
2012-08-22 13:02:56 -05:00
Steve Harris
b8629a0f20 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: ef64da82bb8594eddead221f7c5bf5fa95e4ff8b
2012-08-22 13:01:08 -05:00
Steve Harris
44a7cb75e7 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: 6d33469c48d659279c02e5e9489b67b00576381a
2012-08-21 16:17:58 -05:00
Steve Harris
f2fac39428 12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Roger Ferrel
23a67f458a 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: ea356c6c0ff3962542aad451a7a1ec65a5921628
2012-08-21 11:56:50 -05:00
Max Schenkelberg
6e1059f8be 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: a34c116fbbad86f758882461dd96da9c6ab14cdd
2012-08-21 11:36:35 -05:00
Nate Jensen
1efe57fd02 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: 3c0e8a73dc372214352fab8ac91e2b68f11f78f2
2012-08-21 11:02:22 -05:00
Steve Harris
c2b21a4251 Merge "Issue #989 - Adding markings to jasper" into development
Former-commit-id: becc2dc6e147ae6f7caeaa872b8d9948b47dab1a
2012-08-20 16:29:50 -05:00
Steve Harris
9e8f59f31d Issue #989 - Adding markings to jasper
Former-commit-id: 306b93cb3b73ae963b5900c8200d29a659689a74
2012-08-20 16:26:51 -05:00
Max Schenkelberg
1b406ecfca 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: 564b38b30562a371cf0345de572b32ea8f53e82e
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
8e971abbd8 Issue #666 fix collaboration message compose problems with ncp keybindings
Former-commit-id: ec779e0252ae7efd7228b7a0e1eea83b05b10c9b
2012-08-17 16:16:20 -05:00
Ron Anderson
7662d249ab 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: 18f0efe7a8d9f2c31786fc449403f720b554b95d
2012-08-17 12:41:49 -05:00
Ron Anderson
819b9c8e56 Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: 9287cf98369abb8a674fd5bab99439d055218a05
2012-08-17 12:20:08 -05:00
Bryan Kowal
01e7976a52 Remove the usage of the old method to build the edex ost rpm.
Former-commit-id: 6fb431fe7f0204e8acc1e8263800c41aa5974bd9
2012-08-16 14:27:11 -05:00
Steve Harris
596d19466b Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
Former-commit-id: 55326667ca13a37c7802849484949382e65a6329
2012-08-16 10:27:51 -05:00
root
6eec24180e Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: 2368421395496141fdc6467fd165babc282b65ac
2012-08-15 22:29:38 +00:00
root
ba40e18fb2 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: 6e4d168bf9ea0c252d0923e4e2595d9c4df06289
2012-08-15 22:29:07 +00:00
root
5a453ee984 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: a178af491f4b4cd75ed1517f023354bab0b9c8c8
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
4203807a77 Issue #1065 fix contexts to deactivate when unrecognized views activate.
Former-commit-id: 5046660b52594a165d4a8749ac12c236d5ec027d
2012-08-15 16:36:05 -05:00
Benjamin Phillippe
7bad34f906 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: b30ec7ab0f96f1155e2c13587a1b4f179ce3da51
2012-08-15 16:22:39 -05:00
Nate Jensen
6897b1d480 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: 631ffe5bcec2a03934ac2063352b11aa6ab04ff7
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
b194a17abc Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
Former-commit-id: 97d786afadf136f75ffd6a440d35b628e144b888
2012-08-15 15:25:46 -05:00
Steve Harris
33b95fb96d 12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
84bbf2573e 12.9.1-3 baseline
Former-commit-id: 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86
2012-08-15 14:26:10 -05:00
Steve Harris
a198b3a807 12.9.1-2 baseline
Former-commit-id: 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
03ed8ee0b0 Issue #915 Set the user data.
Former-commit-id: d0e0b6160cc0969353555bd7282829a3440c9ef6
2012-08-15 14:05:50 -05:00
Steve Harris
79ce6cfd97 12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00
Steve Harris
f7f97d9f54 Merge branch 'development' into Enhanced_points
Former-commit-id: 25026a4d9955b76039bf25861380cadebff19665
2012-08-15 13:35:47 -05:00
Nate Jensen
91e0ba8c23 Merge "Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container" into development
Former-commit-id: d252760b0e39002e53a5fce809b38521ca2351aa
2012-08-14 16:52:40 -05:00
Ron Anderson
81abb2c60b Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 373ac200fcd1c9a39244a2775d95c7b891334632
2012-08-14 16:27:11 -05:00
Steve Harris
e530637aa3 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 43d4642bc39a053d40fce9b6aff1d11f3d313dd7
2012-08-14 16:26:00 -05:00
Ben Steffensmeier
70ba8d82db Issue #947 revert changes to dataTime format
Former-commit-id: 53a441f310e35d80ceb0ff28c156bf15ba1b5893
2012-08-14 16:20:36 -05:00
Ron Anderson
985167892d Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 564b72997c59a665398c8687d6bafdb54c469881
2012-08-14 16:20:23 -05:00
Nate Jensen
80f1766f9a Merge "Issue #947 revert changes to dataTime format" into development_on_ss_builds
Former-commit-id: 22a06b47664b0f7b7592022345cc7e3ead147036
2012-08-14 16:15:55 -05:00
Ben Steffensmeier
9c727d2e33 Issue #1058 fix reprojection of wind vectors
Former-commit-id: 8fdc9841f9033720aa0ceb6389e7b1403d75a2d5
2012-08-14 16:15:19 -05:00
David Gillingham
79a77a38a4 Issue #1055: Fix coop precip breakage from Wes2Bridge db changes.
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad

Former-commit-id: 03f9de1860008cd1a2b4b60576802a67a8a447fa
2012-08-14 16:15:10 -05:00