Steve Harris
3230e0b246
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 3a9d4961e234cbde4124
2012-08-30 14:40:34 -05:00
Steve Harris
a14374fcd4
12.9.1-11 baseline
...
Former-commit-id: 6eb6b0909bfc405efab7
2012-08-30 14:36:12 -05:00
Steve Harris
dc08c5a71a
12.9.1-10 baseline
...
Former-commit-id: 3adc50a783cb9b80f3a0
2012-08-30 14:28:27 -05:00
Max Schenkelberg
b75fad8e30
Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
...
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4
Former-commit-id: 00de2922e10de737ad64
2012-08-29 18:17:30 -05:00
Nate Jensen
e6661037f5
Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
...
Former-commit-id: 96393309ebb47baedad4
2012-08-29 16:09:50 -05:00
Max Schenkelberg
99c8b1a968
Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
...
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9
Former-commit-id: f8aef2b06781f78fa819
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
36dd387007
Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
...
Former-commit-id: 1f587e39f437d2411b26
2012-08-29 14:24:21 -05:00
Matt Nash
1242054a50
Issue #1101 fix gfe keybindings for frame change in collaboration
...
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a
Former-commit-id: 018f590c70ada6ecf5f3
2012-08-27 12:16:38 -05:00
Steve Harris
a93487ab96
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 3ee334378c076dccf42d
2012-08-27 11:32:45 -05:00
Steve Harris
87a602dfee
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: 91e39617cba71dac6cad
2012-08-27 09:53:55 -05:00
Nate Jensen
a2f594e354
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: 94b7f40d1d168bee4bd7
2012-08-27 09:21:50 -05:00
Nate Jensen
347c13143b
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 73f428e4d5047441f91c
2012-08-23 18:18:23 -05:00
Max Schenkelberg
7f506ce81d
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: 75b2cdff47c4812b7745
2012-08-23 17:37:12 -05:00
David Gillingham
cbd3bfacfa
Issue #1087 : Enable DRT for CAVE operational mode.
...
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9
Former-commit-id: f7182ae9c7ec2d211800
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
a09fa0b649
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: 1b45f1b6d9f646b185da
2012-08-23 09:27:46 -05:00
Nate Jensen
fbcb1eab54
Merge "Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards." into development
...
Former-commit-id: 20c69ffef321df8f9986
2012-08-23 08:47:40 -05:00
Richard Peter
252e8e7e2e
Merge "Issue #798 - Correct for hdfFileId" into development
...
Former-commit-id: 6c1690e0634c56f4e20d
2012-08-22 17:07:17 -05:00
Ron Anderson
19f956b93f
Issue #436 Added update script to relocate and update MakeHazardConfig for local effect based hazzards.
...
Change-Id: Ie311cf19850cf4205f30282741a96c0cdc9f3c9c
Former-commit-id: 5abacc273d576ccd6a38
2012-08-22 16:41:19 -05:00
Steve Harris
de16453f4f
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: 13f70884f39425f73c71
2012-08-22 16:06:02 -05:00
Steve Harris
b2c0dd1abb
12.9.1-5 baseline (with forgotten bin files now included)
...
Former-commit-id: b8ab6066f6b77a4d40d7
2012-08-22 16:00:33 -05:00
James Korman
654ecefd3e
Issue #798 - Correct for hdfFileId
...
Former-commit-id: 56d6b1e886c2c228b429
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
c7bc786a60
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: a501aacb3ba5c57e8d24
2012-08-22 13:03:24 -05:00
Ben Steffensmeier
4f16803030
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: e1c07b5803a988fdf5de
2012-08-22 13:02:56 -05:00
Steve Harris
9565d18b96
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: 8e3ecc1efdb8629a0f20
2012-08-22 13:01:08 -05:00
Steve Harris
77369f78a6
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: d38f8b80f044a7cb75e7
2012-08-21 16:17:58 -05:00
Steve Harris
72824561cb
12.9.1-5 baseline
...
Former-commit-id: 61f269f54cf2fac39428
2012-08-21 15:27:03 -05:00
Max Schenkelberg
ed033f8657
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: f381871fc46e1059f8be
2012-08-21 11:36:35 -05:00
Nate Jensen
521fc26db3
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: 87c70d25e81efe57fd02
2012-08-21 11:02:22 -05:00
Steve Harris
fc77903de7
Merge "Issue #989 - Adding markings to jasper" into development
...
Former-commit-id: 0693643152c2b21a4251
2012-08-20 16:29:50 -05:00
Steve Harris
15462e7a38
Issue #989 - Adding markings to jasper
...
Former-commit-id: ccc150c9809e8f59f31d
2012-08-20 16:26:51 -05:00
Max Schenkelberg
aa9df46a1d
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: b69d2cad1c1b406ecfca
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
2c5cfe6d98
Issue #666 fix collaboration message compose problems with ncp keybindings
...
Former-commit-id: 3f0b2e474c8e971abbd8
2012-08-17 16:16:20 -05:00
Ron Anderson
d3693827a1
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: d7a818fd1d7662d249ab
2012-08-17 12:41:49 -05:00
Ron Anderson
6eafdda705
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 1321db6a99819b9c8e56
2012-08-17 12:20:08 -05:00
Bryan Kowal
69a16eb369
Remove the usage of the old method to build the edex ost rpm.
...
Former-commit-id: 44328f170201e7976a52
2012-08-16 14:27:11 -05:00
Steve Harris
20fda57d37
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
...
Former-commit-id: fa77df807d596d19466b
2012-08-16 10:27:51 -05:00
root
b3217ad886
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: 342bda7e5f6eec24180e
2012-08-15 22:29:38 +00:00
root
3e9d1fa430
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: b93989daafba40e18fb2
2012-08-15 22:29:07 +00:00
root
8a66b2f209
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: cb46f578795a453ee984
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
8a170234b8
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: 6d9d0a406f4203807a77
2012-08-15 16:36:05 -05:00
Benjamin Phillippe
91493ee0b9
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: 72c63e1a6f7bad34f906
2012-08-15 16:22:39 -05:00
Nate Jensen
b7bc962da4
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: 9c1597b5546897b1d480
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
74acf329c4
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: cb99170685b194a17abc
2012-08-15 15:25:46 -05:00
Steve Harris
9990bf909b
12.9.1-4 baseline
...
Former-commit-id: dcda3a229033b95fb96d
2012-08-15 15:19:10 -05:00
Steve Harris
edbbacfa8a
12.9.1-3 baseline
...
Former-commit-id: 36d80b1f6084bbf2573e
2012-08-15 14:26:10 -05:00
Steve Harris
448ed038c2
12.9.1-2 baseline
...
Former-commit-id: d1d877d319a198b3a807
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
e584d728f0
Issue #915 Set the user data.
...
Former-commit-id: 865136f6ef03ed8ee0b0
2012-08-15 14:05:50 -05:00
Steve Harris
0c5d9e2416
12.9.1-1 baseline
...
Former-commit-id: 31ae7ea21879ce6cfd97
2012-08-15 13:59:00 -05:00
Nate Jensen
5b26d1e93e
Merge "Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container" into development
...
Former-commit-id: 2cb82b717091e0ba8c23
2012-08-14 16:52:40 -05:00
Ron Anderson
7cde30681b
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 17f636c2a281abb2c60b
2012-08-14 16:27:11 -05:00
