Bryan Kowal
a10099b0a4
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
...
Former-commit-id: 8444e742df35aff16e89137b27d3ff3e1556a981137b27d3ff3e1556a981a34225c4c97ec6eb66ab
2012-09-05 14:44:36 -05:00
Max Schenkelberg
e7b2f69ff3
Issue #29 Changed how TileLevel calculate pixel density to make densities more consistent between granules on display. Changed TileSetRenderable level change threshold to smaller value so displays look less pixelated with new pixel density calculation. Fixed FileTreeView from throwing errors if two definitions with same name defined which came to light from NPP build
...
Change-Id: I66b556b74e1a856dace5447c4b9f090d026c493c
Former-commit-id: e06d1dabefa14d5d4c86c183a0e61428d6308444c183a0e61428d630844487bcbdb4cc45d6b7bcb5
2012-09-05 11:51:38 -05:00
Ben Steffensmeier
49524b9109
Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
...
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8
Former-commit-id: 513bd44ba0dc6f5805ef4272f4c885c618ee90574272f4c885c618ee9057e0a4fe2c4366e9b24e51
2012-09-04 13:41:10 -05:00
Steve Harris
20e088a957
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: 319927240c0e046d847abba4eb12d0af106f1d29bba4eb12d0af106f1d2953e29f59e4f224e3e8ad
2012-09-04 12:11:03 -05:00
Steve Harris
9f4fa7bf83
12.10.1-1 baseline
...
Former-commit-id: 7248f8b7620abf64b77c195158c004d708932029195158c004d7089320297bd9c63dc7e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
15fa63819d
12.9.1-12 baseline
...
Former-commit-id: 6784576fc94bf4f0043a948766c387150bc967a5948766c387150bc967a59311c1737e782941ccc1
2012-09-04 11:47:38 -05:00
Steve Harris
a3a1864f56
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 9ff4f369a4f52c8b374d3a9d4961e234cbde41243a9d4961e234cbde41243230e0b246ffe253196a
2012-08-30 14:40:34 -05:00
Steve Harris
503b7bf15c
12.9.1-11 baseline
...
Former-commit-id: a2bb1dabe0d07c18918d6eb6b0909bfc405efab76eb6b0909bfc405efab7a14374fcd4dc5ec3d16d
2012-08-30 14:36:12 -05:00
Steve Harris
c704490769
12.9.1-10 baseline
...
Former-commit-id: 264d870cbfbdb45cdfae3adc50a783cb9b80f3a03adc50a783cb9b80f3a0dc08c5a71af43a5af47f
2012-08-30 14:28:27 -05:00
Max Schenkelberg
e2e9969448
Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
...
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4
Former-commit-id: d0160a4aa981531873e000de2922e10de737ad6400de2922e10de737ad64b75fad8e30ef8ed151a9
2012-08-29 18:17:30 -05:00
Nate Jensen
e313a785b0
Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
...
Former-commit-id: a6afe463af4c7390362996393309ebb47baedad496393309ebb47baedad4e6661037f545134743b6
2012-08-29 16:09:50 -05:00
Max Schenkelberg
50a53cf8b6
Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
...
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9
Former-commit-id: e03e761b2804c3a1c678f8aef2b06781f78fa819f8aef2b06781f78fa81999c8b1a968e593c9d56e
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
80ffe1feff
Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
...
Former-commit-id: 669d1023a8e3bb8c80c91f587e39f437d2411b261f587e39f437d2411b2636dd38700768235d0744
2012-08-29 14:24:21 -05:00
Matt Nash
d35027f45e
Issue #1101 fix gfe keybindings for frame change in collaboration
...
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a
Former-commit-id: 04ce96d74eba698ae69a018f590c70ada6ecf5f3018f590c70ada6ecf5f31242054a50cac1c2bb2e
2012-08-27 12:16:38 -05:00
Steve Harris
e34edddfbf
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 948b22090c2e6842016b3ee334378c076dccf42d3ee334378c076dccf42da93487ab9665b91e1506
2012-08-27 11:32:45 -05:00
Steve Harris
fd6e8d5b63
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: 772c4359da51eb89eb2a91e39617cba71dac6cad91e39617cba71dac6cad87a602dfeedbcb28ce77
2012-08-27 09:53:55 -05:00
Nate Jensen
575e5e3806
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: 07ac473e55eac562204d94b7f40d1d168bee4bd794b7f40d1d168bee4bd7a2f594e354977664c699
2012-08-27 09:21:50 -05:00
Nate Jensen
132cc792f4
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 7439c246187b62f6ac7573f428e4d5047441f91c73f428e4d5047441f91c347c13143b0cc8e95b0c
2012-08-23 18:18:23 -05:00
Max Schenkelberg
8fb5b29881
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: 97759c7ce11f84ddbddf75b2cdff47c4812b774575b2cdff47c4812b77457f506ce81d6f96fa5045
2012-08-23 17:37:12 -05:00
David Gillingham
b33e97efd3
Issue #1087 : Enable DRT for CAVE operational mode.
...
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9
Former-commit-id: a03dfbea98f3a33e3df4f7182ae9c7ec2d211800f7182ae9c7ec2d211800cbd3bfacfa3b41cd02f4
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
137c2871ad
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: caaa78a98120c65a46771b45f1b6d9f646b185da1b45f1b6d9f646b185daa09fa0b649da1f3fe29b
2012-08-23 09:27:46 -05:00
Nate Jensen
b3601437d5
Merge "Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards." into development
...
Former-commit-id: 3146f03455dab98d062520c69ffef321df8f998620c69ffef321df8f9986fbcb1eab54701dbef8d6
2012-08-23 08:47:40 -05:00
Richard Peter
f8c069352b
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: f9878c21f70dd2c44c9c6c1690e0634c56f4e20d6c1690e0634c56f4e20d252e8e7e2e46cd0f5110
2012-08-22 17:07:17 -05:00
Ron Anderson
61060e0eac
Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards.
...
Change-Id: Ie311cf19850cf4205f30282741a96c0cdc9f3c9c
Former-commit-id: 25b6e47dbd82e45b58fa5abacc273d576ccd6a385abacc273d576ccd6a3819f956b93fb6117e9945
2012-08-22 16:41:19 -05:00
Steve Harris
cef1cd081f
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: bdf8d89d33fbe421024513f70884f39425f73c7113f70884f39425f73c71de16453f4f3e9ee884ab
2012-08-22 16:06:02 -05:00
Steve Harris
fffd905412
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: e1cf4b0b9a7a4f4ac493b8ab6066f6b77a4d40d7b8ab6066f6b77a4d40d7b2c0dd1abb34fa4b5804
2012-08-22 16:00:33 -05:00
James Korman
ce2d764418
Issue #798 - Correct for hdfFileId
...
Former-commit-id: 7d61470ce76d250cf9f356d6b1e886c2c228b42956d6b1e886c2c228b429654ecefd3eea24ef83b8
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
a7872b1c6d
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: e69aa9373504389b9f21a501aacb3ba5c57e8d24a501aacb3ba5c57e8d24c7bc786a605d988cc5c1
2012-08-22 13:03:24 -05:00
Ben Steffensmeier
f204baba47
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: bc054637f1596b48c490e1c07b5803a988fdf5dee1c07b5803a988fdf5de4f16803030da05d2dd24
2012-08-22 13:02:56 -05:00
Steve Harris
0e79416277
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: deb39fdbea04c8c3ca558e3ecc1efdb8629a0f208e3ecc1efdb8629a0f209565d18b96d974aaf277
2012-08-22 13:01:08 -05:00
Steve Harris
a6797a478a
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: 57c1be9f5a084ac9fbd4d38f8b80f044a7cb75e7d38f8b80f044a7cb75e777369f78a6b335416e06
2012-08-21 16:17:58 -05:00
Steve Harris
d9faed979f
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5a1d931fd4461f269f54cf2fac3942861f269f54cf2fac3942872824561cb7fb0b17bd5
2012-08-21 15:27:03 -05:00
Max Schenkelberg
c3f6bc5225
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: 6e575aa450e404398ea6f381871fc46e1059f8bef381871fc46e1059f8beed033f8657919000d0dd
2012-08-21 11:36:35 -05:00
Nate Jensen
920b051a5b
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: 3413c389cce29017c38987c70d25e81efe57fd0287c70d25e81efe57fd02521fc26db39c9f9a4989
2012-08-21 11:02:22 -05:00
Steve Harris
6a62dd4e04
Merge "Issue #989 - Adding markings to jasper" into development
...
Former-commit-id: a8cd465f239165608ba00693643152c2b21a42510693643152c2b21a4251fc77903de794e981ae8b
2012-08-20 16:29:50 -05:00
Steve Harris
a432d3a698
Issue #989 - Adding markings to jasper
...
Former-commit-id: 63c4a840ad5ce7935576ccc150c9809e8f59f31dccc150c9809e8f59f31d15462e7a38a7266b63fc
2012-08-20 16:26:51 -05:00
Max Schenkelberg
56496dc03e
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: 79d98841a0fc06265360b69d2cad1c1b406ecfcab69d2cad1c1b406ecfcaaa9df46a1d47cefd1513
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
89255891cc
Issue #666 fix collaboration message compose problems with ncp keybindings
...
Former-commit-id: 977d5587cb25b00010e13f0b2e474c8e971abbd83f0b2e474c8e971abbd82c5cfe6d98f6e7d795f9
2012-08-17 16:16:20 -05:00
Ron Anderson
21b48541c3
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: 0a6de388dd16231374f8d7a818fd1d7662d249abd7a818fd1d7662d249abd3693827a16e3674f9fc
2012-08-17 12:41:49 -05:00
Ron Anderson
0a32c7c683
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: c71ee18e6e93c632c1ff1321db6a99819b9c8e561321db6a99819b9c8e566eafdda705e5952c1c99
2012-08-17 12:20:08 -05:00
Bryan Kowal
3e500e71a6
Remove the usage of the old method to build the edex ost rpm.
...
Former-commit-id: 31ec3cbee0d5c16eb8ce44328f170201e7976a5244328f170201e7976a5269a16eb369f81ba4737c
2012-08-16 14:27:11 -05:00
Steve Harris
4d2094072e
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
...
Former-commit-id: 1bcd43a447735ed2ecd9fa77df807d596d19466bfa77df807d596d19466b20fda57d37b0b8a13e60
2012-08-16 10:27:51 -05:00
root
c7a8b1e7fd
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: e2b7a1679bac8888ae10342bda7e5f6eec24180e342bda7e5f6eec24180eb3217ad886f0cb647101
2012-08-15 22:29:38 +00:00
root
c8d09a5973
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: b6e17e9b02d170ae704bb93989daafba40e18fb2b93989daafba40e18fb23e9d1fa430fd69b031d2
2012-08-15 22:29:07 +00:00
root
791f3f5b85
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: bb7b5341dd0987fc6b3dcb46f578795a453ee984cb46f578795a453ee9848a66b2f209537dbadf64
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
a50be67e0e
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: e65418717fe8524301b56d9d0a406f4203807a776d9d0a406f4203807a778a170234b8d7597d8cf7
2012-08-15 16:36:05 -05:00
Benjamin Phillippe
ebdadf4b89
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: ec41ec59eedd8ed9eca072c63e1a6f7bad34f90672c63e1a6f7bad34f90691493ee0b911bf8bb4c7
2012-08-15 16:22:39 -05:00
Nate Jensen
0321bf5fe3
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: a94964d940b94597d03c9c1597b5546897b1d4809c1597b5546897b1d480b7bc962da43b31bc0500
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
2c1640fde4
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: 8dffbba06e9c41e73ee5cb99170685b194a17abccb99170685b194a17abc74acf329c498728915f8
2012-08-15 15:25:46 -05:00
Steve Harris
80655bf0a3
12.9.1-4 baseline
...
Former-commit-id: 71b024e3a136c108e960dcda3a229033b95fb96ddcda3a229033b95fb96d9990bf909bd7d60cc623
2012-08-15 15:19:10 -05:00
