Steve Harris
feccb1205d
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 32cf7fd7645feac55dbd5feac55dbdfa7c31206b
2012-08-30 15:43:06 -05:00
Steve Harris
9ff4f369a4
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 34cbde41243a9d4961e23a9d4961e2f52c8b374d
2012-08-30 14:40:34 -05:00
Steve Harris
a2bb1dabe0
12.9.1-11 baseline
...
Former-commit-id: fc405efab76eb6b0909b6eb6b0909bd07c18918d
2012-08-30 14:36:12 -05:00
Steve Harris
264d870cbf
12.9.1-10 baseline
...
Former-commit-id: cb9b80f3a03adc50a7833adc50a783bdb45cdfae
2012-08-30 14:28:27 -05:00
Max Schenkelberg
d0160a4aa9
Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
...
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4
Former-commit-id: 0de737ad6400de2922e100de2922e181531873e0
2012-08-29 18:17:30 -05:00
Nate Jensen
a6afe463af
Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
...
Former-commit-id: b47baedad496393309eb96393309eb4c73903629
2012-08-29 16:09:50 -05:00
Max Schenkelberg
e03e761b28
Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
...
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9
Former-commit-id: 81f78fa819f8aef2b067f8aef2b06704c3a1c678
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
669d1023a8
Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
...
Former-commit-id: 37d2411b261f587e39f41f587e39f4e3bb8c80c9
2012-08-29 14:24:21 -05:00
Matt Nash
04ce96d74e
Issue #1101 fix gfe keybindings for frame change in collaboration
...
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a
Former-commit-id: ada6ecf5f3018f590c70018f590c70ba698ae69a
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: 076dccf42d3ee334378c3ee334378c2e6842016b
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: a71dac6cad91e39617cb91e39617cb51eb89eb2a
2012-08-27 09:53:55 -05:00
Nate Jensen
07ac473e55
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: 168bee4bd794b7f40d1d94b7f40d1deac562204d
2012-08-27 09:21:50 -05:00
Nate Jensen
7439c24618
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 047441f91c73f428e4d573f428e4d57b62f6ac75
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: c4812b774575b2cdff4775b2cdff471f84ddbddf
2012-08-23 17:37:12 -05:00
Roger Ferrel
10f75480b0
Issue #875 Refactor location of PointsToolLayer and supporting classes.
...
Issue #875 Code review comment fixes.
Change-Id: I1a120093602c0bd77b016fa72731e6ec7528a153
Former-commit-id: df0a9b39cb07a1da256807a1da2568b3ea5e3916
2012-08-23 13:17:54 -05:00
David Gillingham
a03dfbea98
Issue #1087 : Enable DRT for CAVE operational mode.
...
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9
Former-commit-id: ec2d211800f7182ae9c7f7182ae9c7f3a33e3df4
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: f646b185da1b45f1b6d91b45f1b6d920c65a4677
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: 21df8f998620c69ffef320c69ffef3dab98d0625
2012-08-23 08:47:40 -05:00
Richard Peter
f9878c21f7
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: 4c56f4e20d6c1690e0636c1690e0630dd2c44c9c
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: 576ccd6a385abacc273d5abacc273d82e45b58fa
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: 9425f73c7113f70884f313f70884f3fbe4210245
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: b77a4d40d7b8ab6066f6b8ab6066f67a4f4ac493
2012-08-22 16:00:33 -05:00
James Korman
7d61470ce7
Issue #798 - Correct for hdfFileId
...
Former-commit-id: c2c228b42956d6b1e88656d6b1e8866d250cf9f3
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: a5c57e8d24a501aacb3ba501aacb3b04389b9f21
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: a988fdf5dee1c07b5803e1c07b5803596b48c490
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: b8629a0f208e3ecc1efd8e3ecc1efd04c8c3ca55
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: 44a7cb75e7d38f8b80f0d38f8b80f0084ac9fbd4
2012-08-21 16:17:58 -05:00
Steve Harris
77cbd6c1e5
12.9.1-5 baseline
...
Former-commit-id: f2fac3942861f269f54c61f269f54ca1d931fd44
2012-08-21 15:27:03 -05:00
Roger Ferrel
a4987d9d8e
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: 23a67f458aca52d45911ca52d45911f7c56e0a73
2012-08-21 11:56:50 -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: 6e1059f8bef381871fc4f381871fc4e404398ea6
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: 1efe57fd0287c70d25e887c70d25e8e29017c389
2012-08-21 11:02:22 -05:00
Steve Harris
a8cd465f23
Merge "Issue #989 - Adding markings to jasper" into development
...
Former-commit-id: c2b21a4251069364315206936431529165608ba0
2012-08-20 16:29:50 -05:00
Steve Harris
63c4a840ad
Issue #989 - Adding markings to jasper
...
Former-commit-id: 9e8f59f31dccc150c980ccc150c9805ce7935576
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: 1b406ecfcab69d2cad1cb69d2cad1cfc06265360
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
977d5587cb
Issue #666 fix collaboration message compose problems with ncp keybindings
...
Former-commit-id: 8e971abbd83f0b2e474c3f0b2e474c25b00010e1
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: 7662d249abd7a818fd1dd7a818fd1d16231374f8
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: 819b9c8e561321db6a991321db6a9993c632c1ff
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: 01e7976a5244328f170244328f1702d5c16eb8ce
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: 596d19466bfa77df807dfa77df807d735ed2ecd9
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: 6eec24180e342bda7e5f342bda7e5fac8888ae10
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: ba40e18fb2b93989daafb93989daafd170ae704b
2012-08-15 22:29:07 +00:00
root
bb7b5341dd
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: 5a453ee984cb46f57879cb46f578790987fc6b3d
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
e65418717f
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: 4203807a776d9d0a406f6d9d0a406fe8524301b5
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: 7bad34f90672c63e1a6f72c63e1a6fdd8ed9eca0
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: 6897b1d4809c1597b5549c1597b554b94597d03c
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: b194a17abccb99170685cb991706859c41e73ee5
2012-08-15 15:25:46 -05:00
Steve Harris
71b024e3a1
12.9.1-4 baseline
...
Former-commit-id: 33b95fb96ddcda3a2290dcda3a229036c108e960
2012-08-15 15:19:10 -05:00
Steve Harris
8083b81729
12.9.1-3 baseline
...
Former-commit-id: 84bbf2573e36d80b1f6036d80b1f60c11f7d396e
2012-08-15 14:26:10 -05:00
Steve Harris
ecba93c959
12.9.1-2 baseline
...
Former-commit-id: a198b3a807d1d877d319d1d877d31927871051e3
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
55ac7d7684
Issue #915 Set the user data.
...
Former-commit-id: 03ed8ee0b0865136f6ef865136f6eff37a75f265
2012-08-15 14:05:50 -05:00
