Commit graph

1523 commits

Author SHA1 Message Date
Steve Harris
43b83ed8aa Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
Former-commit-id: c0c0acfbe8 [formerly 957d232286] [formerly a82f2c5750 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]
Former-commit-id: a82f2c5750
Former-commit-id: e6c3afa7a2
2012-02-23 10:19:54 -06:00
Steve Harris
92b7072b82 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: 7a10ca9766
Former-commit-id: 3d511fe719
2012-02-23 10:06:18 -06:00
Ben Steffensmeier
c3d3142bab Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be

Former-commit-id: b776d953d7 [formerly 06c9d4cdcf] [formerly 55aa66a510 [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]
Former-commit-id: 55aa66a510
Former-commit-id: 5d6b036ed7
2012-02-22 17:40:48 -06:00
Steve Harris
b55a488ed8 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
610fdf3f4e Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 85075e6107 [formerly 94c2ea985b] [formerly 9995d22e25 [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 9995d22e25
Former-commit-id: aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
968239217e Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 2c12c02910 [formerly 84926c80be] [formerly f3fe839c1c [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]
Former-commit-id: f3fe839c1c
Former-commit-id: 6d1b04e62c
2012-02-21 10:37:36 -06:00
Nate Jensen
2ee4305d77 Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: ba5b1ee03f [formerly b90611d995] [formerly ec0cd8d086 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]
Former-commit-id: ec0cd8d086
Former-commit-id: 13ea11ddfc
2012-02-21 08:57:12 -06:00
Steve Harris
dd3a5a8d88 Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
Conflicts:
	.gitignore
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
	deltaScripts/.pydevproject
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java

Former-commit-id: ec0f1aebfc [formerly b89ebc5e01] [formerly 496cc6a06b [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]
Former-commit-id: 496cc6a06b
Former-commit-id: 4a93298877
2012-02-20 16:38:06 -06:00
Ben Steffensmeier
0ee68fb6cc Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db

Former-commit-id: 27973ec694 [formerly 69e8cde115] [formerly 73d24fad2f [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]
Former-commit-id: 73d24fad2f
Former-commit-id: dcbe4fc7da
2012-02-20 15:28:20 -06:00
Steve Harris
b12f5e5d75 Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml
	rpms/awips2.edex/Installer.edex-cots/component.spec

Former-commit-id: d971880b98 [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 33483f3960
2012-02-20 13:03:39 -06:00
Steve Harris
b41e5f2415 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: a2fd2cf6fa [formerly 6a064cb78b] [formerly d02529fef4 [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]
Former-commit-id: d02529fef4
Former-commit-id: d133454b27
2012-02-20 12:54:25 -06:00
Steve Harris
dd911bed4d Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: c268da57bc [formerly 4b76d22f77] [formerly cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: cc66c8be24
Former-commit-id: 54b5b6baef
2012-02-20 12:43:38 -06:00
Steve Harris
b609a6fd60 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: e3535054ff [formerly 62c587b841] [formerly c825bd03a2 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]
Former-commit-id: c825bd03a2
Former-commit-id: 0fab56e0f1
2012-02-20 07:49:13 -06:00
Steve Harris
1ac6b36d1f Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
ea93dcd939 Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0

Former-commit-id: 38993f5a5a [formerly 26d82729c9] [formerly 3e3e4bd4e3 [formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]]
Former-commit-id: 3e3e4bd4e3
Former-commit-id: d4e7df98a9
2012-02-16 16:36:56 -06:00
Steve Harris
840c858697 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c26a22cfb7 [formerly e2989d1a9f] [formerly 64ddef69b6 [formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]]
Former-commit-id: 64ddef69b6
Former-commit-id: ff45f4eaab
2012-02-16 14:23:01 -06:00
Ben Steffensmeier
7de650c868 Issue #343 remove extra perspectives when in thinclient component
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee

Former-commit-id: 0104e1970d [formerly 28c7e6bc22] [formerly 8cf7360e3b [formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]]
Former-commit-id: 8cf7360e3b
Former-commit-id: b819bfa8e9
2012-02-15 17:10:34 -06:00
Steve Harris
d23d12d596 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 46dda7b8bd [formerly 2119a1513e] [formerly 2e29bc8ee2 [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: cb3371ee28
2012-02-14 15:54:46 -06:00
David Gillingham
3e42bc7d2d Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Issue #20: Address peer review comments from previous commit.

Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Former-commit-id: 535821e5b8 [formerly bb1ac9959b] [formerly 061966f243 [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]
Former-commit-id: 061966f243
Former-commit-id: 9f416558fa
2012-02-13 16:09:36 -06:00
Nate Jensen
ce7e58062c Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
Former-commit-id: 364cd8f5fc [formerly da7d13d933] [formerly 06327646d9 [formerly ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9]]
Former-commit-id: 06327646d9
Former-commit-id: dd8500b081
2012-02-13 11:40:36 -06:00
Bryan Kowal
ef4218bdb0 Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
Former-commit-id: 8e552ca56f [formerly 34d9122f14] [formerly c77b9558e1 [formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]]
Former-commit-id: c77b9558e1
Former-commit-id: 2c3f67d470
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
99557a2a0f Issue #235 add an export menu to cave to handle screen capture, print, and displays
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98

Former-commit-id: 6e95175ba2 [formerly ebbbd0bafc] [formerly f7985bff7b [formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]]
Former-commit-id: f7985bff7b
Former-commit-id: a9e13fac26
2012-02-10 12:13:34 -06:00
Ben Steffensmeier
9d442083a1 Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc

Former-commit-id: 08e8343d98 [formerly 5cdcd5a261] [formerly 6bfd8ccfee [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: 512e0f1bd5
2012-02-09 10:54:02 -06:00
Steve Harris
93e856457b Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 695e2979c3 [formerly 1002555dbd] [formerly f693b6d0a7 [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]
Former-commit-id: f693b6d0a7
Former-commit-id: f650243958
2012-02-09 08:54:18 -06:00
Ben Steffensmeier
b09c00244e Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9

Former-commit-id: ddd5ee68ad [formerly 863fa0f635] [formerly 3f60daa9c7 [formerly b7b3a581e8291313833b20da308f5adc5a234f26]]
Former-commit-id: 3f60daa9c7
Former-commit-id: d49939ddb2
2012-02-08 16:29:02 -06:00
Matt Nash
6e11115195 Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
Former-commit-id: ce5baf0632 [formerly e52a1315b2] [formerly 25b9659dc7 [formerly ac489b3dc676f7f202991906e0b004baa074dfe0]]
Former-commit-id: 25b9659dc7
Former-commit-id: 5c10b1d587
2012-02-08 08:53:19 -06:00
Matt Nash
d3433544ab Issue #26 fix gage color for hydro to refresh
Former-commit-id: c4fee978d7 [formerly f7652d25e3] [formerly bb4f690393 [formerly 1a8d135e07c56e8ac202c01e7aa866290b28b0a4]]
Former-commit-id: bb4f690393
Former-commit-id: 82089434e5
2012-02-07 16:49:34 -06:00
Max Schenkelberg
0c4a9cf58a Issue #206 fixed dialog context deactivation bug
Former-commit-id: d5369932fd [formerly 9535ae2d0e] [formerly fe59c3e8d8 [formerly b2b66e7483065e9677d8bd34f19b514c7914ef8c]]
Former-commit-id: fe59c3e8d8
Former-commit-id: 9a7efcaae8
2012-02-07 16:45:59 -06:00
Matt Nash
178663bd09 Merge "Issue #206 - Fixed loading and disposing bugs in tear off menus" into 10-Tech_Blocked
Former-commit-id: 6fc771908f [formerly 81ec1d5dac] [formerly be92a03f2d [formerly 65ce29e9b3721e7eef2a9ec842404252ead2d3ba]]
Former-commit-id: be92a03f2d
Former-commit-id: e629c0bc38
2012-02-07 16:13:03 -06:00
Max Schenkelberg
825bd76f55 Issue #206 - Fixed loading and disposing bugs in tear off menus
Issue #206 Fixed bugs in maps menu and other dynamically created menus


Former-commit-id: be37f19c90 [formerly 370e20f0ae] [formerly a7ccea5eda [formerly 875c90104e80d95798956330e24b59d83ef52942]]
Former-commit-id: a7ccea5eda
Former-commit-id: a6622153d7
2012-02-07 16:12:19 -06:00
Ben Steffensmeier
9c6081d7a3 Issue #235 Ability to screen capture or print multiple frames at once.
Change-Id: I58176883e701fbe0d9e0bcc0e43b60bd5c0053a7

Former-commit-id: 2e37808e48 [formerly e904dadb5e] [formerly c74dae631e [formerly 9062fe4b8fdb62840b21aba7c648f48fa691986a]]
Former-commit-id: c74dae631e
Former-commit-id: 0873a518c6
2012-02-07 15:33:23 -06:00
Matt Nash
8dbb17b2e8 Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
Former-commit-id: a659029ea0 [formerly f4c5d7f94b] [formerly 28e3da498e [formerly c12bae0a615198f6d409cf5e6d79a6a32e57494d]]
Former-commit-id: 28e3da498e
Former-commit-id: ef18b8c47f
2012-02-07 11:45:28 -06:00
Ben Steffensmeier
a628b39819 Issue #229 make sure default cache directory exists when opening the preference page.
Change-Id: I25ba5cba8c74b764e39c1a42c78ee14f861ba283

Former-commit-id: 803052bbd8 [formerly a1455f9c7d] [formerly 34f45958ce [formerly 0a4001bf8c3ef6272cd52ad8706e104235de4417]]
Former-commit-id: 34f45958ce
Former-commit-id: 7db3623545
2012-02-06 17:16:52 -06:00
Matt Nash
919433b8d4 Issue #26 tear off menu changes to fix issues
Former-commit-id: 0ea872be36 [formerly 542049e455] [formerly 0ff3ef8d72 [formerly 30c43cbcd4500c5754261b420f5c9b031bd63014]]
Former-commit-id: 0ff3ef8d72
Former-commit-id: 88689efbfa
2012-02-03 13:13:15 -06:00
Ben Steffensmeier
25adbef6ab Issue #230 fix scaling problems with printing to high dpi printers
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f

Former-commit-id: 89b327974a [formerly d35d365b7f] [formerly f78fa301a8 [formerly 22418489fd697c94b2350d79e7701c8399842e2e]]
Former-commit-id: f78fa301a8
Former-commit-id: 55689025ff
2012-02-03 12:49:59 -06:00
Max Schenkelberg
f5b7ebc249 Issue #29 Fixed issue with radar menu dispose
Former-commit-id: 56897ee0df [formerly f131667c9e] [formerly 8f0fbbf4e8 [formerly 279c4037f9f6fbefe53bc12cbf82017daa3399d2]]
Former-commit-id: 8f0fbbf4e8
Former-commit-id: f33039a269
2012-02-02 16:53:53 -06:00
Matt Nash
c6183ff3a3 Issue #26 radio buttons hopefully gerrit doesn't screw this up
Change-Id: I5ebc3356f83b3f5eb213cb659badd5ae93694d11

Former-commit-id: eead5c9a7e [formerly c966b7d8fd] [formerly b236733537 [formerly c03b20a3c52a7570133a972a8c915bffd167f733]]
Former-commit-id: b236733537
Former-commit-id: 6a23c2537f
2012-02-02 15:32:33 -06:00
Max Schenkelberg
c8ddc206fc Issue #206 Fixed issue with local radar menu items getting disposed
Former-commit-id: f78858bf2f [formerly 84ead088ca] [formerly ba619200c9 [formerly 07b72ce297ec52811439d03b4e753f5959eeb532]]
Former-commit-id: ba619200c9
Former-commit-id: 5ef6d79ef9
2012-02-02 14:24:19 -06:00
Matt Nash
5c66805415 Issue #26 fix the issue with the checkboxes out of sync
Change-Id: Ibeb05ddfc4a495d3d56a9d3c6bcc64c3494e3d32

Former-commit-id: 2408e25f2f [formerly 4ee3ccb133] [formerly 3716c7424f [formerly b1032a5a6bf24fcc4a0cf48ad6f2955adcaf0480]]
Former-commit-id: 3716c7424f
Former-commit-id: 2b7d5941d5
2012-02-01 17:32:51 -06:00
Matt Nash
b8062619fe Merge "Issue #206 Made tear off menu dialog activate contexts for perspective" into 10-Tech_Blocked
Former-commit-id: 9893d3b246 [formerly 54d27a840f] [formerly b1eca1ae8f [formerly 1ca26738cc10a37119b939a405987198245a4d65]]
Former-commit-id: b1eca1ae8f
Former-commit-id: 1b4a05d33a
2012-02-01 17:13:10 -06:00
Max Schenkelberg
2185e1a31e Issue #206 Made tear off menu dialog activate contexts for perspective
Former-commit-id: c410a4eb33 [formerly 5f8d30bb43] [formerly e422b13ded [formerly 56103eb133de5325d62bb3453b2353e5d5e23ddd]]
Former-commit-id: e422b13ded
Former-commit-id: 3a26b0cea5
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
4727943a5f Issue #229 moving caches into the caveData directory
Change-Id: I3d502ef858939738adf1835d2292f55e2b3edc44

Former-commit-id: 55404ff39b [formerly fc541f61a7] [formerly b3da2a3429 [formerly a499df61044947aaf40ac118e1476f41736419b0]]
Former-commit-id: b3da2a3429
Former-commit-id: 699ad82d97
2012-02-01 15:26:34 -06:00
Matt Nash
1d91ab7b46 Issue #206 radio buttons ready to update when menu is clicked
Change-Id: I8218e920bb3221e986d4698771d3199398cb655f

Former-commit-id: 6713ff899a [formerly 75d6af1ab9] [formerly 0981e7044d [formerly cda41b60a0189c5320fa8a1236a936910f1e98d4]]
Former-commit-id: 0981e7044d
Former-commit-id: b0b1c9cc11
2012-02-01 14:07:50 -06:00
Ben Steffensmeier
ec90cad810 Issue #228 change plots, grid icons, and radar icons
to use a new PointImageExtension which provides an
interface for drawing images at a single point,
which kml can use to extract plot images.

Change-Id: I29b07ed4f9e8ea95ed131ab1eb3ca27efadaf0e2

Former-commit-id: 792dc75f4d [formerly d976603262] [formerly 13a99abe7b [formerly 0f56c76ab830ef088a9576301c795dca7c855033]]
Former-commit-id: 13a99abe7b
Former-commit-id: 63ef103145
2012-02-01 12:45:56 -06:00
Nate Jensen
84aa8509e4 Merge "Issue #227 enhanced caching of maps for thin client" into 4-Thin_Client
Former-commit-id: 6a49a1bec3 [formerly 0608677c67] [formerly b1810ddd3f [formerly 825ddae7e604056e254530e225118f92d88d4b5c]]
Former-commit-id: b1810ddd3f
Former-commit-id: 8a0c505bac
2012-02-01 08:45:42 -06:00
Ben Steffensmeier
5deb83a291 Issue #227 enhanced caching of maps for thin client
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94

Former-commit-id: 138b4de82f [formerly 0617773c79] [formerly 9b78596436 [formerly 067ba5b7d28174d99119d5bf87a28334578f78dd]]
Former-commit-id: 9b78596436
Former-commit-id: a714f57f78
2012-01-31 10:53:10 -06:00
Nate Jensen
47bd783056 Merge "Issue #176 Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times." into 4-Thin_Client
Former-commit-id: c180ba7bfd [formerly b50765ded4] [formerly ec1188f95f [formerly 8df2c8fdd7bdf92806e4c1241083e9969e02ca76]]
Former-commit-id: ec1188f95f
Former-commit-id: 2925a1638f
2012-01-30 17:16:47 -06:00
Ben Steffensmeier
75f49627c8 Issue #176 Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times.
Change-Id: I23763bae287d5c49d3973707228e78144cc83ab1

Former-commit-id: 6194dc8210 [formerly 9cc983549d] [formerly 9254b762ff [formerly 94d4feb2973ed201d369a21126b3443606041179]]
Former-commit-id: 9254b762ff
Former-commit-id: 484a0f64f8
2012-01-30 17:04:47 -06:00
Nate Jensen
a7a6ed0b78 Merge "Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored.." into 4-Thin_Client
Former-commit-id: b85da11f1b [formerly 5f7b1e87b4] [formerly cc1cf725b7 [formerly 48179dbabb5cd5a60c345ad0bdd8bda9fdcf9bd9]]
Former-commit-id: cc1cf725b7
Former-commit-id: f4fe967eba
2012-01-30 16:45:56 -06:00
Ben Steffensmeier
8b1cdd8db1 Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a

Former-commit-id: 3c673896a0 [formerly b3463d27fc] [formerly 0d75fbf942 [formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]
Former-commit-id: 0d75fbf942
Former-commit-id: c22f135dbc
2012-01-30 16:39:57 -06:00