Commit graph

6045 commits

Author SHA1 Message Date
Roger Ferrel
f04f775a66 Issue #244 Added join and refresh actions.
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20

Former-commit-id: 4854c999ed0128c8b639f8b070ec4738591d9ff4
2012-03-08 12:37:56 -06:00
Matt Nash
6f354374d6 Issue #244 added work on the chat for presence notifications
Former-commit-id: ead836fb1bc7f5843a29dc26cf3d634c80e22a81
2012-03-08 09:08:41 -06:00
Matt Nash
bbacd337b4 Merge "Issue #244 update" into 11-Collaboration
Former-commit-id: f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173
2012-03-08 08:33:32 -06:00
Roger Ferrel
2114b95a0b Issue #244 update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: 28969960d80066def0ef02930875e40d7693c234
2012-03-08 08:30:02 -06:00
James Korman
5a91d71c12 Issue #232 Initial collaboration framework plugin checkin
Former-commit-id: 2351a53e68bbc8cfe11917d202cbc5424768b5a6
2012-03-07 15:38:20 -06:00
Nate Jensen
412ceb9561 Merge "Issue #244 Inital creation" into 11-Collaboration
Former-commit-id: 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3
2012-03-06 14:27:15 -06:00
Roger Ferrel
3161380f4d Issue #244 Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4

Former-commit-id: 25cee2c90c2403e31f27b67fd49d312d31baa575
2012-03-06 14:08:39 -06:00
David Gillingham
494fbe93db Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: e2c66b33fd8c71b0da6518c419296ab8141a07e3
2012-03-05 11:23:11 -06:00
David Gillingham
0c0f659896 Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 5fc74409511903afa97949bc3cd1b3acf91c35e0
2012-03-02 13:22:46 -06:00
Max Schenkelberg
48b6d45f00 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6
2012-03-01 16:59:40 -06:00
Steve Harris
787aed90f8 Merge branch 'ss_sync' into sync_test
Former-commit-id: 7ebcf63686d75d58f8bfea92e825edaf49a30df1
2012-03-01 14:01:16 -06:00
Steve Harris
9bdea0399f Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c6eacfe2d5898deacf756f059a71b1c9f41500bb
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
7c2409eab0 Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd

Former-commit-id: 059b4fcb3224b37b4a235f57e2065b9506f29d46
2012-03-01 12:44:43 -06:00
Steve Harris
dd52eb4d40 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
c61e40c426 Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: f94248823eed52b2d9f8c56af3dc7607b323fc1e
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
d7a63995f1 Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time.
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f

Former-commit-id: d05beaa84618bc01d8cb711298523dc358bb4938
2012-02-28 15:20:37 -06:00
Steve Harris
e5b56c99ab Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: fb9d0adece5806382d0aa5c7c3e7c41f89594143
2012-02-27 15:58:49 -06:00
Steve Harris
a4538f0a48 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
637c051a23 Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2

Former-commit-id: acec1c2a23f4e27bfd0844171fdca77ff5473050
2012-02-24 14:57:23 -06:00
David Gillingham
5aa5b51a55 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: b6d7661be725d8a37a8294b0eda982208c35ecbe
2012-02-23 14:40:25 -06:00
David Gillingham
85998bc654 Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: 67aaf1c21e8372b4a84cb82cae62549502992651
2012-02-23 13:23:59 -06:00
Steve Harris
86e586befe Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
2012-02-23 12:38:55 -06:00
Steve Harris
a82f2c5750 Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
Former-commit-id: de97ce5f9b687f7404a34cac0b1fc34df5f854cb
2012-02-23 10:19:54 -06:00
Steve Harris
7a10ca9766 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: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
2012-02-23 10:06:18 -06:00
Ben Steffensmeier
55aa66a510 Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be

Former-commit-id: 8b906b245fd927ed79825b00dfba456a1c327fbb
2012-02-22 17:40:48 -06:00
Steve Harris
54be9660f1 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
9995d22e25 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
2012-02-22 10:12:49 -06:00
Steve Harris
f3fe839c1c Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: fe86fe3696731660f6b37a147194c670906cdf4f
2012-02-21 10:37:36 -06:00
Nate Jensen
ec0cd8d086 Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: ac8ad6fa074f715a4b53a66fc41267a70ccb90f8
2012-02-21 08:57:12 -06:00
Steve Harris
496cc6a06b 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: 85082f273a85a3967d54d4a489b6ea973d0688be
2012-02-20 16:38:06 -06:00
Ben Steffensmeier
73d24fad2f Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db

Former-commit-id: e0f697c492eecff4bb8d83d05efbcaf2876125c9
2012-02-20 15:28:20 -06:00
Steve Harris
5e9d2dd367 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: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
2012-02-20 13:03:39 -06:00
Steve Harris
d02529fef4 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: ad74b15c5cab1f5275521f18ee67d30f199a8f95
2012-02-20 12:54:25 -06:00
Steve Harris
cc66c8be24 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
2012-02-20 12:43:38 -06:00
Steve Harris
c825bd03a2 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: aaf3d445f517bba03e9f6b768850f2a8c77d26ed
2012-02-20 07:49:13 -06:00
Steve Harris
b137302802 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
3e3e4bd4e3 Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0

Former-commit-id: 04a68e6815001450fece9bb5fbf6ce99143e2d05
2012-02-16 16:36:56 -06:00
Steve Harris
64ddef69b6 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: d3ca90194ff9d361ba9ff7679c2f4da43a439de4
2012-02-16 14:23:01 -06:00
Ben Steffensmeier
8cf7360e3b Issue #343 remove extra perspectives when in thinclient component
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee

Former-commit-id: cb03ef54be5e9dae57d758903f6956a8c2a9a617
2012-02-15 17:10:34 -06:00
Steve Harris
2e29bc8ee2 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: f70d42ad051ba56da8d8f28213b07c292e7f2549
2012-02-14 15:54:46 -06:00
David Gillingham
061966f243 Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

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

Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Former-commit-id: 47750dfd5e387238f409ead55549cbb24f5afbe1
2012-02-13 16:09:36 -06:00
Nate Jensen
06327646d9 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
c77b9558e1 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
f7985bff7b 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
Ben Steffensmeier
6bfd8ccfee 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
Steve Harris
f693b6d0a7 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: d31ccf5832bf2b2ccfe29126deb4da80806c6739
2012-02-09 08:54:18 -06:00
Ben Steffensmeier
3f60daa9c7 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
Matt Nash
25b9659dc7 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
bb4f690393 Issue #26 fix gage color for hydro to refresh
Former-commit-id: 1a8d135e07c56e8ac202c01e7aa866290b28b0a4
2012-02-07 16:49:34 -06:00
Max Schenkelberg
fe59c3e8d8 Issue #206 fixed dialog context deactivation bug
Former-commit-id: b2b66e7483065e9677d8bd34f19b514c7914ef8c
2012-02-07 16:45:59 -06:00