Commit graph

231 commits

Author SHA1 Message Date
Ben Steffensmeier
c29c20046a Issue #189 switch rpg to use grid data.
Former-commit-id: bb14128616 [formerly 985a00559b] [formerly b702ebdf55] [formerly b5e4d73010 [formerly b702ebdf55 [formerly 2a166f22d69d2e83dce6f101145b542d8b4144c7]]]
Former-commit-id: b5e4d73010
Former-commit-id: f8e4c2437b23e18d60ecb099b9b6f6470b329c4d [formerly 77cc02e8c8]
Former-commit-id: fcf1be0876
2012-10-01 16:51:53 -05:00
Ben Steffensmeier
10321e7b48 Issue #189 switch ohd to grid.
Former-commit-id: 86e20ce946 [formerly 682b7b8817] [formerly 6879a81436] [formerly f34fc897b8 [formerly 6879a81436 [formerly 6719880dd11c61f7c2ec54b2cede89ad2e3a5774]]]
Former-commit-id: f34fc897b8
Former-commit-id: 13dfacd83bf79b24bc1a35de0f40e9e857143ccb [formerly db20aec667]
Former-commit-id: 1b8eb83696
2012-10-01 16:33:08 -05:00
Ben Steffensmeier
7a7e91670a Issue #189 switch FFMP source config to grid.
Former-commit-id: eaf4d78d8d [formerly 691753fef2] [formerly 4007fa442b] [formerly 0b2121d3af [formerly 4007fa442b [formerly 85dac537f47cea6cc8ee6b0e0092c80544b6a89a]]]
Former-commit-id: 0b2121d3af
Former-commit-id: b210decd92a601ef96a5fce87ee03171f8384a52 [formerly ad8d2a2892]
Former-commit-id: b6fd0f6826
2012-10-01 16:10:32 -05:00
Ben Steffensmeier
dab3b40cc3 Issue #189 switch gfe to grid.
Former-commit-id: ddd259ffad [formerly ddbd05372b] [formerly 5cf650b61a] [formerly 4ab3357b8d [formerly 5cf650b61a [formerly 7c029a18dcfd9f955fd3a9a2351d5dfef6d18912]]]
Former-commit-id: 4ab3357b8d
Former-commit-id: c32a68e2a5391a32994cc8c750bc90e2f3b3d127 [formerly 18da7f96bd]
Former-commit-id: 22f5e57dc9
2012-10-01 16:08:43 -05:00
Ben Steffensmeier
bb5349896f Issue #189 fix merge issue with derived parameters going from 12.4 to 12.5
Former-commit-id: 265018e965 [formerly 7750b6259c] [formerly 5fe75cb57f] [formerly 666fe70a71 [formerly 5fe75cb57f [formerly f35c55683ab90289526f500b3bc2b623ded433e5]]]
Former-commit-id: 666fe70a71
Former-commit-id: 4d0775a3a8041333fb70eb3377a02e3e9e700ae1 [formerly fcf5cba055]
Former-commit-id: c8bf67f7fc
2012-10-01 15:41:38 -05:00
Ben Steffensmeier
c75236499d Issue #189 switch DAT to grid.
Former-commit-id: a28427e546 [formerly c2a12bbfdd] [formerly 4d6358ec52] [formerly b3190ba34d [formerly 4d6358ec52 [formerly a062b80648acb5d7ba664821bb9f65bdf985a971]]]
Former-commit-id: b3190ba34d
Former-commit-id: 83bd212253b6d3840389513059bb7dcef1caefbb [formerly a2b019d655]
Former-commit-id: a7d78f268f
2012-10-01 15:38:53 -05:00
Ben Steffensmeier
f976af446f Issue #189 convert hydro and hydrocommon to grid.
Former-commit-id: a5c60f0f13 [formerly 3e0da6d171] [formerly 8d150d404c] [formerly 3e93e8980b [formerly 8d150d404c [formerly a84fcbd045c24c16b30df4328aaf3bbbb30efd17]]]
Former-commit-id: 3e93e8980b
Former-commit-id: 9c843ec0f10baa33a6447d47f517d98afd981744 [formerly 734922cb44]
Former-commit-id: 3a1ba7bd87
2012-10-01 14:05:40 -05:00
Ben Steffensmeier
9b5abe464b Issue #189 switch GL to use regular floats so it works with very samll values and NaN.
Former-commit-id: 518fadf1d1 [formerly 6441db74b0] [formerly b5df6b6ef4] [formerly 0a0597302f [formerly b5df6b6ef4 [formerly f850384883b1faaf3f1092aa2a40cac89b952c5f]]]
Former-commit-id: 0a0597302f
Former-commit-id: 6e7a652c48cb1c7220a6f390ddfe133b7f8702d5 [formerly 3477060b44]
Former-commit-id: a9d7ca9e96
2012-10-01 13:19:00 -05:00
Ben Steffensmeier
e3409fc614 Issue #189 convert sounding/cloudheight to grid.
Former-commit-id: 4743e17c7a [formerly b67376efc9] [formerly a4785c76f3aca3cebb1695a95303640da136f1ee [formerly 7544986f1f]] [formerly 7efbc19f81 [formerly 7544986f1f [formerly 4a95bbc65642b688d67fb67faf8d76aed10d2f7c]]]
Former-commit-id: 7efbc19f81
Former-commit-id: ed881aecf24caceed39537661892630d05de175a [formerly 2f43572682]
Former-commit-id: 6e033f7043
2012-10-01 13:11:01 -05:00
Ben Steffensmeier
3557427a09 Issue #189 changes from code review comments for gridcoverage.
Former-commit-id: 71dad77e66 [formerly 516742e64a] [formerly 94e4f2adb6] [formerly 7f99750ba5 [formerly 94e4f2adb6 [formerly cfac5882643a0bde47c6f81623dd80ec41604a82]]]
Former-commit-id: 7f99750ba5
Former-commit-id: 64c581d84610c78f923da469f663319100baf9b5 [formerly 57d35bb700]
Former-commit-id: a6561786fa
2012-10-01 12:49:28 -05:00
Ben Steffensmeier
3f98be967a Issue #189 Make Derived parameters spatially aware
Former-commit-id: f57e004fc5 [formerly 02ee622165] [formerly 317696c66f] [formerly 8682b30383 [formerly 317696c66f [formerly f7919f7bfc3f631cc76e19710ea18feb6faf35f9]]]
Former-commit-id: 8682b30383
Former-commit-id: 19601cf5cbe3213be0da76f1f1c451ce0879beaf [formerly 2f6b9f6188]
Former-commit-id: f01d6242ce
2012-09-27 17:01:32 -05:00
Ben Steffensmeier
8de76a1f0c Issue #189 conversion of vb to use grid correctly.
Former-commit-id: 15f284ac89 [formerly a0fd9c1fbf] [formerly ee36e85848] [formerly 393f087340 [formerly ee36e85848 [formerly b47ccc0e899e6067f6c827f5637bb250aa186d7c]]]
Former-commit-id: 393f087340
Former-commit-id: d9a033c3335f5a669789916e1922c8823b4a320e [formerly 7d9d3931b4]
Former-commit-id: 04c99e842f
2012-09-25 15:05:46 -05:00
Ben Steffensmeier
f3eb360413 Issue #189 migrate d2d graph adapters to grid.
Former-commit-id: a7f4e39a4a [formerly 68877e66b2] [formerly 25d99f66f9] [formerly c2c32dd382 [formerly 25d99f66f9 [formerly 6ffd19010837d81bf548863144f4c525ed332a7c]]]
Former-commit-id: c2c32dd382
Former-commit-id: 6e8facbab6d9071e893b9b550c0626cad65deea4 [formerly ebf50d6e46]
Former-commit-id: b724fc9358
2012-09-25 13:19:17 -05:00
Ben Steffensmeier
ecdef95d0a Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 54767956bc [formerly 8e5b20236d] [formerly 9632663c0a] [formerly f918b6636f [formerly 9632663c0a [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]
Former-commit-id: f918b6636f
Former-commit-id: 7490d8b24afa2934ebd15d8ff27aa170ba918366 [formerly 6c38e6abb2]
Former-commit-id: 9512238d6e
2012-09-24 14:05:22 -05:00
Ben Steffensmeier
263cfe59f4 Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 69283c27a8 [formerly 5f787b6a6b] [formerly 4be2aa88c7] [formerly 0132d35871 [formerly 4be2aa88c7 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]]
Former-commit-id: 0132d35871
Former-commit-id: 6b333c59dfdca8b278d838cd1ed91e9d23e9ae87 [formerly 174d8ad029]
Former-commit-id: d1c3a0c1eb
2012-09-20 12:24:35 -05:00
Ben Steffensmeier
54bd284ccc Issue #189 checkin of grid dataplugin
Change-Id: I49b57915d90e6f5b347960046fa4c97a27a93375

Former-commit-id: 1a5c9d5501 [formerly 82b83f6e14] [formerly ccc2ae2108] [formerly 9512cca8ea [formerly ccc2ae2108 [formerly 0b026f5d9d5d86d464cb0ec2b411a59666939276]]]
Former-commit-id: 9512cca8ea
Former-commit-id: 6576a65f959cf96c092ff9a49b4bfc21e37e4249 [formerly 30d970eb95]
Former-commit-id: 762915184c
2012-09-18 15:19:07 -05:00
Ben Steffensmeier
6af74b843c Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 9eecab65c0 [formerly 4fe2127bfb] [formerly bd8eb7fc15] [formerly 05849f634d [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]
Former-commit-id: 05849f634d
Former-commit-id: 28ed264c21455f309a74a270145d56d9aa7064df [formerly b547d9dd8f]
Former-commit-id: 6b058ace34
2012-09-18 15:19:05 -05:00
Bryan Kowal
b9ddbfd7d4 Fix the git ignore file
Former-commit-id: 288f4e6232 [formerly c1a0d9556e] [formerly 8d8ee30cae] [formerly 30190f5055 [formerly 8d8ee30cae [formerly 69ac546cca867eddbe6450ebae7e3def2159f33e]]]
Former-commit-id: 30190f5055
Former-commit-id: da8a18518cc9a0c6822bbb769a017c85db577712 [formerly c6bc74a43e]
Former-commit-id: 5709f478fe
2012-09-14 11:58:12 -05:00
Steve Harris
84b893fd39 Merge branch 'ss_builds' into Unified_Grid
Former-commit-id: 2804af0e56 [formerly b53075f288] [formerly 206e25cbd4] [formerly a821755cf3 [formerly 206e25cbd4 [formerly 192e3b583fade6ba3d17be6a3f6248cb11a6a673]]]
Former-commit-id: a821755cf3
Former-commit-id: b1e78a77db7590ddbfaf64f2470ef11f5205e957 [formerly 3a923433e6]
Former-commit-id: 107ae12457
2012-09-13 15:26:38 -05:00
Steve Harris
424c32bd5d 12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]
Former-commit-id: 684feb34e5
2012-09-13 12:08:11 -05:00
Steve Harris
859eb1e434 Merge branch 'Unified_Grid' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into Unified_Grid
Former-commit-id: d717d2a21e [formerly 0a29954879] [formerly 9d04118479] [formerly cce3b22984 [formerly 9d04118479 [formerly 96fa74f5ec56b2d3c5682d694f911e1cfbfd4d7c]]]
Former-commit-id: cce3b22984
Former-commit-id: 427a2037d1a6e52aac665bc825be3540793f59fd [formerly e831a3d5da]
Former-commit-id: 55fec81a47
2012-09-12 13:14:41 -05:00
Steve Harris
11421048fb 12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: bbc20f4a68 [formerly 22dac5c82e] [formerly 077ced354e] [formerly fd5e214e72 [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]
Former-commit-id: fd5e214e72
Former-commit-id: bdf8cbe13f96fe312d8ad014285d113e04c8d85a [formerly ba25027ea5]
Former-commit-id: 9f3bd0d4ec
2012-09-12 13:10:36 -05:00
Richard Peter
37f43c90d0 Merge "Issue #189 initial checkin of parameter plugin Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a" into Unified_Grid
Former-commit-id: 9bdafe3e90 [formerly 8c6a9c6719] [formerly 2c39f2e584] [formerly 54b7b9ed09 [formerly 2c39f2e584 [formerly a0ec82d660d95f6d8e0866d03ccc6fa97b361a71]]]
Former-commit-id: 54b7b9ed09
Former-commit-id: 60b521299003e2aa96a5541086e2d10336e2ad6e [formerly 7f93237af0]
Former-commit-id: 41eb2f3d9a
2012-09-12 11:45:08 -05:00
Steve Harris
64699fa90b 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]
Former-commit-id: f376a4b4db
2012-09-11 16:00:38 -05:00
Steve Harris
406bde9fd0 12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]
Former-commit-id: a66f3f4b60
Former-commit-id: f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d]
Former-commit-id: ec74f638e5
2012-09-11 15:50:57 -05:00
Ben Steffensmeier
473fd64d85 Issue #189 initial checkin of parameter plugin
Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a

Former-commit-id: 4841cf1373 [formerly 0bfedb4e54] [formerly b3ead4e169] [formerly a563707ad5 [formerly b3ead4e169 [formerly 65d5edae30817a65dd46374c18907894d92f2972]]]
Former-commit-id: a563707ad5
Former-commit-id: 22157876b570a53c0bc10d5fe90ea6bee3582515 [formerly e3b5a5effc]
Former-commit-id: a039d55916
2012-09-10 14:24:32 -05:00
Steve Harris
9f4fa7bf83 12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]
Former-commit-id: e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
15fa63819d 12.9.1-12 baseline
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]
Former-commit-id: 150bc967a5
Former-commit-id: 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e]
Former-commit-id: 782941ccc1
2012-09-04 11:47:38 -05:00
Steve Harris
503b7bf15c 12.9.1-11 baseline
Former-commit-id: a2bb1dabe0 [formerly d07c18918d] [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]
Former-commit-id: fc405efab7
Former-commit-id: aa38e16cc24dec9189539c27650c276ab78f3c78 [formerly a14374fcd4]
Former-commit-id: dc5ec3d16d
2012-08-30 14:36:12 -05:00
Steve Harris
c704490769 12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]
Former-commit-id: f43a5af47f
2012-08-30 14:28:27 -05:00
Steve Harris
fffd905412 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e1cf4b0b9a [formerly 7a4f4ac493] [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]
Former-commit-id: b77a4d40d7
Former-commit-id: 49afa39c09674dd9b84bfb0d70e9a7be354e2f85 [formerly b2c0dd1abb]
Former-commit-id: 34fa4b5804
2012-08-22 16:00:33 -05:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Steve Harris
80655bf0a3 12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]
Former-commit-id: d7d60cc623
2012-08-15 15:19:10 -05:00
Steve Harris
988563a4b6 12.9.1-3 baseline
Former-commit-id: 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a]
Former-commit-id: a535b51eba
2012-08-15 14:26:10 -05:00
Steve Harris
8690f264b6 12.9.1-2 baseline
Former-commit-id: ecba93c959 [formerly 27871051e3] [formerly d1d877d319] [formerly a198b3a807 [formerly d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]
Former-commit-id: a198b3a807
Former-commit-id: db9021d4da0353e03ade3f0d5a5eae88fce61247 [formerly 448ed038c2]
Former-commit-id: de4c812834
2012-08-15 14:12:24 -05:00
Steve Harris
d3023f15ac 12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]
Former-commit-id: aed7a644df
2012-08-15 13:59:00 -05:00
Steve Harris
330df3323f 12.8.1-10 baseline
Former-commit-id: 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: ecf87b1305ff66ff4fdee1eb082f70a1ea1b736b [formerly d5563fc340]
Former-commit-id: 78d34d65d2
2012-08-06 09:34:26 -05:00
Steve Harris
4f47148ced 12.8.1-5 baseline
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]
Former-commit-id: dab00b12e6
2012-08-01 10:45:37 -05:00
Steve Harris
e1eb7f5972 12.7.1-8 baseline
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]
Former-commit-id: f2102bfb24
2012-07-19 16:20:40 -05:00
Steve Harris
e528bb0df2 12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]
Former-commit-id: dc50bc8443
2012-07-10 07:53:49 -05:00
Steve Harris
9b2ed5764f Issue #708 - removed extraneous files
Former-commit-id: de3f944384 [formerly d2e6687295] [formerly 1a67fdba3f] [formerly fbe7e50417 [formerly 1a67fdba3f [formerly 389c544088260bd6d6d107f51dc36426e9af3229]]]
Former-commit-id: fbe7e50417
Former-commit-id: 83b6cf98603632c1e675f0b9f9cba42d635a5d2b [formerly eca93e924c]
Former-commit-id: 026a14fc2c
2012-06-20 08:15:55 -05:00
Steve Harris
5d7a28156d Merge branch 'master' into ss_sync
Former-commit-id: a18fd2f871 [formerly 5a5db8dc6a] [formerly d507f3b71d] [formerly 645359deaf [formerly d507f3b71d [formerly 3b20277effa5ff76e68610d2d85afc950aae3387]]]
Former-commit-id: 645359deaf
Former-commit-id: faa52b5e6af76bc7945f0e7bfd703b9788e135ca [formerly c778c97bd6]
Former-commit-id: 0c29bee8e1
2012-06-13 14:56:52 -05:00
Steve Harris
1f521a70b3 12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
2012-06-08 13:39:48 -05:00
Max Schenkelberg
c5b45b0265 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e3d6962fe6 [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]
Former-commit-id: e3d6962fe6
Former-commit-id: b0a578678016a097651cd359f6c7d0ad3223db18 [formerly 878de45ee6]
Former-commit-id: 338f80fa87
2012-05-01 18:36:09 -05:00
Steve Harris
3992b18e28 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
used git cherry-pick -m 1 879a2e0

Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Conflicts:

	ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java


Former-commit-id: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]
Former-commit-id: 7c7fc97131
2012-05-01 18:31:09 -05:00
Steve Harris
40aa780b3d 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]
Former-commit-id: 33a67cdd82
2012-05-01 18:06:13 -05:00
Max Schenkelberg
937f4b6aa3 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 9126809973 [formerly e03ee60c75] [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 2e1507a1308f6373329e72eb1d9ccc52bd416fb3 [formerly 65c864aff2]
Former-commit-id: 51a826384e
2012-04-19 11:11:34 -05:00
Steve Harris
6aa0898aae Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Former-commit-id: 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d]
Former-commit-id: e86dc647be
2012-04-19 11:11:02 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Max Schenkelberg
ea7fcde242 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]
Former-commit-id: 07cf5069ba
Former-commit-id: bf3b4f5b4265812c5767225a4547be327787f7dd [formerly 993cac891e]
Former-commit-id: 4234b91d5b
2012-03-30 10:51:31 -05:00