Commit graph

553 commits

Author SHA1 Message Date
Nate Jensen
4d91b0a15a Merge "Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view." into development
Former-commit-id: 7c1bc79df7 [formerly 603632fbca6e67b9e1f3cd1f4a48026bca3f1f35]
Former-commit-id: e61076b316
2012-09-11 09:06:26 -05:00
Mike Duff
269d2831d9 Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
Former-commit-id: 7825863940 [formerly 5504abfd272649dad36357ae7fdce83c75b3e3fa]
Former-commit-id: bcafd807c5
2012-09-11 08:50:55 -05:00
Jonathan Sanchez
d2f4487543 Issue #1006 fix supdirs
Former-commit-id: 44d21bfe36 [formerly 09109d26f68e527f843013883dc7f3082f01dd7a]
Former-commit-id: 09bdc765e5
2012-09-10 17:39:36 -05:00
Lee Venable
8f95f21e6a Merge "Issue #1159 No longer wrap text pasted to empty text field." into development
Former-commit-id: 903c220ecb [formerly bacccfd683e71eab49c69d815aafbef2e395e863]
Former-commit-id: b22bd12fad
2012-09-10 15:13:47 -05:00
Roger Ferrel
fd1be035c3 Issue #1159 No longer wrap text pasted to empty text field.
Change-Id: I03cc61a4d6d158344c0dbdbbed8be7edeb9cc42d

Former-commit-id: e55c9ca0bd [formerly 0b418dc248fd3c2107f2d6c045c8da51f13f1faa]
Former-commit-id: ef9634dd96
2012-09-10 13:25:29 -05:00
Max Schenkelberg
6d78afd423 Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536

Former-commit-id: 84658dd03a [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]
Former-commit-id: 80439b309b
2012-09-10 10:45:37 -05:00
Brad Gonzales
85961a3d6d Issue #1156 sort by ts_rank in the TimeSeriesDataManager ingestfilter query.
Former-commit-id: 1b028a6d54 [formerly ecbe261f768452fc30a6641d25f5303565d18cbb]
Former-commit-id: f2b97d3170
2012-09-10 09:24:28 -05:00
Roger Ferrel
3de56714fb Issue #1145 Modifications to AlarmDisplayWindow and CurrentAlarmQueue to handle accumualte like AWIPS 1.
Change-Id: Ib5a17f309a2c0ee832028ae1cc8677641e9a0377

Former-commit-id: caff5053cb [formerly 8506d363eff80306d0413e942c52d90b977ea887]
Former-commit-id: ce5430a625
2012-09-10 08:28:58 -05:00
Ron Anderson
8ca431ab8b Issue #1144 Fixed sizing of Local Effects Area dropdown.
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5

Former-commit-id: 16260530e9 [formerly 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5]
Former-commit-id: ee7985bd57
2012-09-06 17:44:00 -05:00
Bryan Kowal
8d444b35d3 Issue #1141 - Merging KML into the Common Baseline
Former-commit-id: 7b45633097 [formerly c3f584fdc5f53ecd62afe41c481aaa96cf532009]
Former-commit-id: 3180ae0c57
2012-09-05 18:39:08 -05:00
Max Schenkelberg
a14d5d4c86 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: 28d6308444 [formerly a4dd750d4bbdaae4a548c9a296436cc783d2d71a]
Former-commit-id: c183a0e614
2012-09-05 11:51:38 -05:00
Ben Steffensmeier
dc6f5805ef Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8

Former-commit-id: c618ee9057 [formerly 5da7b54e1bff66ed46400bc624b9d881d0b967ce]
Former-commit-id: 4272f4c885
2012-09-04 13:41:10 -05:00
Steve Harris
0e046d847a Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]
Former-commit-id: bba4eb12d0
2012-09-04 12:11:03 -05:00
Steve Harris
0abf64b77c 12.10.1-1 baseline
Former-commit-id: d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: 195158c004
2012-09-04 12:07:27 -05:00
Steve Harris
4bf4f0043a 12.9.1-12 baseline
Former-commit-id: 150bc967a5 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]
Former-commit-id: 948766c387
2012-09-04 11:47:38 -05:00
Steve Harris
f52c8b374d Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 34cbde4124 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]
Former-commit-id: 3a9d4961e2
2012-08-30 14:40:34 -05:00
Steve Harris
d07c18918d 12.9.1-11 baseline
Former-commit-id: fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]
Former-commit-id: 6eb6b0909b
2012-08-30 14:36:12 -05:00
Steve Harris
bdb45cdfae 12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]
Former-commit-id: 3adc50a783
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: 0de737ad64 [formerly b9568b79f531250c859b77296115da32b628318d]
Former-commit-id: 00de2922e1
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: b47baedad4 [formerly c06f87cd60290f34b0c9b1ac955f0b72f9de5c5b]
Former-commit-id: 96393309eb
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: 81f78fa819 [formerly 3ff192dfb09a0e4512287d45df864375e3900ca1]
Former-commit-id: f8aef2b067
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: 37d2411b26 [formerly e3c5526f9b12ae38c12094e7ebf9f9d6823f3257]
Former-commit-id: 1f587e39f4
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: ada6ecf5f3 [formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]
Former-commit-id: 018f590c70
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: 076dccf42d [formerly 534486bf918d5384d062d7501f0f1c4a0b4f0172]
Former-commit-id: 3ee334378c
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: a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]
Former-commit-id: 91e39617cb
2012-08-27 09:53:55 -05:00
Nate Jensen
eac562204d Merge "Issue #1096 fix memory leaks in CcfpResource" into development
Former-commit-id: 168bee4bd7 [formerly 0f98c3bfbf041cd46311517f2819ca2d81b1cd34]
Former-commit-id: 94b7f40d1d
2012-08-27 09:21:50 -05:00
Nate Jensen
7b62f6ac75 Issue #1096 fix memory leaks in CcfpResource
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc

Former-commit-id: 047441f91c [formerly 5e9d7763442ab91cb8d33c16139eb5bca9b033ea]
Former-commit-id: 73f428e4d5
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: c4812b7745 [formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]
Former-commit-id: 75b2cdff47
2012-08-23 17:37:12 -05:00
David Gillingham
f3a33e3df4 Issue #1087: Enable DRT for CAVE operational mode.
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9

Former-commit-id: ec2d211800 [formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]
Former-commit-id: f7182ae9c7
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: f646b185da [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]
Former-commit-id: 1b45f1b6d9
2012-08-23 09:27:46 -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: a988fdf5de [formerly 61aab7b55f9868e69b43c5250515ce0d5b01d6e5]
Former-commit-id: e1c07b5803
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: b8629a0f20 [formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]
Former-commit-id: 8e3ecc1efd
2012-08-22 13:01:08 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -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: 6e1059f8be [formerly a34c116fbbad86f758882461dd96da9c6ab14cdd]
Former-commit-id: f381871fc4
2012-08-21 11:36:35 -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: 1b406ecfca [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]
Former-commit-id: b69d2cad1c
2012-08-20 14:47:14 -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: 7662d249ab [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]
Former-commit-id: d7a818fd1d
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: 819b9c8e56 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]
Former-commit-id: 1321db6a99
2012-08-17 12:20:08 -05:00
Steve Harris
735ed2ecd9 Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
Former-commit-id: 596d19466b [formerly 55326667ca13a37c7802849484949382e65a6329]
Former-commit-id: fa77df807d
2012-08-16 10:27:51 -05: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: ba40e18fb2 [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]
Former-commit-id: b93989daaf
2012-08-15 22:29:07 +00:00
root
0987fc6b3d Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]
Former-commit-id: cb46f57879
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
e8524301b5 Issue #1065 fix contexts to deactivate when unrecognized views activate.
Former-commit-id: 4203807a77 [formerly 5046660b52594a165d4a8749ac12c236d5ec027d]
Former-commit-id: 6d9d0a406f
2012-08-15 16:36:05 -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: 6897b1d480 [formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]
Former-commit-id: 9c1597b554
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: b194a17abc [formerly 97d786afadf136f75ffd6a440d35b628e144b888]
Former-commit-id: cb99170685
2012-08-15 15:25:46 -05:00
Steve Harris
36c108e960 12.9.1-4 baseline
Former-commit-id: 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]
Former-commit-id: dcda3a2290
2012-08-15 15:19:10 -05:00
Steve Harris
c11f7d396e 12.9.1-3 baseline
Former-commit-id: 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]
Former-commit-id: 36d80b1f60
2012-08-15 14:26:10 -05:00
Steve Harris
27871051e3 12.9.1-2 baseline
Former-commit-id: a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]
Former-commit-id: d1d877d319
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
f37a75f265 Issue #915 Set the user data.
Former-commit-id: 03ed8ee0b0 [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]
Former-commit-id: 865136f6ef
2012-08-15 14:05:50 -05:00
Steve Harris
8309193ce9 12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]
Former-commit-id: 31ae7ea218
2012-08-15 13:59:00 -05:00
Nate Jensen
d70d78d664 Merge "Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container" into development
Former-commit-id: 91e0ba8c23 [formerly d252760b0e39002e53a5fce809b38521ca2351aa]
Former-commit-id: 2cb82b7170
2012-08-14 16:52:40 -05:00
Steve Harris
27fa10e133 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: e530637aa3 [formerly 43d4642bc39a053d40fce9b6aff1d11f3d313dd7]
Former-commit-id: e3927a11c7
2012-08-14 16:26:00 -05:00