xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
388 commits 31 branches 40 tags 3.8 GiB
Commit graph

388 commits

This branch
This branch
All branches
Author SHA1 Message Date
Max Schenkelberg
3fe183277b Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: e8846fa2b5aa1ef2972f134a683246bc275a8067
 2012-05-01 18:36:09 -05:00
Steve Harris
2ed7249613 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 
used git cherry-pick -m 1 879a2e0

Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Conflicts:

	ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java


Former-commit-id: 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9
 2012-05-01 18:31:09 -05:00
Steve Harris
9f8cb727a5 12.4.1-10 baseline 
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
 2012-05-01 18:06:13 -05:00
Max Schenkelberg
1294fa0ca1 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: bd93246cccd1b123598006d7343eac265392695d
 2012-04-19 11:11:34 -05:00
Steve Harris
4d7572a632 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Former-commit-id: 5e1b9319941eed516a08a135a2049c14bad77863
 2012-04-19 11:11:02 -05:00
Steve Harris
67a5a68300 12.4.1-4 baseline 
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
 2012-04-18 15:18:16 -05:00
Max Schenkelberg
9b0d01f8b5 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885
 2012-03-30 10:51:31 -05:00
Steve Harris
d3ad6095b7 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Former-commit-id: 879a2e0a4a31999bf4d624ff59e77bbd68195458
 2012-03-30 09:50:48 -05:00
Steve Harris
4068f5295f 12.3.1-10 baseline 
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
 2012-03-30 08:38:33 -05:00
Steve Harris
70357d90bc Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: e68338cecbe85a62835633e9aba0925344fb80f1
 2012-03-29 10:03:05 -05:00
Steve Harris
132d68acc6 Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync 
Former-commit-id: 296cc5a5a6bcc45cd92198a045a88620d7d18653
 2012-03-29 10:01:55 -05:00
Max Schenkelberg
15a9245592 Issue #358 Made wireframe shapes rely more on the grid geoemtry of the 
descriptor than the actual descriptor as the descriptor is used purely
for convenience 

Former-commit-id: 265ccb3e22aa0122dbd74e83d0af202596c1941c
 2012-03-28 13:32:04 -05:00
Max Schenkelberg
cd6ebd80d4 Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in 
case of "NO DATA"

Former-commit-id: 89521a4df36d18ecb64b4cce248f150f0a0e4957
 2012-03-16 10:13:31 -05:00
Max Schenkelberg
cc111ab9ac Issue #358 Fixed sampling issue with mosaic resource with best 
res resources

Former-commit-id: 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0
 2012-03-16 09:03:50 -05:00
Max Schenkelberg
719f87c261 Issue #358 Fixed painting and sampling regression in radar mosaic due to 
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements

Former-commit-id: f739d79bfd547adc295c716a1804f55f09b1bde1
 2012-03-14 18:03:44 -05:00
Max Schenkelberg
6e5964df9d Issue #358 Cleaned up mesh extension and API to use geotools for 
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 7e4abe637edacca71e1e1c98d99521cd33415fb0
 2012-03-14 09:49:32 -05:00
David Gillingham
e13850a2b6 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process. 
Former-commit-id: 727e2b19688397ea4608a2b6ca3fda3222b6ad36
 2012-03-13 12:31:38 -05:00
Bryan Kowal
58bfa62981 Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined. 
Former-commit-id: eaa45d7123c43590be3d58fdf845708ade2dbb51
 2012-03-12 11:43:34 -05:00
Max Schenkelberg
d43b0456d8 Issue #358 Merging core drawing API improvements from Collaboration 
Former-commit-id: a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904
 2012-03-09 12:31:50 -06:00
Bryan Kowal
fc1ca4efcc Issue #202 - increment the awips2-qpid release so yum will update the qpid installation. 
Former-commit-id: ff79422d30a93ca71fc83e38e0368e499a34dd59
 2012-03-08 09:00:55 -06:00
David Gillingham
90a745a037 Issue #361: Use queueCreator.sh to build the new ISC data receive QPID 
queue.

Former-commit-id: cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08
 2012-03-07 16:05:54 -06:00
Bryan Kowal
4d8d3d4d00 Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git. 
Former-commit-id: 75cac6f9bf1dc237c4131e47912c595adb6aa0d7
 2012-03-07 10:22:40 -06:00
David Gillingham
9a75c87829 Issue #361: Fine tune synchronization in GfeScriptExecutor to prevent 
massive backups in access to GfeScript instance map.

Issue #361: Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs.

Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e

Former-commit-id: 679996850315f699d47633da5baf593c72ba7927
 2012-03-06 16:24:58 -06:00
David Gillingham
ff231f33f4 Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec 
asynchronously.

Former-commit-id: 26161f9fd457f02b4df8780750064aeb27fc7ba1
 2012-03-05 16:49:23 -06:00
Bryan Kowal
5228de77e2 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. 
Former-commit-id: a5229ac02bb3c7e177b26dae68902321c9de986c
 2012-03-05 13:46:10 -06:00
David Gillingham
d68e3a7eea Issue #354: Refactor AbstractParmManager to better handle ISC parm 
pre-loading.

Former-commit-id: e2c66b33fd8c71b0da6518c419296ab8141a07e3
 2012-03-05 11:23:11 -06:00
Max Schenkelberg
0cf00cb7f4 Issue #358 merged esb.camel project for plot update compatibility 
Former-commit-id: ba90282320443c6c41c3188db9f43ffb11399bdd
 2012-03-02 13:26:44 -06:00
David Gillingham
f6f0ca24df 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
f96ff96259 Issue #358 merged dataURI changes from thinclient in for plot 
compatibility

Former-commit-id: 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de
 2012-03-02 12:24:19 -06:00
Max Schenkelberg
ae47d9683e 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
951ecfe3dd Merge branch 'ss_sync' into sync_test 
Former-commit-id: 7ebcf63686d75d58f8bfea92e825edaf49a30df1
 2012-03-01 14:01:16 -06:00
Steve Harris
c21bd2719c Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: c6eacfe2d5898deacf756f059a71b1c9f41500bb
 2012-03-01 13:19:04 -06:00
Ben Steffensmeier
49cce84edf 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
703cb6e748 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e
 2012-02-29 16:08:39 -06:00
Ben Steffensmeier
5c303ed189 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
5dee50e7e9 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
aa597242f9 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f
 2012-02-27 11:32:49 -06:00
Ben Steffensmeier
357dc4d88b 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
Bryan Kowal
1e3e31a657 Issue #202 - remove obsolete edex prefix verifications. 
Former-commit-id: 6984db8c852a552867b1b8159637d96dcd83ab5a
 2012-02-23 16:46:48 -06:00
David Gillingham
d79f7e9613 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
Bryan Kowal
bae0cb555e Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp. 
Former-commit-id: 10339dcba7c9ae535766e5c5dddac57ddb3f99c4
 2012-02-23 14:20:50 -06:00
Steve Harris
9ef773822f Merge branch 'ss_sync' 
Former-commit-id: 5ed747b42f001de0c6d08b5fb6f77a192f2e9a03
 2012-02-23 13:32:19 -06:00
David Gillingham
32b2c06988 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
eeddaa55f5 Merge branch '10-Tech_Blocked' into 104-integration 
Former-commit-id: 72fce6fda1b07320cc79fbf8f09cc47ffbe32e89
 2012-02-23 13:18:50 -06:00
Steve Harris
d6b489e69e Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: fee006734577fd51f05ca5e9ce211d36d2b9fe57
 2012-02-23 13:18:15 -06:00
Steve Harris
f081d1a6d4 Merge branch 'ss_sync' into 10-Tech_Blocked 
Former-commit-id: 5aa15dec35cf72a46288613e42e6cb02b94320a6
 2012-02-23 13:17:26 -06:00
Steve Harris
f9baa1c98c Merge branch 'ss_sync' into 4-Thin_Client 
Former-commit-id: 2059372e90437312cf12f06de6c84d0824fb586c
 2012-02-23 13:16:35 -06:00
Steve Harris
c502603907 removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore 
Former-commit-id: cccea1aa13ad987a8c1f2b06c2dfcaa77967544d
 2012-02-23 12:45:50 -06:00
Steve Harris
dcadf7baa4 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
Nate Jensen
e3e44707a4 Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client 
Former-commit-id: fd448c2a996aef215802dc501b68d28747f66414
 2012-02-23 11:50:39 -06:00