Commit graph

735 commits

Author SHA1 Message Date
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
e2b7a1679b Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: 6eec24180e [formerly 342bda7e5f [formerly 2368421395496141fdc6467fd165babc282b65ac]]
Former-commit-id: 342bda7e5f
Former-commit-id: ac8888ae10
2012-08-15 22:29:38 +00: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
Benjamin Phillippe
ec41ec59ee Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: 7bad34f906 [formerly 72c63e1a6f [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]
Former-commit-id: 72c63e1a6f
Former-commit-id: dd8ed9eca0
2012-08-15 16:22:39 -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
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
Ron Anderson
0328f2f50a Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 985167892d [formerly 71d74b1dcf [formerly 564b72997c59a665398c8687d6bafdb54c469881]]
Former-commit-id: 71d74b1dcf
Former-commit-id: 5c80f582b3
2012-08-14 16:20:23 -05:00
Nate Jensen
98c132222b Merge "Issue #947 revert changes to dataTime format" into development_on_ss_builds
Former-commit-id: 80f1766f9a [formerly 571e16bd23 [formerly 22a06b47664b0f7b7592022345cc7e3ead147036]]
Former-commit-id: 571e16bd23
Former-commit-id: 9657ce7e32
2012-08-14 16:15:55 -05:00
Ben Steffensmeier
85bba2f435 Issue #947 revert changes to dataTime format
Former-commit-id: 434193b34b [formerly ce689ad5fa [formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]
Former-commit-id: ce689ad5fa
Former-commit-id: fd2bf26119
2012-08-14 16:12:02 -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
Nate Jensen
80b312f764 Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds
Former-commit-id: 4211a8deac [formerly eeaa2c798f [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]
Former-commit-id: eeaa2c798f
Former-commit-id: 32cc46ec4e
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
16187575d7 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: ad1415948f [formerly 066a5af2a6 [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]
Former-commit-id: 066a5af2a6
Former-commit-id: 64caa963b1
2012-08-09 17:16:38 -05:00
Jonathan Sanchez
457cbcdf95 Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.


Former-commit-id: fa7795d17f [formerly 6507a97665 [formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]]
Former-commit-id: 6507a97665
Former-commit-id: 4f2d6630c1
2012-08-09 08:26:21 -05:00
Nate Jensen
3aeaced4dc Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
Former-commit-id: fbbf74eb50 [formerly a88d7bcedc [formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]]
Former-commit-id: a88d7bcedc
Former-commit-id: 8cd83e1571
2012-08-08 16:10:13 -05:00
Ben Steffensmeier
ee8a4896bd Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 5da238c8b9 [formerly 97ba96759c [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]
Former-commit-id: 97ba96759c
Former-commit-id: cac790ac5a
2012-08-08 14:41:33 -05:00
Steve Harris
0cf8ae644e Merge branch 'development_on_ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: a9b587019a [formerly 1feb52683a [formerly e49333c9cddc47d2b8f3f835e19657043d51a7af]]
Former-commit-id: 1feb52683a
Former-commit-id: 24515a43b6
2012-08-08 13:59:52 -05:00
Steve Harris
655b5932d9 Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: d538fd8913 [formerly bbf4b18204 [formerly d8080798d6c69b9cf0f9042660c5ad910cf123c6]]
Former-commit-id: bbf4b18204
Former-commit-id: fc39ef78e4
2012-08-08 13:57:46 -05:00
Nate Jensen
2c3d03a4e5 Merge "Issue #1004 make dispose/shutdown of plot jobs more permenant by joining." into development_on_ss_builds
Former-commit-id: 6c758b7c84 [formerly b704e8d3f4 [formerly 65ea6e46e059a058d5a46b0cf28f1b50c3057744]]
Former-commit-id: b704e8d3f4
Former-commit-id: a241db9e69
2012-08-08 09:43:40 -05:00
Steve Harris
c72218985b Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 9e2e0fa166 [formerly 926ff5dc5a [formerly 5717f9bf344b6d78ca30f1387679e535bac5a13c]]
Former-commit-id: 926ff5dc5a
Former-commit-id: e2267aa186
2012-08-07 15:29:25 -05:00
Ben Steffensmeier
d84fd21e2a Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
Former-commit-id: 83d6cde368 [formerly c9774a4f03 [formerly 4c5e5e0d54c523723edd16b756dc1caf208f5cd6]]
Former-commit-id: c9774a4f03
Former-commit-id: 0a974b26c2
2012-08-07 12:03:13 -05:00
Steve Harris
f19c9fa55d Fixed merge of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 3f88fa9078 [formerly 6dae0398d3 [formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]]
Former-commit-id: 6dae0398d3
Former-commit-id: 6615c96f33
2012-08-07 10:04:39 -05:00
Steve Harris
1cd1cb250f Merge branch 'development' into development_on_ss_builds
Former-commit-id: 515c8ec596 [formerly 32ee17d124 [formerly 69faa80856ac4c63f9cc79ccd7370e129093f091]]
Former-commit-id: 32ee17d124
Former-commit-id: f540dbfb87
2012-08-06 12:57:56 -05:00
Steve Harris
9bec162043 Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: f3babcf1a1 [formerly d90c5f989d [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]
Former-commit-id: d90c5f989d
Former-commit-id: 60c0cfc3b3
2012-08-06 11:13:47 -05:00
Steve Harris
7b6c223552 Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 85f82b18b3 [formerly f0b7d5e4c5 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]
Former-commit-id: f0b7d5e4c5
Former-commit-id: 9e2d161f8d
2012-08-06 09:38:26 -05:00
Steve Harris
79d4d91e46 12.8.1-10 baseline
Former-commit-id: ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: b5e8fee24d
Former-commit-id: 6244359a80
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
62106ee967 Issue #1006 Implemented urban areas.
Former-commit-id: 62db15b6f4 [formerly dbd30e3b67 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]]
Former-commit-id: dbd30e3b67
Former-commit-id: 06ce1c6dd5
2012-08-06 08:41:52 -05:00
Steve Harris
7e89b04a10 Merge branch 'development' into development_on_ss_builds
Former-commit-id: a1071e3204 [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]
Former-commit-id: 24799cd93d
Former-commit-id: 54c505dd8e
2012-08-06 08:23:04 -05:00
Ben Steffensmeier
e242274f06 Issue #988 set statem bits on underlieing image for GLDelegate Image
Former-commit-id: 5fe65c6538 [formerly 0f7dd0f4cd [formerly 39444045f7cc4f4e4fac86b15ca7b98cf2cb9ded]]
Former-commit-id: 0f7dd0f4cd
Former-commit-id: 6e3cd8976b
2012-08-03 16:39:33 -05:00
Ben Steffensmeier
d841924588 Issue #978 GChange GridResource to use its own times rather than descriptor times.
Former-commit-id: 090b9f5ccb [formerly 8346805ed2 [formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]]
Former-commit-id: 8346805ed2
Former-commit-id: c5c9e8b05c
2012-08-03 15:52:47 -05:00
Richard Peter
1d953096d4 Merge "Issue #798 - Force interpolationLevels in derived satellite" into development
Former-commit-id: 131ba842e9 [formerly fd051c19d4 [formerly 622e8119ab53ed34e5249c67186343203a56b821]]
Former-commit-id: fd051c19d4
Former-commit-id: 2154c4e286
2012-08-03 14:32:35 -05:00
James Korman
2ebcf052dc Issue #798 - Force interpolationLevels in derived satellite
Former-commit-id: 317acc38fe [formerly 1bc1784478 [formerly ffcc7cfa6e7c2ce0f406becff390781ceee7faa3]]
Former-commit-id: 1bc1784478
Former-commit-id: dfd18c7a85
2012-08-03 14:14:53 -05:00
Ben Steffensmeier
c57d546746 Issue #1001 synchronize paint with add.
Former-commit-id: 798d26e954 [formerly 2c9737ca5c [formerly 825c08e6ce89b0c4b042c9e85f7abbc7b9a675ef]]
Former-commit-id: 2c9737ca5c
Former-commit-id: 3e601b2baf
2012-08-03 14:10:04 -05:00
Nate Jensen
ce6c112f84 Merge "Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu" into development
Former-commit-id: 47920c3168 [formerly c74a54b9ed [formerly 9207aa6af20bd76369a5952bd836526ce6d7197f]]
Former-commit-id: c74a54b9ed
Former-commit-id: 689dcd5d4d
2012-08-03 10:43:39 -05:00
Bryan Kowal
4b329f54fe Issue #997 - the scripted CAVE pde build will now only default to /opt/uframe-eclipse if the user has not specified an alternate eclipse location.
Change-Id: Ib9b5bbd3f89b0a241c7eb1865895e232ac8d85f7

Former-commit-id: 08651d2c21 [formerly e371bd14dd [formerly 1adbccde6ba44233e9d0cd7e3b9d5220cef64d06]]
Former-commit-id: e371bd14dd
Former-commit-id: 40e69fad53
2012-08-02 16:13:58 -05:00
Bryan Kowal
642d57b71d Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties.
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36

Former-commit-id: 5ca4a66fdc [formerly c6b2d65308 [formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]
Former-commit-id: c6b2d65308
Former-commit-id: dd1acbe70a
2012-08-02 10:33:55 -05:00
James Korman
6f631b4aca Issue #798 - Updates to satellite
Former-commit-id: 2ddb2f6df0 [formerly 7928d912e1 [formerly 0fbc98c1fbbf683e14cf39ed962308496dff67dd]]
Former-commit-id: 7928d912e1
Former-commit-id: fd1156d67d
2012-08-01 16:31:59 -05:00
Steve Harris
0557c9a0c6 Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]
Former-commit-id: 6d77b94217
Former-commit-id: fb47934159
2012-08-01 12:43:12 -05:00
Bryan Kowal
dd451f392f Issue #970 - ensure that g2int has the same definition throughout grib2 and all dependencies; updated variable types based on function signatures.
Change-Id: If25d724c18ff5a9d09f94d77304ec729866158e6

Former-commit-id: d07281ac51 [formerly 485334331a [formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]]
Former-commit-id: 485334331a
Former-commit-id: 6126e4316a
2012-08-01 11:50:24 -05:00
Max Schenkelberg
2761a47a37 Issue #626 Fixed changes to GridDownscaler in SatelliteDao
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90

Former-commit-id: d89b58f7fd [formerly 2d36eb040d [formerly 1370a27f85173509b66a7ea861ed0b04225709e0]]
Former-commit-id: 2d36eb040d
Former-commit-id: c3daf20fdf
2012-08-01 11:36:44 -05:00
Max Schenkelberg
01b0313c03 Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet.
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac

Former-commit-id: cc0a1fbca3 [formerly f635e9c332 [formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]
Former-commit-id: f635e9c332
Former-commit-id: 079a11565a
2012-08-01 10:51:32 -05:00
Steve Harris
2e804fc8c4 12.8.1-5 baseline
Former-commit-id: cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: fd2abfb6f1
Former-commit-id: 2653ddc2e3
2012-08-01 10:45:37 -05:00
James Korman
e24766ac3d Issue #798 - Code review changes
Former-commit-id: 39a32d7c91 [formerly 14e68406b4 [formerly c58e900204016e026c6023e7beb33bc82a6cdeaf]]
Former-commit-id: 14e68406b4
Former-commit-id: f7a864a2c0
2012-07-31 14:34:27 -05:00
James Korman
226ff6ea65 Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: 4cbbc59278 [formerly 38a2e426d9 [formerly cb05a9f95384806537106dc804833331d6c7db48]]
Former-commit-id: 38a2e426d9
Former-commit-id: 1166a7cbb1
2012-07-31 13:38:23 -05:00
Nate Jensen
3db2a3fe6a Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu
Change-Id: I103017fef97b6f7992f753eb17737201bf0a4f64

Former-commit-id: 69f51e6e87 [formerly ae7c427b4b [formerly e3b8f1e0c5d1e5d9fa7446124bc7c3c0b98a967c]]
Former-commit-id: ae7c427b4b
Former-commit-id: 8539a075bb
2012-07-31 10:02:39 -05:00
Richard Peter
0ee07efae3 Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
Former-commit-id: 8631b64e75 [formerly 97a1d083cd [formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]]
Former-commit-id: 97a1d083cd
Former-commit-id: 4f64038c78
2012-07-31 09:16:23 -05:00
Nate Jensen
baff86f951 Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: 4a2841b287 [formerly a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]
Former-commit-id: a65e9608fd
Former-commit-id: 6f90bfa61c
2012-07-31 08:57:54 -05:00