Max Schenkelberg
3beecc1cdf
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 89f603f448
[formerly d43b0456d8
[formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]
Former-commit-id: d43b0456d8
Former-commit-id: 18805c68f7
2012-03-09 12:31:50 -06:00
Roger Ferrel
118c5abe09
Issue #244 Bug Fix.
...
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c
Former-commit-id: d17ef23899
[formerly be9fe19d9a
[formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]]
Former-commit-id: be9fe19d9a
Former-commit-id: 1871be89e7
2012-03-08 17:16:48 -06:00
Roger Ferrel
c8b8a30875
Issue #244 Added join and refresh actions.
...
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20
Former-commit-id: f04f775a66
[formerly f492b082dc
[formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]]
Former-commit-id: f492b082dc
Former-commit-id: 71a5524380
2012-03-08 12:37:56 -06:00
Matt Nash
b8cb02de4c
Issue #244 added work on the chat for presence notifications
...
Former-commit-id: 6f354374d6
[formerly d264743199
[formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]
Former-commit-id: d264743199
Former-commit-id: c96c33169b
2012-03-08 09:08:41 -06:00
Matt Nash
b73877e9a5
Merge "Issue #244 update" into 11-Collaboration
...
Former-commit-id: bbacd337b4
[formerly 04ae9b48ea
[formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]
Former-commit-id: 04ae9b48ea
Former-commit-id: 1e4472cd78
2012-03-08 08:33:32 -06:00
Roger Ferrel
b1a69aafff
Issue #244 update
...
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105
Former-commit-id: 2114b95a0b
[formerly c9459e2e8c
[formerly 28969960d80066def0ef02930875e40d7693c234]]
Former-commit-id: c9459e2e8c
Former-commit-id: c22d5ef573
2012-03-08 08:30:02 -06:00
James Korman
373f5b4060
Issue #232 Initial collaboration framework plugin checkin
...
Former-commit-id: 5a91d71c12
[formerly 526a2633ce
[formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]
Former-commit-id: 526a2633ce
Former-commit-id: 4368616970
2012-03-07 15:38:20 -06:00
Nate Jensen
a448a80004
Merge "Issue #244 Inital creation" into 11-Collaboration
...
Former-commit-id: 412ceb9561
[formerly f950b30463
[formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]]
Former-commit-id: f950b30463
Former-commit-id: 13228ab7cc
2012-03-06 14:27:15 -06:00
Roger Ferrel
5e63f5b576
Issue #244 Inital creation
...
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4
Former-commit-id: 3161380f4d
[formerly c26e98376e
[formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]
Former-commit-id: c26e98376e
Former-commit-id: c62418dcf3
2012-03-06 14:08:39 -06:00
David Gillingham
364b9e19b3
Issue #354 : Refactor AbstractParmManager to better handle ISC parm
...
pre-loading.
Former-commit-id: 494fbe93db
[formerly d68e3a7eea
[formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]
Former-commit-id: d68e3a7eea
Former-commit-id: 1908212c27
2012-03-05 11:23:11 -06:00
David Gillingham
87de9d067b
Issue #346 : Convert GFE to use identity-based ListenerLists, increase
...
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: 0c0f659896
[formerly f6f0ca24df
[formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]
Former-commit-id: f6f0ca24df
Former-commit-id: bd01975367
2012-03-02 13:22:46 -06:00
Max Schenkelberg
fe1811c167
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: 48b6d45f00
[formerly ae47d9683e
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]
Former-commit-id: ae47d9683e
Former-commit-id: e2cd95d3f4
2012-03-01 16:59:40 -06:00
Steve Harris
994e79cfb3
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 787aed90f8
[formerly 951ecfe3dd
[formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]
Former-commit-id: 951ecfe3dd
Former-commit-id: 3b9c3e3474
2012-03-01 14:01:16 -06:00
Steve Harris
5bf956755a
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 9bdea0399f
[formerly c21bd2719c
[formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]
Former-commit-id: c21bd2719c
Former-commit-id: 8794c4bcf6
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
5395e71757
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: 7c2409eab0
[formerly 49cce84edf
[formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]
Former-commit-id: 49cce84edf
Former-commit-id: aa90109f45
2012-03-01 12:44:43 -06:00
Steve Harris
27fb50d455
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: dd52eb4d40
[formerly 703cb6e748
[formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]
Former-commit-id: 703cb6e748
Former-commit-id: 98d1fbeb0e
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
07d98eb7dc
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: c61e40c426
[formerly 5c303ed189
[formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]
Former-commit-id: 5c303ed189
Former-commit-id: 56d97c95d5
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
7c3545170d
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: d7a63995f1
[formerly 5dee50e7e9
[formerly d05beaa84618bc01d8cb711298523dc358bb4938]]
Former-commit-id: 5dee50e7e9
Former-commit-id: 3713d7a181
2012-02-28 15:20:37 -06:00
Steve Harris
6d01784115
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: e5b56c99ab
[formerly 9b67525e95
[formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]
Former-commit-id: 9b67525e95
Former-commit-id: 24059a5b4e
2012-02-27 15:58:49 -06:00
Steve Harris
e08a6e4b1c
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: a4538f0a48
[formerly aa597242f9
[formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]
Former-commit-id: aa597242f9
Former-commit-id: c45e7b888c
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
8fd9d92f0a
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 637c051a23
[formerly 357dc4d88b
[formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]
Former-commit-id: 357dc4d88b
Former-commit-id: 20481daa1b
2012-02-24 14:57:23 -06:00
David Gillingham
586f77e788
Issue #346 : Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
...
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: 5aa5b51a55
[formerly d79f7e9613
[formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]
Former-commit-id: d79f7e9613
Former-commit-id: ef903bc728
2012-02-23 14:40:25 -06:00
David Gillingham
adfd42b5ce
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 85998bc654
[formerly 32b2c06988
[formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]
Former-commit-id: 32b2c06988
Former-commit-id: 5a8ba0f0fb
2012-02-23 13:23:59 -06:00
Steve Harris
0be3703c7e
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: 86e586befe
[formerly dcadf7baa4
[formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]
Former-commit-id: dcadf7baa4
Former-commit-id: 4981170462
2012-02-23 12:38:55 -06:00
Steve Harris
ed66d12d24
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: a82f2c5750
[formerly 957d232286
[formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]
Former-commit-id: 957d232286
Former-commit-id: c0c0acfbe8
2012-02-23 10:19:54 -06:00
Steve Harris
5a96582f16
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: 7a10ca9766
[formerly d0bbbfefcc
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: d0bbbfefcc
Former-commit-id: 92084b3f20
2012-02-23 10:06:18 -06:00
Ben Steffensmeier
13ecc7e4ea
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 55aa66a510
[formerly 06c9d4cdcf
[formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]
Former-commit-id: 06c9d4cdcf
Former-commit-id: b776d953d7
2012-02-22 17:40:48 -06:00
Steve Harris
829d2791e9
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 54be9660f1
[formerly c8aae98741
[formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: c8aae98741
Former-commit-id: 8da36046de
2012-02-22 11:14:43 -06:00
Steve Harris
a811ac888f
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 9995d22e25
[formerly 94c2ea985b
[formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 94c2ea985b
Former-commit-id: 85075e6107
2012-02-22 10:12:49 -06:00
Steve Harris
aee8ef48fe
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: f3fe839c1c
[formerly 84926c80be
[formerly fe86fe3696731660f6b37a147194c670906cdf4f]]
Former-commit-id: 84926c80be
Former-commit-id: 2c12c02910
2012-02-21 10:37:36 -06:00
Nate Jensen
f17df86ba3
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
...
Former-commit-id: ec0cd8d086
[formerly b90611d995
[formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]
Former-commit-id: b90611d995
Former-commit-id: ba5b1ee03f
2012-02-21 08:57:12 -06:00
Steve Harris
121ec88a98
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: 496cc6a06b
[formerly b89ebc5e01
[formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]
Former-commit-id: b89ebc5e01
Former-commit-id: ec0f1aebfc
2012-02-20 16:38:06 -06:00
Ben Steffensmeier
1c1500408b
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 73d24fad2f
[formerly 69e8cde115
[formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]
Former-commit-id: 69e8cde115
Former-commit-id: 27973ec694
2012-02-20 15:28:20 -06:00
Steve Harris
eda787edea
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: 5e9d2dd367
[formerly cabf9fd956
[formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: cabf9fd956
Former-commit-id: d971880b98
2012-02-20 13:03:39 -06:00
Steve Harris
cc45f5a268
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: d02529fef4
[formerly 6a064cb78b
[formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]
Former-commit-id: 6a064cb78b
Former-commit-id: a2fd2cf6fa
2012-02-20 12:54:25 -06:00
Steve Harris
d129eab241
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: cc66c8be24
[formerly 4b76d22f77
[formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: 4b76d22f77
Former-commit-id: c268da57bc
2012-02-20 12:43:38 -06:00
Steve Harris
f3cee62470
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c825bd03a2
[formerly 62c587b841
[formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]
Former-commit-id: 62c587b841
Former-commit-id: e3535054ff
2012-02-20 07:49:13 -06:00
Steve Harris
7b4b066a2b
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: b137302802
[formerly 93f6535bd8
[formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: 93f6535bd8
Former-commit-id: c209d6de36
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
be6c430985
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
...
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 3e3e4bd4e3
[formerly 26d82729c9
[formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]]
Former-commit-id: 26d82729c9
Former-commit-id: 38993f5a5a
2012-02-16 16:36:56 -06:00
Steve Harris
dc6e74757a
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 64ddef69b6
[formerly e2989d1a9f
[formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]]
Former-commit-id: e2989d1a9f
Former-commit-id: c26a22cfb7
2012-02-16 14:23:01 -06:00
Ben Steffensmeier
7abc89a7d0
Issue #343 remove extra perspectives when in thinclient component
...
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 8cf7360e3b
[formerly 28c7e6bc22
[formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]]
Former-commit-id: 28c7e6bc22
Former-commit-id: 0104e1970d
2012-02-15 17:10:34 -06:00
Steve Harris
c2a47087ce
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2e29bc8ee2
[formerly 2119a1513e
[formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]
Former-commit-id: 2119a1513e
Former-commit-id: 46dda7b8bd
2012-02-14 15:54:46 -06:00
David Gillingham
a10e6766d8
Issue #20 : Committing refactored archiver capability
...
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20 : Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: 061966f243
[formerly bb1ac9959b
[formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]
Former-commit-id: bb1ac9959b
Former-commit-id: 535821e5b8
2012-02-13 16:09:36 -06:00
Nate Jensen
b95dd7bc43
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
...
Former-commit-id: 06327646d9
[formerly da7d13d933
[formerly ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9]]
Former-commit-id: da7d13d933
Former-commit-id: 364cd8f5fc
2012-02-13 11:40:36 -06:00
Bryan Kowal
2f80fdcd73
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: c77b9558e1
[formerly 34d9122f14
[formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]]
Former-commit-id: 34d9122f14
Former-commit-id: 8e552ca56f
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
ced66f23a5
Issue #235 add an export menu to cave to handle screen capture, print, and displays
...
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: f7985bff7b
[formerly ebbbd0bafc
[formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]]
Former-commit-id: ebbbd0bafc
Former-commit-id: 6e95175ba2
2012-02-10 12:13:34 -06:00
Ben Steffensmeier
8a5a87c2b1
Issue #235 Added ability to capture multiple frames to NSharp
...
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 6bfd8ccfee
[formerly 5cdcd5a261
[formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]
Former-commit-id: 5cdcd5a261
Former-commit-id: 08e8343d98
2012-02-09 10:54:02 -06:00
Steve Harris
60b350f7f2
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: f693b6d0a7
[formerly 1002555dbd
[formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]
Former-commit-id: 1002555dbd
Former-commit-id: 695e2979c3
2012-02-09 08:54:18 -06:00
Ben Steffensmeier
d9a3c84933
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
...
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: 3f60daa9c7
[formerly 863fa0f635
[formerly b7b3a581e8291313833b20da308f5adc5a234f26]]
Former-commit-id: 863fa0f635
Former-commit-id: ddd5ee68ad
2012-02-08 16:29:02 -06:00
Matt Nash
6a2add04e9
Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
...
Former-commit-id: 25b9659dc7
[formerly e52a1315b2
[formerly ac489b3dc676f7f202991906e0b004baa074dfe0]]
Former-commit-id: e52a1315b2
Former-commit-id: ce5baf0632
2012-02-08 08:53:19 -06:00