Commit graph

89 commits

Author SHA1 Message Date
Steve Harris
64b3ba9d2b Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 7b981a7bb3e35d9147bf686150e5ed91e5b22d79
2012-02-15 15:09:30 -06:00
Steve Harris
272ba87883 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 14c8ac5618aa04da5408a1d75297f3f9fa19d023
2012-02-15 15:08:58 -06:00
Steve Harris
b9f4780fcb 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: 0c520ee63a42d53754686f52ffa5b94a0fe4eea1
2012-02-15 14:39:43 -06:00
Steve Harris
05c0347d90 Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
Former-commit-id: f83e2bd22a74e9604fb878a899d9a2df5fbb28eb
2012-02-15 14:26:22 -06:00
Steve Harris
5e47f8c33a Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: ab787c94408e85afe2d92c3f860b7b9bd271c616
2012-02-15 12:54:54 -06:00
Bryan Kowal
38eb4bd2b6 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: 1dd23c4dea214938fe9660f303458c5f08efdc01
2012-02-15 10:31:58 -06:00
Steve Harris
2119a1513e Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: f70d42ad051ba56da8d8f28213b07c292e7f2549
2012-02-14 15:54:46 -06:00
Steve Harris
7a28b5ea62 Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 70f1516d0cc4dcd62214453974f1e65dd57d1ddd
2012-02-14 15:47:32 -06:00
Ben Steffensmeier
944e59e989 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: 518db101f2ec18afa31a5b12fbaab3bbb903013b
2012-02-14 15:46:11 -06:00
Steve Harris
3973ed2360 Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
Former-commit-id: e8e020e3bd86ffcd918366990d605acee8bd6a80
2012-02-14 15:41:54 -06:00
Ben Steffensmeier
97000f0738 Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce

Former-commit-id: 78deeca92b5916c7c57b1f866e9be2e11992c13d
2012-02-14 15:39:50 -06:00
Nate Jensen
daeda3f898 Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 1135f27699b49795352ae5b1b31ac9fe06c564b6
2012-02-14 13:06:27 -06:00
Ben Steffensmeier
100b4c4ba0 Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58

Former-commit-id: 32b8f723ebf64d97636705911c0b7b22a9cd2148
2012-02-14 12:59:42 -06:00
Greg Armendariz
cb16a5256a 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: 41ed9251ca6ef83a6de3362c52acaa21dd00da3d
2012-02-13 15:02:29 -06:00
Bryan Kowal
67562b0674 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: de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122
2012-02-13 13:57:10 -06:00
Nate Jensen
da7d13d933 Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
Former-commit-id: ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9
2012-02-13 11:40:36 -06:00
Bryan Kowal
34d9122f14 Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
Former-commit-id: 00ce48c7698c9baad8a3ab643d39858c47c18226
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
ebbbd0bafc Issue #235 add an export menu to cave to handle screen capture, print, and displays
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98

Former-commit-id: 622a02770dc84c8cedd9707b741f5f1e2b6ab81d
2012-02-10 12:13:34 -06:00
Bryan Kowal
7ca62dc7d6 Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: 26243249e27ee347933748aa53e9436e32751d9c
2012-02-09 12:14:37 -06:00
Bryan Kowal
0a141d49d0 Issue #202 - fix deploy-install.
Former-commit-id: e591702f5c924e5e1ad2e335861867626a24fc2e
2012-02-09 11:28:22 -06:00
Ben Steffensmeier
5cdcd5a261 Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc

Former-commit-id: 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f
2012-02-09 10:54:02 -06:00
Bryan Kowal
8a57a8ce05 Issue #202 - fix deploy-install.
Former-commit-id: e8f28b51b70eccdf19de2075a6c5c7efb9ccedda
2012-02-09 10:41:46 -06:00
Steve Harris
1002555dbd Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: d31ccf5832bf2b2ccfe29126deb4da80806c6739
2012-02-09 08:54:18 -06:00
Steve Harris
37ca28aae8 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: ea128d2f4d9b676df50ef0d6727ff4f938f1c265
2012-02-09 08:53:53 -06:00
Ben Steffensmeier
863fa0f635 Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9

Former-commit-id: b7b3a581e8291313833b20da308f5adc5a234f26
2012-02-08 16:29:02 -06:00
Steve Harris
4eef9c3c20 Merge "Issue #192 gitignore changes" into ss_sync
Former-commit-id: e019344c6f96c6db35ede5985779eab537df523c
2012-02-08 09:09:28 -06:00
Matt Nash
e52a1315b2 Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
Former-commit-id: ac489b3dc676f7f202991906e0b004baa074dfe0
2012-02-08 08:53:19 -06:00
Matt Nash
f7652d25e3 Issue #26 fix gage color for hydro to refresh
Former-commit-id: 1a8d135e07c56e8ac202c01e7aa866290b28b0a4
2012-02-07 16:49:34 -06:00
Max Schenkelberg
9535ae2d0e Issue #206 fixed dialog context deactivation bug
Former-commit-id: b2b66e7483065e9677d8bd34f19b514c7914ef8c
2012-02-07 16:45:59 -06:00
Matt Nash
81ec1d5dac Merge "Issue #206 - Fixed loading and disposing bugs in tear off menus" into 10-Tech_Blocked
Former-commit-id: 65ce29e9b3721e7eef2a9ec842404252ead2d3ba
2012-02-07 16:13:03 -06:00
Max Schenkelberg
370e20f0ae 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: 875c90104e80d95798956330e24b59d83ef52942
2012-02-07 16:12:19 -06:00
Ben Steffensmeier
e904dadb5e Issue #235 Ability to screen capture or print multiple frames at once.
Change-Id: I58176883e701fbe0d9e0bcc0e43b60bd5c0053a7

Former-commit-id: 9062fe4b8fdb62840b21aba7c648f48fa691986a
2012-02-07 15:33:23 -06:00
Matt Nash
f4c5d7f94b Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
Former-commit-id: c12bae0a615198f6d409cf5e6d79a6a32e57494d
2012-02-07 11:45:28 -06:00
Nate Jensen
a25342a5c8 Merge "Issue #176 fix PersistablePluginDataObject" into 4-Thin_Client
Former-commit-id: fd1087a87366dfd51789c50ee56c4b43e3404f11
2012-02-07 09:47:46 -06:00
Nate Jensen
00cf561d88 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: b28fce87e699357d5ec463fbda5a48590d590560
2012-02-07 09:45:28 -06:00
Ben Steffensmeier
20247d0d89 Issue #176 fix PersistablePluginDataObject
Change-Id: I29f37b0fceb180eb0950ff1e00c44eb94b05f82e

Former-commit-id: 34eb69e6ead3aa811c018e364517998d356e4feb
2012-02-07 09:42:07 -06:00
Ben Steffensmeier
a1455f9c7d Issue #229 make sure default cache directory exists when opening the preference page.
Change-Id: I25ba5cba8c74b764e39c1a42c78ee14f861ba283

Former-commit-id: 0a4001bf8c3ef6272cd52ad8706e104235de4417
2012-02-06 17:16:52 -06:00
Ben Steffensmeier
324b358c44 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: 2b0f9f149c4dc2031cb9178538899eb3f9f5de23
2012-02-06 16:55:48 -06:00
Ben Steffensmeier
f016be988e Issue #176 pull changes to insert and persist time from the WES2Bridge branch.
Change-Id: If82378f4d8ccf867a5078682893ce65591ea04b4

Former-commit-id: 500f3f03f5260cff3417021776204ccf6c035415
2012-02-03 17:33:32 -06:00
Matt Nash
5fdadf4333 Issue #192 gitignore changes
Former-commit-id: 68f511221d4b198be50e1cf2a81723b8c3578a61
2012-02-03 15:03:21 -06:00
Matt Nash
542049e455 Issue #26 tear off menu changes to fix issues
Former-commit-id: 30c43cbcd4500c5754261b420f5c9b031bd63014
2012-02-03 13:13:15 -06:00
Ben Steffensmeier
d35d365b7f Issue #230 fix scaling problems with printing to high dpi printers
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f

Former-commit-id: 22418489fd697c94b2350d79e7701c8399842e2e
2012-02-03 12:49:59 -06:00
Max Schenkelberg
f131667c9e Issue #29 Fixed issue with radar menu dispose
Former-commit-id: 279c4037f9f6fbefe53bc12cbf82017daa3399d2
2012-02-02 16:53:53 -06:00
Matt Nash
c966b7d8fd Issue #26 radio buttons hopefully gerrit doesn't screw this up
Change-Id: I5ebc3356f83b3f5eb213cb659badd5ae93694d11

Former-commit-id: c03b20a3c52a7570133a972a8c915bffd167f733
2012-02-02 15:32:33 -06:00
Max Schenkelberg
84ead088ca Issue #206 Fixed issue with local radar menu items getting disposed
Former-commit-id: 07b72ce297ec52811439d03b4e753f5959eeb532
2012-02-02 14:24:19 -06:00
Ben Steffensmeier
0d9fa5ea6c Issue #211 change point requests to correctly return null responses when there are no matching pdos.
Change-Id: I88e6ba5734aa55af76c3b417eea9336eef7bf08a

Former-commit-id: 2cd24c7e679b4f7002664d2588dd8bc54c7cebd0
2012-02-01 17:39:14 -06:00
Matt Nash
4ee3ccb133 Issue #26 fix the issue with the checkboxes out of sync
Change-Id: Ibeb05ddfc4a495d3d56a9d3c6bcc64c3494e3d32

Former-commit-id: b1032a5a6bf24fcc4a0cf48ad6f2955adcaf0480
2012-02-01 17:32:51 -06:00
Matt Nash
54d27a840f Merge "Issue #206 Made tear off menu dialog activate contexts for perspective" into 10-Tech_Blocked
Former-commit-id: 1ca26738cc10a37119b939a405987198245a4d65
2012-02-01 17:13:10 -06:00
Max Schenkelberg
5f8d30bb43 Issue #206 Made tear off menu dialog activate contexts for perspective
Former-commit-id: 56103eb133de5325d62bb3453b2353e5d5e23ddd
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
fc541f61a7 Issue #229 moving caches into the caveData directory
Change-Id: I3d502ef858939738adf1835d2292f55e2b3edc44

Former-commit-id: a499df61044947aaf40ac118e1476f41736419b0
2012-02-01 15:26:34 -06:00