Commit graph

653 commits

Author SHA1 Message Date
David Gillingham
67586ea006 Issue #1055: Fix coop precip breakage from Wes2Bridge db changes.
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad

Former-commit-id: e541c86f1b [formerly f40fc68c28] [formerly e541c86f1b [formerly f40fc68c28] [formerly 79a77a38a4 [formerly 03f9de1860008cd1a2b4b60576802a67a8a447fa]]]
Former-commit-id: 79a77a38a4
Former-commit-id: 5ce4e54db9 [formerly dd80a94061]
Former-commit-id: 18c572c983
2012-08-14 16:15:10 -05:00
Ben Steffensmeier
5c560e5a56 Issue #1018 change product browser to handle no editor conditions better.
Change-Id: I3235ebb6d50eee26c75d31ce91e2a01c2d49b300

Former-commit-id: 6267bdb915 [formerly 4d20aa0e82] [formerly 6267bdb915 [formerly 4d20aa0e82] [formerly 7559065a1d [formerly 7cb30aa5c00eea5b95b6c4b39653fabeaccdd872]]]
Former-commit-id: 7559065a1d
Former-commit-id: 48963ebc07 [formerly 850203f715]
Former-commit-id: 7f5bd99b0c
2012-08-14 15:23:34 -05:00
Lee Venable
3187523b41 Merge "Issue #1055: Fix coop precip breakage from Wes2Bridge db changes." into development_on_ss_builds
Former-commit-id: fe9a85cefb [formerly 457d099cca] [formerly fe9a85cefb [formerly 457d099cca] [formerly 2c2a3f4aec [formerly cf7be4b4a2a49f365258f1ac6262b64e86e705e4]]]
Former-commit-id: 2c2a3f4aec
Former-commit-id: b42d389cb2 [formerly a3651c5813]
Former-commit-id: 5f180a03cc
2012-08-14 14:26:10 -05:00
Ben Steffensmeier
dfd6d73cc2 Issue #1058 fix reprojection of wind vectors
Former-commit-id: 283781ba03 [formerly c25c08c8e7] [formerly 283781ba03 [formerly c25c08c8e7] [formerly 09c412d754 [formerly 315965383123120bffe1faa1d63fdfb7b633bc97]]]
Former-commit-id: 09c412d754
Former-commit-id: 6207cd7310 [formerly ea551d3866]
Former-commit-id: e0561a1a35
2012-08-14 13:44:21 -05:00
David Gillingham
767fdf56a1 Issue #1055: Fix coop precip breakage from Wes2Bridge db changes.
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad

Former-commit-id: 06e789e986 [formerly b587c1ea4f] [formerly 06e789e986 [formerly b587c1ea4f] [formerly f2795370d1 [formerly da6811db78e3fcf57acc25e417ec8319c1dceecf]]]
Former-commit-id: f2795370d1
Former-commit-id: 35ac266c34 [formerly e51d931a5a]
Former-commit-id: 2ba2b982a0
2012-08-14 13:36:51 -05:00
Ben Steffensmeier
d6c42b28bf Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
Former-commit-id: 474fe44037 [formerly a4c46c7f55] [formerly 474fe44037 [formerly a4c46c7f55] [formerly 0857d971b5 [formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]]
Former-commit-id: 0857d971b5
Former-commit-id: 08021bcfc2 [formerly a02bb2c092]
Former-commit-id: a17bae6f40
2012-08-14 10:25:38 -05:00
Max Schenkelberg
3d43480508 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: d6522f8e3a [formerly 93e8619fa5] [formerly d6522f8e3a [formerly 93e8619fa5] [formerly 09b0db0a13 [formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]]
Former-commit-id: 09b0db0a13
Former-commit-id: 107efcaee3 [formerly 784c43ab7c]
Former-commit-id: 79f15e475e
2012-08-13 12:20:05 -05:00
Ben Steffensmeier
f87969cbee Issue #1004 change plots to synchronize with dispose instead of joining since join allows paint to happen
Change-Id: I6011a5fedc155ab8d515d3c6eb5d368f582c59bd

Former-commit-id: 6f178a9150 [formerly 603a9c90e4] [formerly 6f178a9150 [formerly 603a9c90e4] [formerly 559efb19fb [formerly aece671b35405e1f278439c9a1a8230dad5cf4c2]]]
Former-commit-id: 559efb19fb
Former-commit-id: d52dd42ab2 [formerly 3f258a2bf8]
Former-commit-id: fa8ea385d9
2012-08-13 09:54:22 -05:00
Ben Steffensmeier
32287c896b Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 573cc270e8 [formerly c6a121962f] [formerly 573cc270e8 [formerly c6a121962f] [formerly 1e527f83f0 [formerly 06c2c85159598ca803c663de97caed4b6841c135]]]
Former-commit-id: 1e527f83f0
Former-commit-id: 0af9fd4fe2 [formerly c9ff69014b]
Former-commit-id: dc8d05c1be
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
62aafd3542 Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 8d118c392a [formerly 525c0b21a9] [formerly 8d118c392a [formerly 525c0b21a9] [formerly b53fe917bc [formerly 045952304218c867d8fe89df9828f70632df2d00]]]
Former-commit-id: b53fe917bc
Former-commit-id: 54b3078ad1 [formerly 4ed3d04e64]
Former-commit-id: fafea907c7
2012-08-09 17:50:23 -05:00
Ben Steffensmeier
de38003e6c Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
Former-commit-id: 3f92e385a6 [formerly 3abfef55cc] [formerly 3f92e385a6 [formerly 3abfef55cc] [formerly c1bacb33b1 [formerly 6cb8e45b4f3a78abcfeee982306684eef025fd3d]]]
Former-commit-id: c1bacb33b1
Former-commit-id: 0e48e6e4fd [formerly f711cfdae2]
Former-commit-id: 30702ea3c6
2012-08-09 17:45:19 -05:00
Nate Jensen
5e82400554 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: 32cc46ec4e [formerly eeaa2c798f] [formerly 32cc46ec4e [formerly eeaa2c798f] [formerly 4211a8deac [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]]
Former-commit-id: 4211a8deac
Former-commit-id: c0fa1e8cf2 [formerly 2cc3c63ba7]
Former-commit-id: 0df3ab80eb
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
aa740ef6a8 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 64caa963b1 [formerly 066a5af2a6] [formerly 64caa963b1 [formerly 066a5af2a6] [formerly ad1415948f [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]]
Former-commit-id: ad1415948f
Former-commit-id: e03eb5f5c9 [formerly 65c33256d9]
Former-commit-id: 70f8f93f81
2012-08-09 17:16:38 -05:00
Jonathan Sanchez
1986477214 Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.


Former-commit-id: 4f2d6630c1 [formerly 6507a97665] [formerly 4f2d6630c1 [formerly 6507a97665] [formerly fa7795d17f [formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]]]
Former-commit-id: fa7795d17f
Former-commit-id: 3952dfc7ac [formerly 7ad6329fe0]
Former-commit-id: 8a006c6093
2012-08-09 08:26:21 -05:00
Ben Steffensmeier
873a7d64b6 Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: cac790ac5a [formerly 97ba96759c] [formerly cac790ac5a [formerly 97ba96759c] [formerly 5da238c8b9 [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]]
Former-commit-id: 5da238c8b9
Former-commit-id: 8cdf1f8d1c [formerly b6cc71bf75]
Former-commit-id: 726e934763
2012-08-08 14:41:33 -05:00
Roger Ferrel
4e15803926 Issue #875 Markers and group added to Cave.
Amend: Removed python file

Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.

Amend: deleted unwanted .project file

Amend: Removed comment out code and fix class descriptions

Amend: Changes based on reviewer comments.

Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8

Former-commit-id: b3c357c964 [formerly 2e3fc4b400] [formerly b3c357c964 [formerly 2e3fc4b400] [formerly f4ae8eb150 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]]
Former-commit-id: f4ae8eb150
Former-commit-id: 69f22fe6bb [formerly ae41499ba2]
Former-commit-id: 4e356b8a13
2012-08-08 13:35:47 -05:00
Jonathan Sanchez
6d4683e90d Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.

Former-commit-id: 17a3198056 [formerly 051b63c3e9] [formerly 17a3198056 [formerly 051b63c3e9] [formerly df301c2e03 [formerly cfaece96bd77aef32073400c1abaf0bf8cd3f103]]]
Former-commit-id: df301c2e03
Former-commit-id: cc261d9ce2 [formerly 200ed3c3fb]
Former-commit-id: e2d5a0b384
2012-08-07 14:50:15 -05:00
Ben Steffensmeier
1dc30083ca Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
Former-commit-id: 0a974b26c2 [formerly c9774a4f03] [formerly 0a974b26c2 [formerly c9774a4f03] [formerly 83d6cde368 [formerly 4c5e5e0d54c523723edd16b756dc1caf208f5cd6]]]
Former-commit-id: 83d6cde368
Former-commit-id: f47d533ac3 [formerly ea70488664]
Former-commit-id: d645fc787e
2012-08-07 12:03:13 -05:00
Steve Harris
b77e7400c8 Merge branch 'development' into development_on_ss_builds
Former-commit-id: f540dbfb87 [formerly 32ee17d124] [formerly f540dbfb87 [formerly 32ee17d124] [formerly 515c8ec596 [formerly 69faa80856ac4c63f9cc79ccd7370e129093f091]]]
Former-commit-id: 515c8ec596
Former-commit-id: 5e30a4282c [formerly 533d58b312]
Former-commit-id: e3da0259e8
2012-08-06 12:57:56 -05:00
Steve Harris
3f8544203f 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: 60c0cfc3b3 [formerly d90c5f989d] [formerly 60c0cfc3b3 [formerly d90c5f989d] [formerly f3babcf1a1 [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]]
Former-commit-id: f3babcf1a1
Former-commit-id: 2f3ef9f4da [formerly 62e9207ba7]
Former-commit-id: 0428530b73
2012-08-06 11:13:47 -05:00
Max Schenkelberg
335d2a0942 Issue #626 Fixed GLStats to print proper message name. Fixed SatelliteDao to correctly use UnsignedByteArrayWrapper to properly reflect data. Modified UnsignedShortArrayWrapper to extend ShortArrayWrapper like Byte/UnsignedByteArrayWrapper does. Fixed DataTime legend generation when time range is not even hour increment
Change-Id: Ie79883c1d901f24042234fe5e79b5ae903e5792b

Former-commit-id: ae3b62ca12 [formerly 36bf80d13e] [formerly ae3b62ca12 [formerly 36bf80d13e] [formerly 0031d21292 [formerly b0466e68bea4102f397db214bb58b66c10a338ed]]]
Former-commit-id: 0031d21292
Former-commit-id: 1aa6d193b4 [formerly 482dfb4711]
Former-commit-id: 92df0af108
2012-08-06 09:44:44 -05:00
Steve Harris
9fd142b98e Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 9e2d161f8d [formerly f0b7d5e4c5] [formerly 9e2d161f8d [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]
Former-commit-id: 85f82b18b3
Former-commit-id: 52e0da2293 [formerly b2432e096f]
Former-commit-id: dcc56b8a23
2012-08-06 09:38:26 -05:00
Steve Harris
78d66ba6df 12.8.1-10 baseline
Former-commit-id: 6244359a80 [formerly b5e8fee24d] [formerly 6244359a80 [formerly b5e8fee24d] [formerly ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: 78d34d65d2 [formerly d5563fc340]
Former-commit-id: 46daa48f1c
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
9737533feb Issue #1006 Implemented urban areas.
Former-commit-id: 06ce1c6dd5 [formerly dbd30e3b67] [formerly 06ce1c6dd5 [formerly dbd30e3b67] [formerly 62db15b6f4 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]]]
Former-commit-id: 62db15b6f4
Former-commit-id: 1af2520b91 [formerly f26cce33a9]
Former-commit-id: 549b50ea40
2012-08-06 08:41:52 -05:00
Steve Harris
b62ac9c78e Merge branch 'development' into development_on_ss_builds
Former-commit-id: 54c505dd8e [formerly 24799cd93d] [formerly 54c505dd8e [formerly 24799cd93d] [formerly a1071e3204 [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]
Former-commit-id: a1071e3204
Former-commit-id: dbe07ca70c [formerly 8f4ddad22c]
Former-commit-id: d507458b9b
2012-08-06 08:23:04 -05:00
Ben Steffensmeier
e6a6c5345e Issue #988 set statem bits on underlieing image for GLDelegate Image
Former-commit-id: 6e3cd8976b [formerly 0f7dd0f4cd] [formerly 6e3cd8976b [formerly 0f7dd0f4cd] [formerly 5fe65c6538 [formerly 39444045f7cc4f4e4fac86b15ca7b98cf2cb9ded]]]
Former-commit-id: 5fe65c6538
Former-commit-id: 83effa4f85 [formerly 6ccc09e0b4]
Former-commit-id: b03eceb82a
2012-08-03 16:39:33 -05:00
Ben Steffensmeier
a1c0547c50 Issue #978 GChange GridResource to use its own times rather than descriptor times.
Former-commit-id: c5c9e8b05c [formerly 8346805ed2] [formerly c5c9e8b05c [formerly 8346805ed2] [formerly 090b9f5ccb [formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]]]
Former-commit-id: 090b9f5ccb
Former-commit-id: 5954717c26 [formerly 942b0e5315]
Former-commit-id: 42e01d8b1b
2012-08-03 15:52:47 -05:00
Richard Peter
990ad59b97 Merge "Issue #798 - Force interpolationLevels in derived satellite" into development
Former-commit-id: 2154c4e286 [formerly fd051c19d4] [formerly 2154c4e286 [formerly fd051c19d4] [formerly 131ba842e9 [formerly 622e8119ab53ed34e5249c67186343203a56b821]]]
Former-commit-id: 131ba842e9
Former-commit-id: 3984511a6e [formerly c61f4f8245]
Former-commit-id: a096babf14
2012-08-03 14:32:35 -05:00
James Korman
95eaa68f1b Issue #798 - Force interpolationLevels in derived satellite
Former-commit-id: dfd18c7a85 [formerly 1bc1784478] [formerly dfd18c7a85 [formerly 1bc1784478] [formerly 317acc38fe [formerly ffcc7cfa6e7c2ce0f406becff390781ceee7faa3]]]
Former-commit-id: 317acc38fe
Former-commit-id: 93a1311cf9 [formerly b27f4fb5e5]
Former-commit-id: 955e30950a
2012-08-03 14:14:53 -05:00
Ben Steffensmeier
2640d54aa1 Issue #1001 synchronize paint with add.
Former-commit-id: 3e601b2baf [formerly 2c9737ca5c] [formerly 3e601b2baf [formerly 2c9737ca5c] [formerly 798d26e954 [formerly 825c08e6ce89b0c4b042c9e85f7abbc7b9a675ef]]]
Former-commit-id: 798d26e954
Former-commit-id: ceaf86128c [formerly e9cde98072]
Former-commit-id: db95e6621b
2012-08-03 14:10:04 -05:00
Steve Harris
078b4fff3c 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: fb47934159 [formerly 6d77b94217] [formerly fb47934159 [formerly 6d77b94217] [formerly 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: d2291ba23f [formerly 3476fe755b]
Former-commit-id: e892eb4628
2012-08-01 12:43:12 -05:00
Max Schenkelberg
da993aeada 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: 079a11565a [formerly f635e9c332] [formerly 079a11565a [formerly f635e9c332] [formerly cc0a1fbca3 [formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]]
Former-commit-id: cc0a1fbca3
Former-commit-id: 7ee188d90a [formerly 74f0179b92]
Former-commit-id: 40e6cd390e
2012-08-01 10:51:32 -05:00
Steve Harris
d3be09bd74 12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1]
Former-commit-id: e86949a8d3
2012-08-01 10:45:37 -05:00
James Korman
c901590446 Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: 1166a7cbb1 [formerly 38a2e426d9] [formerly 1166a7cbb1 [formerly 38a2e426d9] [formerly 4cbbc59278 [formerly cb05a9f95384806537106dc804833331d6c7db48]]]
Former-commit-id: 4cbbc59278
Former-commit-id: 16643cb1bc [formerly 5df52e38f9]
Former-commit-id: 41a80adfb1
2012-07-31 13:38:23 -05:00
Richard Peter
69b15da61d Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
Former-commit-id: 4f64038c78 [formerly 97a1d083cd] [formerly 4f64038c78 [formerly 97a1d083cd] [formerly 8631b64e75 [formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]]]
Former-commit-id: 8631b64e75
Former-commit-id: 96e3782774 [formerly c379c2f884]
Former-commit-id: 347398d655
2012-07-31 09:16:23 -05:00
Nate Jensen
e1321b8bc9 Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: 6f90bfa61c [formerly a65e9608fd] [formerly 6f90bfa61c [formerly a65e9608fd] [formerly 4a2841b287 [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]
Former-commit-id: 4a2841b287
Former-commit-id: 7d478ac74c [formerly 8fa0eb70db]
Former-commit-id: 04a7e5a8c0
2012-07-31 08:57:54 -05:00
Ron Anderson
d4a29dace5 Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62

Former-commit-id: e9f24e8660 [formerly 7c6686f2f4] [formerly e9f24e8660 [formerly 7c6686f2f4] [formerly b1650b6143 [formerly 181fba1a75357aa39a54267c6df907075f4601dc]]]
Former-commit-id: b1650b6143
Former-commit-id: 4efd9149f7 [formerly 6a3e6f599f]
Former-commit-id: e328b61d87
2012-07-31 08:36:27 -05:00
Ron Anderson
12a02df51c Issue #851 removed obsolete GFE code.
Change-Id: I3713b0e265bec9e32cde3c20bc4dae12f6b20a02

Former-commit-id: 74478728de [formerly 35d140f0fb] [formerly 74478728de [formerly 35d140f0fb] [formerly d87c0b6c4b [formerly c91b6fc2c506096f37f175e8196f9aaeb356141d]]]
Former-commit-id: d87c0b6c4b
Former-commit-id: 4459afa40c [formerly 6b7f1b3611]
Former-commit-id: 251494458f
2012-07-30 15:34:16 -05:00
Steve Harris
05082b1d3a Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 302aa05586 [formerly de9034c96c] [formerly 302aa05586 [formerly de9034c96c] [formerly 4688ac304f [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]]
Former-commit-id: 4688ac304f
Former-commit-id: f2ab9cfe1a [formerly b82d6772c3]
Former-commit-id: acfc6eff55
2012-07-27 14:50:45 -05:00
Steve Harris
84d0f1fbb6 Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 07c40a9c0c [formerly 56249c2611] [formerly 07c40a9c0c [formerly 56249c2611] [formerly 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: 9e4df42326 [formerly 2aa4114e4d]
Former-commit-id: d7540c958f
2012-07-27 14:44:44 -05:00
Nate Jensen
c2558bdb79 Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: ac8d12ce13 [formerly 3d07fc8ebf] [formerly ac8d12ce13 [formerly 3d07fc8ebf] [formerly dbe185f3a0 [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]]
Former-commit-id: dbe185f3a0
Former-commit-id: 4e0a0f10dc [formerly 67edb6917d]
Former-commit-id: 70d269fc34
2012-07-26 17:43:29 -05:00
Ben Steffensmeier
e3e5e9f3fe Issue #924 fix some concurrency issues for GridResource
Former-commit-id: 78491d6318 [formerly e18782687c] [formerly 78491d6318 [formerly e18782687c] [formerly de742a4b8c [formerly 312361f3bacf9ed935ee7cd69be90192af34b3fd]]]
Former-commit-id: de742a4b8c
Former-commit-id: bcea00c92b [formerly 3e9abe8682]
Former-commit-id: 9713295486
2012-07-25 17:33:24 -05:00
Ben Steffensmeier
c5b450e517 Issue #921 register GFEColorbarResource as a listener when recycling.
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0

Former-commit-id: 7514bfd6cd [formerly e3cfa52237] [formerly 7514bfd6cd [formerly e3cfa52237] [formerly 044836cd2c [formerly 90ce1b3643af750a19bc29156137f18848e7dc77]]]
Former-commit-id: 044836cd2c
Former-commit-id: 97776790cb [formerly 6f9ec1af50]
Former-commit-id: 37f4498d8c
2012-07-24 11:29:51 -05:00
Ron Anderson
fceddcbedc Issue #851 Fixed issues with DatabaseID.dateFormat
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72

Former-commit-id: 21431b2693 [formerly 1f2e581534] [formerly 21431b2693 [formerly 1f2e581534] [formerly b52f1400ef [formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]]]
Former-commit-id: b52f1400ef
Former-commit-id: e184dceb91 [formerly bc034e1863]
Former-commit-id: bc519a7ce2
2012-07-23 16:49:21 -05:00
Ben Steffensmeier
45411d9824 Issue #924 fix concurrency issues for Grid products
Former-commit-id: 286274aed0 [formerly 0b951d425d] [formerly 286274aed0 [formerly 0b951d425d] [formerly 9abd645758 [formerly 767173dc95dc811bc94081415a214803403985f5]]]
Former-commit-id: 9abd645758
Former-commit-id: af3102991e [formerly cb08c202ef]
Former-commit-id: bd6bb5fd43
2012-07-19 17:37:15 -05:00
Ben Steffensmeier
d0c6e80426 Issue #910 fix Memory Leak in GLDelegate Images, add Graphics memory logging.
Change-Id: I07635279472c5f4a605f00cbdde81e961eb9e757

Former-commit-id: 41860a891e [formerly 5df07dac9f] [formerly 41860a891e [formerly 5df07dac9f] [formerly 98218ec3cd [formerly e4d9419134f7fcfd47dfe84e55764309d3d65257]]]
Former-commit-id: 98218ec3cd
Former-commit-id: b281516e71 [formerly 10706db0b1]
Former-commit-id: 155741a6fb
2012-07-19 17:12:31 -05:00
Steve Harris
36e2ad3023 12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24 [formerly 9f97182964]
Former-commit-id: 9aabe438b9
2012-07-19 16:20:40 -05:00
Nate Jensen
7999e5bbab Merge "Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged" into development
Former-commit-id: 127feeb545 [formerly bad816a50e] [formerly 127feeb545 [formerly bad816a50e] [formerly 0fd6c7d56c [formerly 3786f2c0a7add2d36b27b92e2a8efd235b65e147]]]
Former-commit-id: 0fd6c7d56c
Former-commit-id: abc8a39763 [formerly 33611406a4]
Former-commit-id: bc5e7cfa9f
2012-07-19 15:31:55 -05:00
Max Schenkelberg
41d82a3e53 Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged
Change-Id: I845caf8bedb4b27d16874c2a0a633554412d6dd4

Former-commit-id: 0cfd8834c2 [formerly c8909c0fbc] [formerly 0cfd8834c2 [formerly c8909c0fbc] [formerly d8971a72fd [formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]]]
Former-commit-id: d8971a72fd
Former-commit-id: 5d8515fb58 [formerly bc0ec0455d]
Former-commit-id: c419654b74
2012-07-19 11:45:01 -05:00
Ben Steffensmeier
ff6ab749bd Issue #772 synchronize sat getImages with paint and dispose to avoid errors when disposing while mosaicing.
Former-commit-id: 53f915c3e4 [formerly 144dd7bab9] [formerly 53f915c3e4 [formerly 144dd7bab9] [formerly eab4b1cd78 [formerly 84055039ccd601f4be4546f97cde99faf33b7818]]]
Former-commit-id: eab4b1cd78
Former-commit-id: 6c96f56744 [formerly 1393fa1d14]
Former-commit-id: cfd3255ac6
2012-07-18 17:53:51 -05:00