Steve Harris
feccb1205d
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 32cf7fd764
[formerly 5feac55dbd
[formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]
Former-commit-id: 5feac55dbd
Former-commit-id: fa7c31206b
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: 34cbde4124
[formerly 3a9d4961e2
[formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]
Former-commit-id: 3a9d4961e2
Former-commit-id: f52c8b374d
2012-08-30 14:40:34 -05:00
Steve Harris
a2bb1dabe0
12.9.1-11 baseline
...
Former-commit-id: fc405efab7
[formerly 6eb6b0909b
[formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]
Former-commit-id: 6eb6b0909b
Former-commit-id: d07c18918d
2012-08-30 14:36:12 -05:00
Steve Harris
264d870cbf
12.9.1-10 baseline
...
Former-commit-id: cb9b80f3a0
[formerly 3adc50a783
[formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: 3adc50a783
Former-commit-id: bdb45cdfae
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: 0de737ad64
[formerly 00de2922e1
[formerly b9568b79f531250c859b77296115da32b628318d]]
Former-commit-id: 00de2922e1
Former-commit-id: 81531873e0
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: b47baedad4
[formerly 96393309eb
[formerly c06f87cd60290f34b0c9b1ac955f0b72f9de5c5b]]
Former-commit-id: 96393309eb
Former-commit-id: 4c73903629
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: 81f78fa819
[formerly f8aef2b067
[formerly 3ff192dfb09a0e4512287d45df864375e3900ca1]]
Former-commit-id: f8aef2b067
Former-commit-id: 04c3a1c678
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: 37d2411b26
[formerly 1f587e39f4
[formerly e3c5526f9b12ae38c12094e7ebf9f9d6823f3257]]
Former-commit-id: 1f587e39f4
Former-commit-id: e3bb8c80c9
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: ada6ecf5f3
[formerly 018f590c70
[formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]
Former-commit-id: 018f590c70
Former-commit-id: ba698ae69a
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: 076dccf42d
[formerly 3ee334378c
[formerly 534486bf918d5384d062d7501f0f1c4a0b4f0172]]
Former-commit-id: 3ee334378c
Former-commit-id: 2e6842016b
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: a71dac6cad
[formerly 91e39617cb
[formerly b9db13cf5bff60511d815f92f0239a4313498265]]
Former-commit-id: 91e39617cb
Former-commit-id: 51eb89eb2a
2012-08-27 09:53:55 -05:00
Nate Jensen
07ac473e55
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: 168bee4bd7
[formerly 94b7f40d1d
[formerly 0f98c3bfbf041cd46311517f2819ca2d81b1cd34]]
Former-commit-id: 94b7f40d1d
Former-commit-id: eac562204d
2012-08-27 09:21:50 -05:00
Nate Jensen
7439c24618
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 047441f91c
[formerly 73f428e4d5
[formerly 5e9d7763442ab91cb8d33c16139eb5bca9b033ea]]
Former-commit-id: 73f428e4d5
Former-commit-id: 7b62f6ac75
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: c4812b7745
[formerly 75b2cdff47
[formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]]
Former-commit-id: 75b2cdff47
Former-commit-id: 1f84ddbddf
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: df0a9b39cb
[formerly 07a1da2568
[formerly 5712a415bcd280d6884a14fd07ac0bdb5daa40bf]]
Former-commit-id: 07a1da2568
Former-commit-id: b3ea5e3916
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: ec2d211800
[formerly f7182ae9c7
[formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]]
Former-commit-id: f7182ae9c7
Former-commit-id: f3a33e3df4
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: f646b185da
[formerly 1b45f1b6d9
[formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]
Former-commit-id: 1b45f1b6d9
Former-commit-id: 20c65a4677
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: a988fdf5de
[formerly e1c07b5803
[formerly 61aab7b55f9868e69b43c5250515ce0d5b01d6e5]]
Former-commit-id: e1c07b5803
Former-commit-id: 596b48c490
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: b8629a0f20
[formerly 8e3ecc1efd
[formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]
Former-commit-id: 8e3ecc1efd
Former-commit-id: 04c8c3ca55
2012-08-22 13:01:08 -05:00
Steve Harris
77cbd6c1e5
12.9.1-5 baseline
...
Former-commit-id: f2fac39428
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
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: 23a67f458a
[formerly ca52d45911
[formerly ea356c6c0ff3962542aad451a7a1ec65a5921628]]
Former-commit-id: ca52d45911
Former-commit-id: f7c56e0a73
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: 6e1059f8be
[formerly f381871fc4
[formerly a34c116fbbad86f758882461dd96da9c6ab14cdd]]
Former-commit-id: f381871fc4
Former-commit-id: e404398ea6
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: 1b406ecfca
[formerly b69d2cad1c
[formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]
Former-commit-id: b69d2cad1c
Former-commit-id: fc06265360
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: 7662d249ab
[formerly d7a818fd1d
[formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]
Former-commit-id: d7a818fd1d
Former-commit-id: 16231374f8
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: 819b9c8e56
[formerly 1321db6a99
[formerly 9287cf98369abb8a674fd5bab99439d055218a05]]
Former-commit-id: 1321db6a99
Former-commit-id: 93c632c1ff
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: 596d19466b
[formerly fa77df807d
[formerly 55326667ca13a37c7802849484949382e65a6329]]
Former-commit-id: fa77df807d
Former-commit-id: 735ed2ecd9
2012-08-16 10:27:51 -05:00
root
b6e17e9b02
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 b93989daaf
[formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]
Former-commit-id: b93989daaf
Former-commit-id: d170ae704b
2012-08-15 22:29:07 +00:00
root
bb7b5341dd
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: 5a453ee984
[formerly cb46f57879
[formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: cb46f57879
Former-commit-id: 0987fc6b3d
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
e65418717f
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: 4203807a77
[formerly 6d9d0a406f
[formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]
Former-commit-id: 6d9d0a406f
Former-commit-id: e8524301b5
2012-08-15 16:36:05 -05:00
Nate Jensen
a94964d940
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 9c1597b554
[formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]]
Former-commit-id: 9c1597b554
Former-commit-id: b94597d03c
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
8dffbba06e
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: b194a17abc
[formerly cb99170685
[formerly 97d786afadf136f75ffd6a440d35b628e144b888]]
Former-commit-id: cb99170685
Former-commit-id: 9c41e73ee5
2012-08-15 15:25:46 -05:00
Steve Harris
71b024e3a1
12.9.1-4 baseline
...
Former-commit-id: 33b95fb96d
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: dcda3a2290
Former-commit-id: 36c108e960
2012-08-15 15:19:10 -05:00
Steve Harris
8083b81729
12.9.1-3 baseline
...
Former-commit-id: 84bbf2573e
[formerly 36d80b1f60
[formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 36d80b1f60
Former-commit-id: c11f7d396e
2012-08-15 14:26:10 -05:00
Steve Harris
ecba93c959
12.9.1-2 baseline
...
Former-commit-id: a198b3a807
[formerly d1d877d319
[formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]
Former-commit-id: d1d877d319
Former-commit-id: 27871051e3
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
55ac7d7684
Issue #915 Set the user data.
...
Former-commit-id: 03ed8ee0b0
[formerly 865136f6ef
[formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]
Former-commit-id: 865136f6ef
Former-commit-id: f37a75f265
2012-08-15 14:05:50 -05:00
Steve Harris
b9fb1c89d4
12.9.1-1 baseline
...
Former-commit-id: 79ce6cfd97
[formerly 31ae7ea218
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
2012-08-15 13:59:00 -05:00
Steve Harris
9a5ad2fdae
Merge branch 'development' into Enhanced_points
...
Former-commit-id: f7f97d9f54
[formerly 346d775f57
[formerly 25026a4d9955b76039bf25861380cadebff19665]]
Former-commit-id: 346d775f57
Former-commit-id: e372481f81
2012-08-15 13:35:47 -05:00
Nate Jensen
a14db247fb
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 2cb82b7170
[formerly d252760b0e39002e53a5fce809b38521ca2351aa]]
Former-commit-id: 2cb82b7170
Former-commit-id: d70d78d664
2012-08-14 16:52:40 -05:00
Steve Harris
39dbd45d38
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: e530637aa3
[formerly e3927a11c7
[formerly 43d4642bc39a053d40fce9b6aff1d11f3d313dd7]]
Former-commit-id: e3927a11c7
Former-commit-id: 27fa10e133
2012-08-14 16:26:00 -05:00
Ben Steffensmeier
066f40e606
Issue #1058 fix reprojection of wind vectors
...
Former-commit-id: 9c727d2e33
[formerly ba9d0b25b5
[formerly 8fdc9841f9033720aa0ceb6389e7b1403d75a2d5]]
Former-commit-id: ba9d0b25b5
Former-commit-id: 28aae9f11f
2012-08-14 16:15:19 -05:00
David Gillingham
ac55928e60
Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes.
...
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: 79a77a38a4
[formerly f40fc68c28
[formerly 03f9de1860008cd1a2b4b60576802a67a8a447fa]]
Former-commit-id: f40fc68c28
Former-commit-id: e541c86f1b
2012-08-14 16:15:10 -05:00
Ben Steffensmeier
9e86aaaac1
Issue #1018 change product browser to handle no editor conditions better.
...
Change-Id: I3235ebb6d50eee26c75d31ce91e2a01c2d49b300
Former-commit-id: 7559065a1d
[formerly 4d20aa0e82
[formerly 7cb30aa5c00eea5b95b6c4b39653fabeaccdd872]]
Former-commit-id: 4d20aa0e82
Former-commit-id: 6267bdb915
2012-08-14 15:23:34 -05:00
Lee Venable
5c02dabb9d
Merge "Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes." into development_on_ss_builds
...
Former-commit-id: 2c2a3f4aec
[formerly 457d099cca
[formerly cf7be4b4a2a49f365258f1ac6262b64e86e705e4]]
Former-commit-id: 457d099cca
Former-commit-id: fe9a85cefb
2012-08-14 14:26:10 -05:00
Ben Steffensmeier
eee0d925ec
Issue #1058 fix reprojection of wind vectors
...
Former-commit-id: 09c412d754
[formerly c25c08c8e7
[formerly 315965383123120bffe1faa1d63fdfb7b633bc97]]
Former-commit-id: c25c08c8e7
Former-commit-id: 283781ba03
2012-08-14 13:44:21 -05:00
David Gillingham
a795b2fbca
Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes.
...
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: f2795370d1
[formerly b587c1ea4f
[formerly da6811db78e3fcf57acc25e417ec8319c1dceecf]]
Former-commit-id: b587c1ea4f
Former-commit-id: 06e789e986
2012-08-14 13:36:51 -05:00
Ben Steffensmeier
2c64112a4c
Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
...
Former-commit-id: 0857d971b5
[formerly a4c46c7f55
[formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]
Former-commit-id: a4c46c7f55
Former-commit-id: 474fe44037
2012-08-14 10:25:38 -05:00
Max Schenkelberg
5c4ba85189
Issue #28 Implemented generic true color resource with new extension. Wrote new, more efficient, accurate, and scalable TileSet rendering/managing code to replace AbstractTileSet which VIIRS uses since it took over 10s to load a single frame of data with AbstractTileSet and around 20-30s to load a single true color frame of VIIRS. Put true color code in separate projects to encapsulate functionality. Resources need not depend on these projects, they just have to set the ImagingProvider in their ImagingCapability and true color resource can be loaded through a bundle file.
...
Change-Id: I624edb115b02611470e2e434e27759c45600111c
Former-commit-id: 09b0db0a13
[formerly 93e8619fa5
[formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]
Former-commit-id: 93e8619fa5
Former-commit-id: d6522f8e3a
2012-08-13 12:20:05 -05:00
Ben Steffensmeier
9aa0da6f76
Issue #1004 change plots to synchronize with dispose instead of joining since join allows paint to happen
...
Change-Id: I6011a5fedc155ab8d515d3c6eb5d368f582c59bd
Former-commit-id: 559efb19fb
[formerly 603a9c90e4
[formerly aece671b35405e1f278439c9a1a8230dad5cf4c2]]
Former-commit-id: 603a9c90e4
Former-commit-id: 6f178a9150
2012-08-13 09:54:22 -05:00
Ben Steffensmeier
4ac95d6f30
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
...
Former-commit-id: 1e527f83f0
[formerly c6a121962f
[formerly 06c2c85159598ca803c663de97caed4b6841c135]]
Former-commit-id: c6a121962f
Former-commit-id: 573cc270e8
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
702f11b85d
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: b53fe917bc
[formerly 525c0b21a9
[formerly 045952304218c867d8fe89df9828f70632df2d00]]
Former-commit-id: 525c0b21a9
Former-commit-id: 8d118c392a
2012-08-09 17:50:23 -05:00