Commit graph

91 commits

Author SHA1 Message Date
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
Steve Harris
1954443885 Merge branch 'OB12.2.1_test' into ss_sync
Former-commit-id: 7966ab9369 [formerly 6f7f678590] [formerly 830038b0c6 [formerly 76967f2151dcfb275be389c04060ff34be4a5018]]
Former-commit-id: 830038b0c6
Former-commit-id: 5f6715ed05
2012-02-23 07:53:15 -06:00
Bryan Kowal
53f4674f25 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 0f02d05283 [formerly 9a63901c0e] [formerly cd35220cf7 [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]]
Former-commit-id: cd35220cf7
Former-commit-id: 5ca7ce8373
2012-02-22 17:07:15 -06:00
Steve Harris
83618ae62b creating OB12.2.1 from ss_sync for testing
Former-commit-id: 4ff546d3fd [formerly a7b68a50be] [formerly 1fc25c6cb2 [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]]
Former-commit-id: 1fc25c6cb2
Former-commit-id: aaf2fbd05b
2012-02-22 13:06:47 -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
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
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
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
Bryan Kowal
cc8c6597a2 Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 5754f9dfd8 [formerly 10a0ca252d] [formerly 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 682c10767d
Former-commit-id: 2ba23624b4
2012-02-17 12:17:14 -06:00
Bryan Kowal
8a71854fe1 Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
Former-commit-id: d4b76c1057 [formerly 4276fc2fe8] [formerly 9f1b7a613a [formerly 1ec51accade835c1133eac9222131f9186985053]]
Former-commit-id: 9f1b7a613a
Former-commit-id: 38ccaf882b
2012-02-17 11:09: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
Nate Jensen
9a8dd201c5 Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
Former-commit-id: c20df8b229 [formerly bdb08a9f4c] [formerly 642ad4e9b0 [formerly 712f278a25a67d3d05375213b4d5bc8e7743aaa9]]
Former-commit-id: 642ad4e9b0
Former-commit-id: 051e8faf55
2012-02-16 14:00:33 -06:00
Bryan Kowal
e4da2bcb9c Issue #34 - recompiled the nsharp dll with the latest ncep code.
Former-commit-id: 2ce7c520b3 [formerly c8dba08a9d] [formerly 4888756560 [formerly d3affc909e299af8826d16bc02754fc61754e287]]
Former-commit-id: 4888756560
Former-commit-id: 71fe94b322
2012-02-16 12:51:24 -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
a85a777232 Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
Conflicts:
	msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
	msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
	nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_

Chose to keep in 4-Thin_Client


Former-commit-id: 221a02882a [formerly b9f4780fcb] [formerly 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]
Former-commit-id: 23cc9689de
Former-commit-id: a2e3aabc60
2012-02-15 14:39:43 -06:00
Steve Harris
de85613a99 Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 6aed9311a8 [formerly 7356d655da] [formerly 1707b98721 [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]
Former-commit-id: 1707b98721
Former-commit-id: db1e3b1215
2012-02-15 14:34:47 -06:00
Steve Harris
98b223d08e Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: 74c156e508 [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]
Former-commit-id: a91b01bfbe
Former-commit-id: 39b13d7102
2012-02-15 12:54:54 -06:00
Bryan Kowal
134b8f2915 Issue #243 - it is now possible to build meteolib on Windows; meteolib, jep, and gridslice are now all built using MSBuild when built from the command line.
Former-commit-id: 2fabaff1d9 [formerly 38eb4bd2b6] [formerly 521756e57e [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]
Former-commit-id: 521756e57e
Former-commit-id: 1c023403e2
2012-02-15 10:31:58 -06:00
Steve Harris
77d083d6fa Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 7911304736 [formerly 7a28b5ea62] [formerly 708348e9e4 [formerly 70f1516d0cc4dcd62214453974f1e65dd57d1ddd]]
Former-commit-id: 708348e9e4
Former-commit-id: 6c719e6fc2
2012-02-14 15:47:32 -06:00
Ben Steffensmeier
993f2aafa4 Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58

Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2

Former-commit-id: 808846e237 [formerly 944e59e989] [formerly f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]
Former-commit-id: f65d86a06a
Former-commit-id: d00572c122
2012-02-14 15:46:11 -06:00
Steve Harris
0b936af499 Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
Former-commit-id: 1d7daf3576 [formerly 3973ed2360] [formerly 376650ce9d [formerly e8e020e3bd86ffcd918366990d605acee8bd6a80]]
Former-commit-id: 376650ce9d
Former-commit-id: b847ef442c
2012-02-14 15:41:54 -06:00
Ben Steffensmeier
ed952e100a Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce

Former-commit-id: 8561802d14 [formerly 97000f0738] [formerly b080ab8f6c [formerly 78deeca92b5916c7c57b1f866e9be2e11992c13d]]
Former-commit-id: b080ab8f6c
Former-commit-id: 2e49f3b6aa
2012-02-14 15:39:50 -06:00
Nate Jensen
b0819f7828 Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 27c3458b5e [formerly daeda3f898] [formerly dd7d200f7f [formerly 1135f27699b49795352ae5b1b31ac9fe06c564b6]]
Former-commit-id: dd7d200f7f
Former-commit-id: c49691bc7b
2012-02-14 13:06:27 -06:00
Ben Steffensmeier
132f023a06 Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58

Former-commit-id: e2141b574e [formerly 100b4c4ba0] [formerly 2995d2b29b [formerly 32b8f723ebf64d97636705911c0b7b22a9cd2148]]
Former-commit-id: 2995d2b29b
Former-commit-id: 7914496c96
2012-02-14 12:59:42 -06:00
Greg Armendariz
22b4dd70e8 Merge "Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console." into 4-Thin_Client
Former-commit-id: fd72f98fc2 [formerly cb16a5256a] [formerly e3dda29720 [formerly 41ed9251ca6ef83a6de3362c52acaa21dd00da3d]]
Former-commit-id: e3dda29720
Former-commit-id: 7ce17e1234
2012-02-13 15:02:29 -06:00
Bryan Kowal
0bf4fecb62 Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console.
Former-commit-id: c78e988d55 [formerly 67562b0674] [formerly 4faf9831ed [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]
Former-commit-id: 4faf9831ed
Former-commit-id: eb91bb964e
2012-02-13 13:57:10 -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
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
Steve Harris
c2603de1b8 Merge "Issue #192 gitignore changes" into ss_sync
Former-commit-id: ece695a374 [formerly 4eef9c3c20] [formerly 35cc62582b [formerly e019344c6f96c6db35ede5985779eab537df523c]]
Former-commit-id: 35cc62582b
Former-commit-id: a6b95a2e81
2012-02-08 09:09:28 -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
Nate Jensen
64bb93efc3 Merge "Issue #176 fix PersistablePluginDataObject" into 4-Thin_Client
Former-commit-id: a7f4c9492a [formerly a25342a5c8] [formerly e79aa3bfa1 [formerly fd1087a87366dfd51789c50ee56c4b43e3404f11]]
Former-commit-id: e79aa3bfa1
Former-commit-id: 47d4648cd5
2012-02-07 09:47:46 -06:00
Nate Jensen
7bc07e29ca Merge "Issue #237 revert Silver Spring changes to nsharp activator which break windows. Fix grib decoder to handle grib files with lo1 on the dateline. Change-Id: I4991e7f02c8cdcfd608c3c6d987f4d0ea8593f40" into 4-Thin_Client
Former-commit-id: e746b4043a [formerly 00cf561d88] [formerly 42e12cc025 [formerly b28fce87e699357d5ec463fbda5a48590d590560]]
Former-commit-id: 42e12cc025
Former-commit-id: b1264d105b
2012-02-07 09:45:28 -06:00
Ben Steffensmeier
2437d60929 Issue #176 fix PersistablePluginDataObject
Change-Id: I29f37b0fceb180eb0950ff1e00c44eb94b05f82e

Former-commit-id: 3ed59f81ec [formerly 20247d0d89] [formerly 6d901d27ae [formerly 34eb69e6ead3aa811c018e364517998d356e4feb]]
Former-commit-id: 6d901d27ae
Former-commit-id: 22809228d6
2012-02-07 09:42:07 -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
Ben Steffensmeier
6da56f59fc Issue #237 revert Silver Spring changes to nsharp activator which break windows. Fix grib decoder to handle grib files with lo1 on the dateline.
Change-Id: I4991e7f02c8cdcfd608c3c6d987f4d0ea8593f40

Former-commit-id: 1e0bd549a4 [formerly 324b358c44] [formerly 851046ccf3 [formerly 2b0f9f149c4dc2031cb9178538899eb3f9f5de23]]
Former-commit-id: 851046ccf3
Former-commit-id: 56c1b70d03
2012-02-06 16:55:48 -06:00
Ben Steffensmeier
cb2addec0c Issue #176 pull changes to insert and persist time from the WES2Bridge branch.
Change-Id: If82378f4d8ccf867a5078682893ce65591ea04b4

Former-commit-id: 4179defc4f [formerly f016be988e] [formerly 73f6e9e322 [formerly 500f3f03f5260cff3417021776204ccf6c035415]]
Former-commit-id: 73f6e9e322
Former-commit-id: 7bcbf3e3bc
2012-02-03 17:33:32 -06:00
Matt Nash
203ec03a08 Issue #192 gitignore changes
Former-commit-id: 7d36323ae9 [formerly 5fdadf4333] [formerly 426da850d3 [formerly 68f511221d4b198be50e1cf2a81723b8c3578a61]]
Former-commit-id: 426da850d3
Former-commit-id: 380179f10d
2012-02-03 15:03:21 -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
Ben Steffensmeier
d9a74d7a76 Issue #211 change point requests to correctly return null responses when there are no matching pdos.
Change-Id: I88e6ba5734aa55af76c3b417eea9336eef7bf08a

Former-commit-id: 44debb13a3 [formerly 0d9fa5ea6c] [formerly 83fbf80c98 [formerly 2cd24c7e679b4f7002664d2588dd8bc54c7cebd0]]
Former-commit-id: 83fbf80c98
Former-commit-id: 3d3f73118b
2012-02-01 17:39:14 -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
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
7afc75204c Merge "Issue #181 disable nctext-ingest" into 14-NCEP
Former-commit-id: da5bc7b50f [formerly 7490a7d0ed] [formerly e4dc370101 [formerly 0d01c3c0597e1be074d13c3a3e6ce188878e220f]]
Former-commit-id: e4dc370101
Former-commit-id: 0b6bde1664
2012-01-31 09:51:16 -06:00
Nate Jensen
6bdb96c7ca Issue #181 disable nctext-ingest
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e

Former-commit-id: e61ff490b1 [formerly 1b32446288] [formerly f3ba2258df [formerly a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9]]
Former-commit-id: f3ba2258df
Former-commit-id: 50e735ce0c
2012-01-31 09:45:27 -06:00