Steve Harris
fa7c31206b
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 32cf7fd7645feac55dbd
2012-08-30 15:43:06 -05:00
Steve Harris
f52c8b374d
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 34cbde41243a9d4961e2
2012-08-30 14:40:34 -05:00
Steve Harris
d07c18918d
12.9.1-11 baseline
...
Former-commit-id: fc405efab76eb6b0909b
2012-08-30 14:36:12 -05:00
Steve Harris
bdb45cdfae
12.9.1-10 baseline
...
Former-commit-id: cb9b80f3a03adc50a783
2012-08-30 14:28:27 -05:00
Max Schenkelberg
81531873e0
Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
...
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4
Former-commit-id: 0de737ad6400de2922e1
2012-08-29 18:17:30 -05:00
Nate Jensen
4c73903629
Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
...
Former-commit-id: b47baedad496393309eb
2012-08-29 16:09:50 -05:00
Max Schenkelberg
04c3a1c678
Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
...
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9
Former-commit-id: 81f78fa819f8aef2b067
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
e3bb8c80c9
Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
...
Former-commit-id: 37d2411b261f587e39f4
2012-08-29 14:24:21 -05:00
Matt Nash
ba698ae69a
Issue #1101 fix gfe keybindings for frame change in collaboration
...
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a
Former-commit-id: ada6ecf5f3018f590c70
2012-08-27 12:16:38 -05:00
Steve Harris
2e6842016b
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 076dccf42d3ee334378c
2012-08-27 11:32:45 -05:00
Steve Harris
51eb89eb2a
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: a71dac6cad91e39617cb
2012-08-27 09:53:55 -05:00
Nate Jensen
eac562204d
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: 168bee4bd794b7f40d1d
2012-08-27 09:21:50 -05:00
Nate Jensen
7b62f6ac75
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 047441f91c73f428e4d5
2012-08-23 18:18:23 -05:00
Max Schenkelberg
1f84ddbddf
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: c4812b774575b2cdff47
2012-08-23 17:37:12 -05:00
Roger Ferrel
b3ea5e3916
Issue #875 Refactor location of PointsToolLayer and supporting classes.
...
Issue #875 Code review comment fixes.
Change-Id: I1a120093602c0bd77b016fa72731e6ec7528a153
Former-commit-id: df0a9b39cb07a1da2568
2012-08-23 13:17:54 -05:00
David Gillingham
f3a33e3df4
Issue #1087 : Enable DRT for CAVE operational mode.
...
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9
Former-commit-id: ec2d211800f7182ae9c7
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
20c65a4677
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: f646b185da1b45f1b6d9
2012-08-23 09:27:46 -05:00
Nate Jensen
dab98d0625
Merge "Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards." into development
...
Former-commit-id: 21df8f998620c69ffef3
2012-08-23 08:47:40 -05:00
Richard Peter
0dd2c44c9c
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: 4c56f4e20d6c1690e063
2012-08-22 17:07:17 -05:00
Ron Anderson
82e45b58fa
Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards.
...
Change-Id: Ie311cf19850cf4205f30282741a96c0cdc9f3c9c
Former-commit-id: 576ccd6a385abacc273d
2012-08-22 16:41:19 -05:00
Steve Harris
fbe4210245
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: 9425f73c7113f70884f3
2012-08-22 16:06:02 -05:00
Steve Harris
7a4f4ac493
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: b77a4d40d7b8ab6066f6
2012-08-22 16:00:33 -05:00
James Korman
6d250cf9f3
Issue #798 - Correct for hdfFileId
...
Former-commit-id: c2c228b42956d6b1e886
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
04389b9f21
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: a5c57e8d24a501aacb3b
2012-08-22 13:03:24 -05:00
Ben Steffensmeier
596b48c490
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: a988fdf5dee1c07b5803
2012-08-22 13:02:56 -05:00
Steve Harris
04c8c3ca55
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: b8629a0f208e3ecc1efd
2012-08-22 13:01:08 -05:00
Steve Harris
084ac9fbd4
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: 44a7cb75e7d38f8b80f0
2012-08-21 16:17:58 -05:00
Steve Harris
a1d931fd44
12.9.1-5 baseline
...
Former-commit-id: f2fac3942861f269f54c
2012-08-21 15:27:03 -05:00
Roger Ferrel
f7c56e0a73
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: 23a67f458aca52d45911
2012-08-21 11:56:50 -05:00
Max Schenkelberg
e404398ea6
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: 6e1059f8bef381871fc4
2012-08-21 11:36:35 -05:00
Nate Jensen
e29017c389
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: 1efe57fd0287c70d25e8
2012-08-21 11:02:22 -05:00
Steve Harris
9165608ba0
Merge "Issue #989 - Adding markings to jasper" into development
...
Former-commit-id: c2b21a42510693643152
2012-08-20 16:29:50 -05:00
Steve Harris
5ce7935576
Issue #989 - Adding markings to jasper
...
Former-commit-id: 9e8f59f31dccc150c980
2012-08-20 16:26:51 -05:00
Max Schenkelberg
fc06265360
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: 1b406ecfcab69d2cad1c
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
25b00010e1
Issue #666 fix collaboration message compose problems with ncp keybindings
...
Former-commit-id: 8e971abbd83f0b2e474c
2012-08-17 16:16:20 -05:00
Ron Anderson
16231374f8
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: 7662d249abd7a818fd1d
2012-08-17 12:41:49 -05:00
Ron Anderson
93c632c1ff
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 819b9c8e561321db6a99
2012-08-17 12:20:08 -05:00
Bryan Kowal
d5c16eb8ce
Remove the usage of the old method to build the edex ost rpm.
...
Former-commit-id: 01e7976a5244328f1702
2012-08-16 14:27:11 -05:00
Steve Harris
735ed2ecd9
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
...
Former-commit-id: 596d19466bfa77df807d
2012-08-16 10:27:51 -05:00
root
ac8888ae10
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: 6eec24180e342bda7e5f
2012-08-15 22:29:38 +00:00
root
d170ae704b
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: ba40e18fb2b93989daaf
2012-08-15 22:29:07 +00:00
root
0987fc6b3d
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: 5a453ee984cb46f57879
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
e8524301b5
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: 4203807a776d9d0a406f
2012-08-15 16:36:05 -05:00
Benjamin Phillippe
dd8ed9eca0
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: 7bad34f90672c63e1a6f
2012-08-15 16:22:39 -05:00
Nate Jensen
b94597d03c
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: 6897b1d4809c1597b554
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
9c41e73ee5
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: b194a17abccb99170685
2012-08-15 15:25:46 -05:00
Steve Harris
36c108e960
12.9.1-4 baseline
...
Former-commit-id: 33b95fb96ddcda3a2290
2012-08-15 15:19:10 -05:00
Steve Harris
c11f7d396e
12.9.1-3 baseline
...
Former-commit-id: 84bbf2573e36d80b1f60
2012-08-15 14:26:10 -05:00
Steve Harris
27871051e3
12.9.1-2 baseline
...
Former-commit-id: a198b3a807d1d877d319
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
f37a75f265
Issue #915 Set the user data.
...
Former-commit-id: 03ed8ee0b0865136f6ef
2012-08-15 14:05:50 -05:00
