Max Schenkelberg
f20e674318
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 9b0d01f8b59b0d01f8b507cf5069ba993cac891e
2012-03-30 10:51:31 -05:00
Steve Harris
9fee09c9e4
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: d3ad6095b7d3ad6095b75cdda77afb6aa18f74f6
2012-03-30 09:50:48 -05:00
Steve Harris
2e0f4b241b
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f4068f5295f22bd792cd9ce3b74c605
2012-03-30 08:38:33 -05:00
Steve Harris
5a310acb18
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 70357d90bc70357d90bca0abcf81206884520750
2012-03-29 10:03:05 -05:00
Steve Harris
2f6a9ef2ac
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
...
Former-commit-id: 132d68acc6132d68acc654a1d9cdbc4b853c56c6
2012-03-29 10:01:55 -05:00
Max Schenkelberg
2f3b9f0067
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: 15a924559215a9245592f10f1a5319ac11dd0c18
2012-03-28 13:32:04 -05:00
Max Schenkelberg
645900727c
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: cd6ebd80d4cd6ebd80d4b9085db25d954073b38c
2012-03-16 10:13:31 -05:00
Max Schenkelberg
a3bda1957c
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: cc111ab9accc111ab9ac258d57e8251e5c074e3b
2012-03-16 09:03:50 -05:00
Max Schenkelberg
682aca1dda
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: 719f87c261719f87c261556a270a09ba8af4dcc1
2012-03-14 18:03:44 -05:00
Max Schenkelberg
6378e8c4ee
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: 6e5964df9d6e5964df9d50765e8a34cf440b3884
2012-03-14 09:49:32 -05:00
David Gillingham
2d82185a1d
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: e13850a2b6e13850a2b6d433b7d4d62b5588bd1e
2012-03-13 12:31:38 -05:00
Bryan Kowal
6851775548
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: 58bfa6298158bfa6298166e05f4c963b97383354
2012-03-12 11:43:34 -05:00
Max Schenkelberg
1303289d12
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: d43b0456d8d43b0456d889f603f4484662ece060
2012-03-09 12:31:50 -06:00
Bryan Kowal
4c87af89f9
Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
...
Former-commit-id: fc1ca4efccfc1ca4efccb871752e3a638d2c964b
2012-03-08 09:00:55 -06:00
David Gillingham
b70345182d
Issue #361 : Use queueCreator.sh to build the new ISC data receive QPID
...
queue.
Former-commit-id: 90a745a03790a745a03778c7f290968a86e910aa
2012-03-07 16:05:54 -06:00
Bryan Kowal
2cc79e1acb
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: 4d8d3d4d004d8d3d4d00c803afd454033a4e237b
2012-03-07 10:22:40 -06:00
David Gillingham
2f723abcb7
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: 9a75c878299a75c878293cfa029f4b1818e488c5
2012-03-06 16:24:58 -06:00
David Gillingham
773b6c7af6
Issue #361 : Refactor IscDataRecRequest handler to execute iscDataRec
...
asynchronously.
Former-commit-id: ff231f33f4ff231f33f41d698675948c0b121cbc
2012-03-05 16:49:23 -06:00
Bryan Kowal
faa13ee9f7
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 5228de77e25228de77e2793dad571181f778e43a
2012-03-05 13:46:10 -06:00
David Gillingham
ad8efe180e
Issue #354 : Refactor AbstractParmManager to better handle ISC parm
...
pre-loading.
Former-commit-id: d68e3a7eead68e3a7eea494fbe93dbbc61eb1e43
2012-03-05 11:23:11 -06:00
Max Schenkelberg
b1a521b17e
Issue #358 merged esb.camel project for plot update compatibility
...
Former-commit-id: 0cf00cb7f40cf00cb7f476e7a02f76e27d36432a
2012-03-02 13:26:44 -06:00
David Gillingham
788007ff63
Issue #346 : Convert GFE to use identity-based ListenerLists, increase
...
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: f6f0ca24dff6f0ca24df0c0f659896b3df043f97
2012-03-02 13:22:46 -06:00
Max Schenkelberg
28052629c8
Issue #358 merged dataURI changes from thinclient in for plot
...
compatibility
Former-commit-id: f96ff96259f96ff962591f714b1a5be4914cbe89
2012-03-02 12:24:19 -06:00
Max Schenkelberg
585e979c76
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: ae47d9683eae47d9683e48b6d45f003212cc6ebb
2012-03-01 16:59:40 -06:00
Steve Harris
376edad3c9
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 951ecfe3dd951ecfe3dd787aed90f8db45babec8
2012-03-01 14:01:16 -06:00
Steve Harris
6cdedca0a3
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c21bd2719cc21bd2719c9bdea0399f6f5c182af0
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
e0ad3aee33
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: 49cce84edf49cce84edf7c2409eab03220ee4745
2012-03-01 12:44:43 -06:00
Steve Harris
a4d8f58c90
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 703cb6e748703cb6e748dd52eb4d4006baad5169
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
588432f980
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 5c303ed1895c303ed189c61e40c42684e6c9beb8
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
7d4367ee7a
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: 5dee50e7e95dee50e7e9d7a63995f1e52c2ffb20
2012-02-28 15:20:37 -06:00
Steve Harris
ba4a6aa434
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: aa597242f9aa597242f9a4538f0a48fdd6018d1a
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
0b4134f364
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 357dc4d88b357dc4d88b637c051a2362f1ea0aac
2012-02-24 14:57:23 -06:00
Bryan Kowal
8350501de4
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: 1e3e31a6571e3e31a657c2cd292c3249a30a5b1a
2012-02-23 16:46:48 -06:00
David Gillingham
85c082f1e9
Issue #346 : Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
...
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: d79f7e9613d79f7e96135aa5b51a55f9ed20bada
2012-02-23 14:40:25 -06:00
Bryan Kowal
4a78479648
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: bae0cb555ebae0cb555ee135f4508d5c86773a77
2012-02-23 14:20:50 -06:00
David Gillingham
8e123e3ae0
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 32b2c0698832b2c0698885998bc65488dcd4d09d
2012-02-23 13:23:59 -06:00
Steve Harris
190ebbc6a8
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: eeddaa55f5eeddaa55f5e829aa1a8b48f081f798
2012-02-23 13:18:50 -06:00
Steve Harris
62e5b475da
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: d6b489e69ed6b489e69e3b16f376756f13b9c3b1
2012-02-23 13:18:15 -06:00
Steve Harris
0c7fa07eea
Merge branch 'ss_sync' into 10-Tech_Blocked
...
Former-commit-id: f081d1a6d4f081d1a6d4a0063d6cb14b1d072b46
2012-02-23 13:17:26 -06:00
Steve Harris
1328771113
Merge branch 'ss_sync' into 4-Thin_Client
...
Former-commit-id: f9baa1c98cf9baa1c98c46e1499e43096ba6eb30
2012-02-23 13:16:35 -06:00
Steve Harris
32fa2a28c5
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
...
Former-commit-id: c502603907c502603907ecb38ba165a9b900821a
2012-02-23 12:45:50 -06:00
Steve Harris
2c958713b6
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: dcadf7baa4dcadf7baa486e586befe938dc5b21c
2012-02-23 12:38:55 -06:00
Nate Jensen
57c46aa9e1
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
...
Former-commit-id: e3e44707a4e3e44707a4fef3fcb60cd03ff9824e
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
af545548a1
Issue #176 update merged ncep plot classes to use new plot interface.
...
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 703d59a968703d59a96803d92308796db9a03560
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
92962fdd2c
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
...
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: 4dedc8b30d4dedc8b30d73a08e9d4ed5d8697d9f
2012-02-23 10:49:56 -06:00
Steve Harris
24e057e722
Merge branch 'ss_sync' into 10-Tech_Blocked
...
Former-commit-id: 2d25ee94142d25ee941419cf09274c8afdef6680
2012-02-23 10:28:19 -06:00
Steve Harris
7f8343833e
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: 957d232286957d232286a82f2c5750e6c3afa7a2
2012-02-23 10:19:54 -06:00
Steve Harris
91ffb88ac7
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
...
Former-commit-id: db065fcd50db065fcd50e94b322dc378ea2de6d3
2012-02-23 10:16:02 -06:00
Steve Harris
ae9c52b012
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: d0bbbfefccd0bbbfefcc7a10ca97663d511fe719
2012-02-23 10:06:18 -06:00
Steve Harris
3611ed97ca
Merge branch 'OB12.2.1_test' into ss_sync
...
Former-commit-id: 6f7f6785906f7f678590830038b0c65f6715ed05
2012-02-23 07:53:15 -06:00
