Commit graph

2128 commits

Author SHA1 Message Date
Steve Harris
4e6af98f5b Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 68a5ebc0ad [formerly 272ba87883] [formerly c1129dbd00 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]]
Former-commit-id: c1129dbd00
Former-commit-id: ad402655f4
2012-02-15 15:08:58 -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
780b0c9592 Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
Former-commit-id: d84f7061f7 [formerly 05c0347d90] [formerly 86a0e3f5ee [formerly f83e2bd22a74e9604fb878a899d9a2df5fbb28eb]]
Former-commit-id: 86a0e3f5ee
Former-commit-id: 72466ef0ca
2012-02-15 14:26:22 -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
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
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
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
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
Bryan Kowal
88b67b4977 Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: a19dd6ff33 [formerly 7ca62dc7d6] [formerly 1855bbcbee [formerly 26243249e27ee347933748aa53e9436e32751d9c]]
Former-commit-id: 1855bbcbee
Former-commit-id: 27c4557e0a
2012-02-09 12:14:37 -06:00
Bryan Kowal
49f5a054e0 Issue #202 - fix deploy-install.
Former-commit-id: 8d76a78c47 [formerly 0a141d49d0] [formerly 23f61e0945 [formerly e591702f5c924e5e1ad2e335861867626a24fc2e]]
Former-commit-id: 23f61e0945
Former-commit-id: e85ed4a172
2012-02-09 11:28:22 -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
Bryan Kowal
8219ef7ce6 Issue #202 - fix deploy-install.
Former-commit-id: 0953a705b3 [formerly 8a57a8ce05] [formerly 3060ca85cc [formerly e8f28b51b70eccdf19de2075a6c5c7efb9ccedda]]
Former-commit-id: 3060ca85cc
Former-commit-id: b26d700ef4
2012-02-09 10:41:46 -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
Steve Harris
be7c691383 Merge branch '4-Thin_Client' into 104-integration
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 'created' to keep these files

Former-commit-id: e3b4b09cbe [formerly 37ca28aae8] [formerly d7e8c7fc26 [formerly ea128d2f4d9b676df50ef0d6727ff4f938f1c265]]
Former-commit-id: d7e8c7fc26
Former-commit-id: 4b3c90acde
2012-02-09 08:53:53 -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
Lee Venable
724db373e9 Merge changes I92d52e19,Ia6e18647 into 9-Wes2Bridge
* changes:
  Issue #13 Corrected valid month check - from code review Change-Id: I92d52e191749313b846871c5d8cd7c2fdc3c73c3
  Issue #13 - Modified/corrected handling of "ARCHIVE" time stamp


Former-commit-id: 65cf18fcbe [formerly 9cc539f8a4] [formerly db74c784d6 [formerly bc6f1a41c0dee1c2030d1a2c90d337ddef20b36e]]
Former-commit-id: db74c784d6
Former-commit-id: 74cd5a6f0b
2012-02-08 09:06:55 -06:00
Lee Venable
34af1403bb Merge "Issue #14 - Modified SHEF decoder components to respect the ALLOW_ARCHIVE_DATA "flag"" into 9-Wes2Bridge
Former-commit-id: 868c1517c1 [formerly a97a61c74c] [formerly 225aadb85b [formerly 0693cb12fa60f15dbea2e38347a811b7964ed8fc]]
Former-commit-id: 225aadb85b
Former-commit-id: ead1c644fd
2012-02-08 09:06:46 -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
Mike Duff
2300b2e6c7 Issue #16 - Added subdirectory to token value and fixed IndexOutOfBounds
error

Change-Id: Ie0d670487a1768a53001209be0499c3cf5e9d4c7

Former-commit-id: 504fdc8cf8 [formerly 60de2210f5] [formerly d8d84fbe2e [formerly 967c9d38fe967ab02cf620201c4fd9915f7ba3fc]]
Former-commit-id: d8d84fbe2e
Former-commit-id: 846110bac4
2012-02-07 16:46:36 -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
Steve Harris
8384400190 Merge "Issue #16 - data/manual now uses subdirectories (2)" into 9-Wes2Bridge
Former-commit-id: 0d5ce3a848 [formerly 64295a4ab4] [formerly 127aee04f8 [formerly bad345b999d31c31ff34669b8664afb8f907460f]]
Former-commit-id: 127aee04f8
Former-commit-id: 2f928d6d77
2012-02-07 16:36:34 -06:00
Mike Duff
edaff0b763 Issue #16 - data/manual now uses subdirectories (2)
Change-Id: I19786d4a39b2f7363b9eccd3ef00cd2ddf7d46fb

Former-commit-id: d3f58a0bf6 [formerly 97d5923be9] [formerly f194c39a7f [formerly 627d7e59756a5cb27a450d8839e62a9bb9995a56]]
Former-commit-id: f194c39a7f
Former-commit-id: 122937e1b2
2012-02-07 16:30:13 -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
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
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