Commit graph

807 commits

Author SHA1 Message Date
Lee Venable
903c220ecb Merge "Issue #1159 No longer wrap text pasted to empty text field." into development
Former-commit-id: bacccfd683e71eab49c69d815aafbef2e395e863
2012-09-10 15:13:47 -05:00
Roger Ferrel
e55c9ca0bd Issue #1159 No longer wrap text pasted to empty text field.
Change-Id: I03cc61a4d6d158344c0dbdbbed8be7edeb9cc42d

Former-commit-id: 0b418dc248fd3c2107f2d6c045c8da51f13f1faa
2012-09-10 13:25:29 -05:00
Brad Gonzales
1b028a6d54 Issue #1156 sort by ts_rank in the TimeSeriesDataManager ingestfilter query.
Former-commit-id: ecbe261f768452fc30a6641d25f5303565d18cbb
2012-09-10 09:24:28 -05:00
Roger Ferrel
caff5053cb Issue #1145 Modifications to AlarmDisplayWindow and CurrentAlarmQueue to handle accumualte like AWIPS 1.
Change-Id: Ib5a17f309a2c0ee832028ae1cc8677641e9a0377

Former-commit-id: 8506d363eff80306d0413e942c52d90b977ea887
2012-09-10 08:28:58 -05:00
David Gillingham
83681d1ff6 Issue #1150: Fix regression caused by previous text product generation changes by ensuring all
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: 74e7d98c5bde7cefaedf354ecfbac147b2ff801a
2012-09-07 12:29:36 -05:00
Lee Venable
7e32db36fb Merge "Issue #1144 Fixed sizing of Local Effects Area dropdown." into development
Former-commit-id: 822993b3728f939e7e57ca9cd1c6fa7b0737ea25
2012-09-07 07:35:15 -05:00
Ron Anderson
16260530e9 Issue #1144 Fixed sizing of Local Effects Area dropdown.
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5

Former-commit-id: 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5
2012-09-06 17:44:00 -05:00
Greg Armendariz
58b74d05e5 Merge "Issue #1090 - pattern corrections" into development
Former-commit-id: 9dc5230757d9a09f718fdf1f802e698ac6dd21d2
2012-09-06 13:50:36 -05:00
Steve Harris
259bb4dfed Issue #1141 - Adding JavaAPIforKml license file
Former-commit-id: d84394c2f8f62406fee0e039ba0aa283bbbd857e
2012-09-06 11:09:24 -05:00
James Korman
eb17151f74 Issue #1090 - pattern corrections
Former-commit-id: 7849341873013b71b6fe5f01ae3fe274bfc7e8a7
2012-09-06 09:20:03 -05:00
Bryan Kowal
7b45633097 Issue #1141 - Merging KML into the Common Baseline
Former-commit-id: c3f584fdc5f53ecd62afe41c481aaa96cf532009
2012-09-05 18:39:08 -05:00
Bryan Kowal
3e1556a981 Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 9a0cd58382909965a6c44cf05fec28eb69835a26
2012-09-05 14:44:36 -05:00
Max Schenkelberg
28d6308444 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: a4dd750d4bbdaae4a548c9a296436cc783d2d71a
2012-09-05 11:51:38 -05:00
Ben Steffensmeier
c618ee9057 Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8

Former-commit-id: 5da7b54e1bff66ed46400bc624b9d881d0b967ce
2012-09-04 13:41:10 -05:00
Steve Harris
af106f1d29 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 3eacf0da611b09faa416580b8d2db5bdc9af2d11
2012-09-04 12:11:03 -05:00
Steve Harris
d708932029 12.10.1-1 baseline
Former-commit-id: 7d17407c5b0a4a3f9b4b083891a5a5975c645810
2012-09-04 12:07:27 -05:00
Steve Harris
150bc967a5 12.9.1-12 baseline
Former-commit-id: 09035ea929c2e926b2dce13429c29d3fd3707880
2012-09-04 11:47:38 -05:00
Steve Harris
34cbde4124 Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 73ab8bdcc39291fbe36b5bcffe53d9106cc00238
2012-08-30 14:40:34 -05:00
Steve Harris
fc405efab7 12.9.1-11 baseline
Former-commit-id: 046d9078b7aa87ff8df98142556713fe38d95c63
2012-08-30 14:36:12 -05:00
Steve Harris
cb9b80f3a0 12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
2012-08-30 14:28:27 -05:00
Max Schenkelberg
0de737ad64 Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4

Former-commit-id: b9568b79f531250c859b77296115da32b628318d
2012-08-29 18:17:30 -05:00
Nate Jensen
b47baedad4 Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
Former-commit-id: c06f87cd60290f34b0c9b1ac955f0b72f9de5c5b
2012-08-29 16:09:50 -05:00
Max Schenkelberg
81f78fa819 Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9

Former-commit-id: 3ff192dfb09a0e4512287d45df864375e3900ca1
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
37d2411b26 Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
Former-commit-id: e3c5526f9b12ae38c12094e7ebf9f9d6823f3257
2012-08-29 14:24:21 -05:00
Matt Nash
ada6ecf5f3 Issue #1101 fix gfe keybindings for frame change in collaboration
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

Former-commit-id: 2c766c16bf8fdbc801097acfe8f8fdfd00e53367
2012-08-27 12:16:38 -05:00
Steve Harris
076dccf42d Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 534486bf918d5384d062d7501f0f1c4a0b4f0172
2012-08-27 11:32:45 -05:00
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
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
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