Steve Harris
bb6fe85a47
Merge branch 'development' into Enhanced_points
...
Former-commit-id: ada10668311dd1305a5d1dd1305a5d892598dc66
2012-09-12 14:14:56 -05:00
Nate Jensen
761795bbae
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: bb68c9360789fb0a5bee89fb0a5bee3c240d3269
2012-09-12 09:18:24 -05:00
Steve Harris
2f57e328fe
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: 012c52681664d4e2bded64d4e2bdedf94db138cd
2012-09-11 16:57:03 -05:00
Max Schenkelberg
5e94274b98
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: 2f8f1ce9b27294025e267294025e26a6cc869ada
2012-09-11 16:27:41 -05:00
Steve Harris
0403e7d0a9
12.10.1-3 baseline
...
Former-commit-id: 969e7e6dfd21f430062b21f430062bde1639aea2
2012-09-11 16:00:38 -05:00
Steve Harris
bb190a66a1
12.10.1-2 baseline
...
Former-commit-id: a66f3f4b60250f0ccac9250f0ccac9dde1f4c54d
2012-09-11 15:50:57 -05:00
Nate Jensen
a6252ceab2
Issue #1096 fixed sampling order
...
Change-Id: Ib5fa01c281a50f792abc6a813167455c51076bed
Former-commit-id: d58af3e377c6b07f3672c6b07f3672cb9dd60490
2012-09-11 13:11:23 -05:00
Lee Venable
c1d6d8e77a
Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
...
Former-commit-id: 83fc018f38056e74d3cf056e74d3cf1f86d2c4ba
2012-09-11 09:15:47 -05:00
Nate Jensen
bdbaa71575
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: 7c1bc79df7e61076b316e61076b3164d91b0a15a
2012-09-11 09:06:26 -05:00
Dave Hladky
7ea2655805
Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
...
Change-Id: I23212f3281290d86621e72c88478b00d37336494
Former-commit-id: 6818408d4028912552fe28912552fe33f222783d
2012-09-11 08:56:51 -05:00
Mike Duff
4180c20fbe
Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
...
Former-commit-id: 7825863940bcafd807c5bcafd807c5269d2831d9
2012-09-11 08:50:55 -05:00
Jonathan Sanchez
6e1be0b967
Issue #1006 fix supdirs
...
Former-commit-id: 44d21bfe3609bdc765e509bdc765e5d2f4487543
2012-09-10 17:39:36 -05:00
Lee Venable
97a9c87490
Merge "Issue #1159 No longer wrap text pasted to empty text field." into development
...
Former-commit-id: 903c220ecbb22bd12fadb22bd12fad8f95f21e6a
2012-09-10 15:13:47 -05:00
Roger Ferrel
915ded00c4
Issue #1159 No longer wrap text pasted to empty text field.
...
Change-Id: I03cc61a4d6d158344c0dbdbbed8be7edeb9cc42d
Former-commit-id: e55c9ca0bdef9634dd96ef9634dd96fd1be035c3
2012-09-10 13:25:29 -05:00
Max Schenkelberg
f7abe9ee39
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: 84658dd03a80439b309b80439b309b6d78afd423
2012-09-10 10:45:37 -05:00
Brad Gonzales
87def306af
Issue #1156 sort by ts_rank in the TimeSeriesDataManager ingestfilter query.
...
Former-commit-id: 1b028a6d54f2b97d3170f2b97d317085961a3d6d
2012-09-10 09:24:28 -05:00
Roger Ferrel
2a34cf0ac2
Issue #1145 Modifications to AlarmDisplayWindow and CurrentAlarmQueue to handle accumualte like AWIPS 1.
...
Change-Id: Ib5a17f309a2c0ee832028ae1cc8677641e9a0377
Former-commit-id: caff5053cbce5430a625ce5430a6253de56714fb
2012-09-10 08:28:58 -05:00
Ron Anderson
88ba04e791
Issue #1144 Fixed sizing of Local Effects Area dropdown.
...
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5
Former-commit-id: 16260530e9ee7985bd57ee7985bd578ca431ab8b
2012-09-06 17:44:00 -05:00
Bryan Kowal
2f7fae43cc
Issue #1141 - Merging KML into the Common Baseline
...
Former-commit-id: 7b456330973180ae0c573180ae0c578d444b35d3
2012-09-05 18:39:08 -05:00
Max Schenkelberg
e06d1dabef
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: 28d6308444c183a0e614c183a0e614a14d5d4c86
2012-09-05 11:51:38 -05:00
Ben Steffensmeier
513bd44ba0
Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
...
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8
Former-commit-id: c618ee90574272f4c8854272f4c885dc6f5805ef
2012-09-04 13:41:10 -05:00
Steve Harris
319927240c
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: af106f1d29bba4eb12d0bba4eb12d00e046d847a
2012-09-04 12:11:03 -05:00
Steve Harris
7248f8b762
12.10.1-1 baseline
...
Former-commit-id: d708932029195158c004195158c0040abf64b77c
2012-09-04 12:07:27 -05:00
Steve Harris
6784576fc9
12.9.1-12 baseline
...
Former-commit-id: 150bc967a5948766c387948766c3874bf4f0043a
2012-09-04 11:47:38 -05:00
Steve Harris
feccb1205d
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 32cf7fd7645feac55dbd5feac55dbdfa7c31206b
2012-08-30 15:43:06 -05:00
Steve Harris
9ff4f369a4
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 34cbde41243a9d4961e23a9d4961e2f52c8b374d
2012-08-30 14:40:34 -05:00
Steve Harris
a2bb1dabe0
12.9.1-11 baseline
...
Former-commit-id: fc405efab76eb6b0909b6eb6b0909bd07c18918d
2012-08-30 14:36:12 -05:00
Steve Harris
264d870cbf
12.9.1-10 baseline
...
Former-commit-id: cb9b80f3a03adc50a7833adc50a783bdb45cdfae
2012-08-30 14:28:27 -05:00
Max Schenkelberg
d0160a4aa9
Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
...
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4
Former-commit-id: 0de737ad6400de2922e100de2922e181531873e0
2012-08-29 18:17:30 -05:00
Nate Jensen
a6afe463af
Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
...
Former-commit-id: b47baedad496393309eb96393309eb4c73903629
2012-08-29 16:09:50 -05:00
Max Schenkelberg
e03e761b28
Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
...
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9
Former-commit-id: 81f78fa819f8aef2b067f8aef2b06704c3a1c678
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
669d1023a8
Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
...
Former-commit-id: 37d2411b261f587e39f41f587e39f4e3bb8c80c9
2012-08-29 14:24:21 -05:00
Matt Nash
04ce96d74e
Issue #1101 fix gfe keybindings for frame change in collaboration
...
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a
Former-commit-id: ada6ecf5f3018f590c70018f590c70ba698ae69a
2012-08-27 12:16:38 -05:00
Steve Harris
948b22090c
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 076dccf42d3ee334378c3ee334378c2e6842016b
2012-08-27 11:32:45 -05:00
Steve Harris
772c4359da
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: a71dac6cad91e39617cb91e39617cb51eb89eb2a
2012-08-27 09:53:55 -05:00
Nate Jensen
07ac473e55
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: 168bee4bd794b7f40d1d94b7f40d1deac562204d
2012-08-27 09:21:50 -05:00
Nate Jensen
7439c24618
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 047441f91c73f428e4d573f428e4d57b62f6ac75
2012-08-23 18:18:23 -05:00
Max Schenkelberg
97759c7ce1
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: c4812b774575b2cdff4775b2cdff471f84ddbddf
2012-08-23 17:37:12 -05:00
Roger Ferrel
10f75480b0
Issue #875 Refactor location of PointsToolLayer and supporting classes.
...
Issue #875 Code review comment fixes.
Change-Id: I1a120093602c0bd77b016fa72731e6ec7528a153
Former-commit-id: df0a9b39cb07a1da256807a1da2568b3ea5e3916
2012-08-23 13:17:54 -05:00
David Gillingham
a03dfbea98
Issue #1087 : Enable DRT for CAVE operational mode.
...
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9
Former-commit-id: ec2d211800f7182ae9c7f7182ae9c7f3a33e3df4
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
caaa78a981
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: f646b185da1b45f1b6d91b45f1b6d920c65a4677
2012-08-23 09:27:46 -05:00
Ben Steffensmeier
bc054637f1
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: a988fdf5dee1c07b5803e1c07b5803596b48c490
2012-08-22 13:02:56 -05:00
Steve Harris
deb39fdbea
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: b8629a0f208e3ecc1efd8e3ecc1efd04c8c3ca55
2012-08-22 13:01:08 -05:00
Steve Harris
77cbd6c1e5
12.9.1-5 baseline
...
Former-commit-id: f2fac3942861f269f54c61f269f54ca1d931fd44
2012-08-21 15:27:03 -05:00
Roger Ferrel
a4987d9d8e
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: 23a67f458aca52d45911ca52d45911f7c56e0a73
2012-08-21 11:56:50 -05:00
Max Schenkelberg
6e575aa450
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: 6e1059f8bef381871fc4f381871fc4e404398ea6
2012-08-21 11:36:35 -05:00
Max Schenkelberg
79d98841a0
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: 1b406ecfcab69d2cad1cb69d2cad1cfc06265360
2012-08-20 14:47:14 -05:00
Ron Anderson
0a6de388dd
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: 7662d249abd7a818fd1dd7a818fd1d16231374f8
2012-08-17 12:41:49 -05:00
Ron Anderson
c71ee18e6e
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 819b9c8e561321db6a991321db6a9993c632c1ff
2012-08-17 12:20:08 -05:00
Steve Harris
1bcd43a447
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
...
Former-commit-id: 596d19466bfa77df807dfa77df807d735ed2ecd9
2012-08-16 10:27:51 -05:00
