Nate Jensen
89447077ee
Merge "Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed." into development
...
Former-commit-id: 3c240d326989fb0a5bee3c240d326989fb0a5beebb68c93607bb68c936074f457a34b950c95b06f95b6f330da6
2012-09-12 09:18:24 -05:00
Roger Ferrel
4c60f31617
Issue #875 Now does faster refresh and properly handle nofification of other CAVEs of changes.
...
Amend: Changes from code review
Change-Id: I556174de78c98730cabcd194b657db55328cf551
Former-commit-id: 5b320fe49d6df929a87d5b320fe49d6df929a87dbe8e334da3be8e334da3e8675be2318b4e7346a6c276743760
2012-09-12 09:00:33 -05:00
Steve Harris
3bec22460f
Merge branch 'ss_builds' (12.10.1-3) into development
...
Conflicts:
cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
cave/com.raytheon.uf.viz.kml.export.feature/build.properties
cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment
Former-commit-id: f94db138cd64d4e2bdedf94db138cd64d4e2bded012c526816012c526816b14d30591b41c82361f7bba73380ca
2012-09-11 16:57:03 -05:00
Max Schenkelberg
fbc35a39d4
Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
...
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d
Former-commit-id: a6cc869ada7294025e26a6cc869ada7294025e262f8f1ce9b22f8f1ce9b252e812ec0ec26d21d9081badd11cdb
2012-09-11 16:27:41 -05:00
Steve Harris
5030894212
12.10.1-3 baseline
...
Former-commit-id: de1639aea221f430062bde1639aea221f430062b969e7e6dfd969e7e6dfdf376a4b4db438d139fddfaadb51529
2012-09-11 16:00:38 -05:00
Steve Harris
5684a84a46
12.10.1-2 baseline
...
Former-commit-id: dde1f4c54d250f0ccac9dde1f4c54d250f0ccac9a66f3f4b60a66f3f4b60ec74f638e534d2ddee9dcc3c3dadee
2012-09-11 15:50:57 -05:00
Nate Jensen
346b652757
Issue #1096 fixed sampling order
...
Change-Id: Ib5fa01c281a50f792abc6a813167455c51076bed
Former-commit-id: cb9dd60490c6b07f3672cb9dd60490c6b07f3672d58af3e377d58af3e377a89972765254cf5ebca4d0ba18435c
2012-09-11 13:11:23 -05:00
Lee Venable
4d0edf403e
Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
...
Former-commit-id: 1f86d2c4ba056e74d3cf1f86d2c4ba056e74d3cf83fc018f3883fc018f38782593a1181d0bdbd25c83c441319e
2012-09-11 09:15:47 -05:00
Nate Jensen
8c89211dd7
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: 4d91b0a15ae61076b3164d91b0a15ae61076b3167c1bc79df77c1bc79df78d36456626cc8fae1099ab3f9e7847
2012-09-11 09:06:26 -05:00
Dave Hladky
2114682424
Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
...
Change-Id: I23212f3281290d86621e72c88478b00d37336494
Former-commit-id: 33f222783d28912552fe33f222783d28912552fe6818408d406818408d4002b00ddf47655939bba78f3447ff9b
2012-09-11 08:56:51 -05:00
Mike Duff
195e71243f
Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
...
Former-commit-id: 269d2831d9bcafd807c5269d2831d9bcafd807c578258639407825863940e443d5b5dadb6ac1594e45e84531a6
2012-09-11 08:50:55 -05:00
Jonathan Sanchez
5a0abaaa9e
Issue #1006 fix supdirs
...
Former-commit-id: d2f448754309bdc765e5d2f448754309bdc765e544d21bfe3644d21bfe36f66eebab84b048808367ec0294864a
2012-09-10 17:39:36 -05:00
Lee Venable
8272ed7387
Merge "Issue #1159 No longer wrap text pasted to empty text field." into development
...
Former-commit-id: 8f95f21e6ab22bd12fad8f95f21e6ab22bd12fad903c220ecb903c220ecb9d55815fcff1a836d0bbef57279c96
2012-09-10 15:13:47 -05:00
Roger Ferrel
c77a82828b
Issue #1159 No longer wrap text pasted to empty text field.
...
Change-Id: I03cc61a4d6d158344c0dbdbbed8be7edeb9cc42d
Former-commit-id: fd1be035c3ef9634dd96fd1be035c3ef9634dd96e55c9ca0bde55c9ca0bd37cffe02b0aa036adf6dd9e4fdb6a3
2012-09-10 13:25:29 -05:00
Max Schenkelberg
29ab00a4cb
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: 6d78afd42380439b309b6d78afd42380439b309b84658dd03a84658dd03ad2d74fac2020f5d966db264bc403d6
2012-09-10 10:45:37 -05:00
Brad Gonzales
e75a25b118
Issue #1156 sort by ts_rank in the TimeSeriesDataManager ingestfilter query.
...
Former-commit-id: 85961a3d6df2b97d317085961a3d6df2b97d31701b028a6d541b028a6d54edaaac843db7c9603d02283f084c28
2012-09-10 09:24:28 -05:00
Roger Ferrel
be580ea44c
Issue #1145 Modifications to AlarmDisplayWindow and CurrentAlarmQueue to handle accumualte like AWIPS 1.
...
Change-Id: Ib5a17f309a2c0ee832028ae1cc8677641e9a0377
Former-commit-id: 3de56714fbce5430a6253de56714fbce5430a625caff5053cbcaff5053cb8926d7a65bb287d102a7dfc3f135ef
2012-09-10 08:28:58 -05:00
Ron Anderson
8f85204091
Issue #1144 Fixed sizing of Local Effects Area dropdown.
...
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5
Former-commit-id: 8ca431ab8bee7985bd578ca431ab8bee7985bd5716260530e916260530e9e0e3e4a044309196b6e186455f1e6a
2012-09-06 17:44:00 -05:00
Bryan Kowal
675fdff183
Issue #1141 - Merging KML into the Common Baseline
...
Former-commit-id: 8d444b35d33180ae0c578d444b35d33180ae0c577b456330977b4563309723c607980ab63d426e0f60c3fb248f
2012-09-05 18:39:08 -05:00
Max Schenkelberg
9980bf4f49
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: a14d5d4c86c183a0e614a14d5d4c86c183a0e61428d630844428d630844445d6b7bcb587bcbdb4cc4f86d1c819
2012-09-05 11:51:38 -05:00
Ben Steffensmeier
44d8021a72
Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
...
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8
Former-commit-id: dc6f5805ef4272f4c885dc6f5805ef4272f4c885c618ee9057c618ee905766e9b24e51e0a4fe2c4364ef6f58f1
2012-09-04 13:41:10 -05:00
Steve Harris
f8e7459dfb
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: 0e046d847abba4eb12d00e046d847abba4eb12d0af106f1d29af106f1d29f224e3e8ad53e29f59e4e9582cb789
2012-09-04 12:11:03 -05:00
Steve Harris
a924a8347a
12.10.1-1 baseline
...
Former-commit-id: 0abf64b77c195158c0040abf64b77c195158c004d708932029d708932029e720b8ed317bd9c63dc7d65f35ffe9
2012-09-04 12:07:27 -05:00
Steve Harris
c1e601dc30
12.9.1-12 baseline
...
Former-commit-id: 4bf4f0043a948766c3874bf4f0043a948766c387150bc967a5150bc967a5782941ccc19311c1737e38aa573545
2012-09-04 11:47:38 -05:00
Steve Harris
7c1cebf5b1
Merge branch 'development' into Enhanced_points
...
Former-commit-id: fa7c31206b5feac55dbdfa7c31206b5feac55dbd32cf7fd76432cf7fd7645a8e58eda5592ab923bb66ac1051bc
2012-08-30 15:43:06 -05:00
Steve Harris
b63855f152
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: f52c8b374d3a9d4961e2f52c8b374d3a9d4961e234cbde412434cbde4124ffe253196a3230e0b2465b4ee818b7
2012-08-30 14:40:34 -05:00
Steve Harris
982804ee0e
12.9.1-11 baseline
...
Former-commit-id: d07c18918d6eb6b0909bd07c18918d6eb6b0909bfc405efab7fc405efab7dc5ec3d16da14374fcd4f401755cde
2012-08-30 14:36:12 -05:00
Steve Harris
ede38c4b3f
12.9.1-10 baseline
...
Former-commit-id: bdb45cdfae3adc50a783bdb45cdfae3adc50a783cb9b80f3a0cb9b80f3a0f43a5af47fdc08c5a71a5bb474d33c
2012-08-30 14:28:27 -05:00
Max Schenkelberg
f61b465148
Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
...
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4
Former-commit-id: 81531873e000de2922e181531873e000de2922e10de737ad640de737ad64ef8ed151a9b75fad8e3048a74eba41
2012-08-29 18:17:30 -05:00
Nate Jensen
8f479985f3
Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
...
Former-commit-id: 4c7390362996393309eb4c7390362996393309ebb47baedad4b47baedad445134743b6e6661037f51c53c83f62
2012-08-29 16:09:50 -05:00
Max Schenkelberg
85319c6284
Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
...
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9
Former-commit-id: 04c3a1c678f8aef2b06704c3a1c678f8aef2b06781f78fa81981f78fa819e593c9d56e99c8b1a968d44378e259
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
9c74b28080
Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
...
Former-commit-id: e3bb8c80c91f587e39f4e3bb8c80c91f587e39f437d2411b2637d2411b2668235d074436dd387007b17f2973ca
2012-08-29 14:24:21 -05:00
Matt Nash
1b9d645810
Issue #1101 fix gfe keybindings for frame change in collaboration
...
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a
Former-commit-id: ba698ae69a018f590c70ba698ae69a018f590c70ada6ecf5f3ada6ecf5f3cac1c2bb2e1242054a505c568beda7
2012-08-27 12:16:38 -05:00
Steve Harris
f77517a280
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 2e6842016b3ee334378c2e6842016b3ee334378c076dccf42d076dccf42d65b91e1506a93487ab96ccac12a757
2012-08-27 11:32:45 -05:00
Steve Harris
3f44e46a6f
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: 51eb89eb2a91e39617cb51eb89eb2a91e39617cba71dac6cada71dac6caddbcb28ce7787a602dfee0b647c0c9d
2012-08-27 09:53:55 -05:00
Nate Jensen
73ebf63e4e
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: eac562204d94b7f40d1deac562204d94b7f40d1d168bee4bd7168bee4bd7977664c699a2f594e35422b6406fe4
2012-08-27 09:21:50 -05:00
Nate Jensen
89ee6e08d2
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 7b62f6ac7573f428e4d57b62f6ac7573f428e4d5047441f91c047441f91c0cc8e95b0c347c13143b226092da3f
2012-08-23 18:18:23 -05:00
Max Schenkelberg
713f9be08b
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: 1f84ddbddf75b2cdff471f84ddbddf75b2cdff47c4812b7745c4812b77456f96fa50457f506ce81d8e894dba11
2012-08-23 17:37:12 -05:00
Roger Ferrel
effd0d9384
Issue #875 Refactor location of PointsToolLayer and supporting classes.
...
Issue #875 Code review comment fixes.
Change-Id: I1a120093602c0bd77b016fa72731e6ec7528a153
Former-commit-id: b3ea5e391607a1da2568b3ea5e391607a1da2568df0a9b39cbdf0a9b39cbd03f7ec846ad4a690592fde1f13434
2012-08-23 13:17:54 -05:00
David Gillingham
d1801d7942
Issue #1087 : Enable DRT for CAVE operational mode.
...
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9
Former-commit-id: f3a33e3df4f7182ae9c7f3a33e3df4f7182ae9c7ec2d211800ec2d2118003b41cd02f4cbd3bfacfa1856f2b941
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
e1a3c762b7
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: 20c65a46771b45f1b6d920c65a46771b45f1b6d9f646b185daf646b185dada1f3fe29ba09fa0b649acf62bb8d9
2012-08-23 09:27:46 -05:00
Ben Steffensmeier
d608483d9f
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: 596b48c490e1c07b5803596b48c490e1c07b5803a988fdf5dea988fdf5deda05d2dd244f168030306ab6152235
2012-08-22 13:02:56 -05:00
Steve Harris
c9652b48f1
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: 04c8c3ca558e3ecc1efd04c8c3ca558e3ecc1efdb8629a0f20b8629a0f20d974aaf2779565d18b96bbe382231f
2012-08-22 13:01:08 -05:00
Steve Harris
2d928d328e
12.9.1-5 baseline
...
Former-commit-id: a1d931fd4461f269f54ca1d931fd4461f269f54cf2fac39428f2fac394287fb0b17bd572824561cb9b5c2094ed
2012-08-21 15:27:03 -05:00
Roger Ferrel
fa712888d0
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: f7c56e0a73ca52d45911f7c56e0a73ca52d4591123a67f458a23a67f458ac0f3f26eac544ea1ff5385109fae11
2012-08-21 11:56:50 -05:00
Max Schenkelberg
fec3be6b57
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: e404398ea6f381871fc4e404398ea6f381871fc46e1059f8be6e1059f8be919000d0dded033f8657587ad5d2e4
2012-08-21 11:36:35 -05:00
Max Schenkelberg
dcbab7d58f
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: fc06265360b69d2cad1cfc06265360b69d2cad1c1b406ecfca1b406ecfca47cefd1513aa9df46a1d362d34bee0
2012-08-20 14:47:14 -05:00
Ron Anderson
f69d7b9c64
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: 16231374f8d7a818fd1d16231374f8d7a818fd1d7662d249ab7662d249ab6e3674f9fcd3693827a11b655b0826
2012-08-17 12:41:49 -05:00
Ron Anderson
b78c280ac8
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 93c632c1ff1321db6a9993c632c1ff1321db6a99819b9c8e56819b9c8e56e5952c1c996eafdda705f7b9190b51
2012-08-17 12:20:08 -05:00
Steve Harris
8413f8d96c
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
...
Former-commit-id: 735ed2ecd9fa77df807d735ed2ecd9fa77df807d596d19466b596d19466bb0b8a13e6020fda57d379e75c7e5f1
2012-08-16 10:27:51 -05:00
