Steve Harris
eacd5aeb7f
12.6.1-10 baseline
...
Former-commit-id: 8dc4a774e23cd0902b49
2012-06-21 08:58:00 -05:00
Steve Harris
8367fb50f5
Revert "12.6.1-10 baseline"
...
This reverts commit b33c5bdfcfa2c0893d1addde63eee0b4b1f6975f25198a5cd6
2012-06-21 08:51:08 -05:00
Steve Harris
b33c5bdfcf
12.6.1-10 baseline
...
Former-commit-id: ddde63eee0a2c0893d1a
2012-06-21 08:38:48 -05:00
Steve Harris
a945ed8e6d
12.6.1-5 baseline
...
Former-commit-id: c99afab05f8947efbc7f
2012-06-11 16:23:47 -05:00
Steve Harris
1fdc0aa237
12.6.1-3 baseline
...
Former-commit-id: 42f3513175d57eb02b9e
2012-06-11 16:23:47 -05:00
Steve Harris
7da9afe36a
12.5.1-15 baseline
...
Former-commit-id: d5c238de07cee20d8656
2012-06-11 16:02:30 -05:00
Steve Harris
ce0422a34a
12.5.1-9 baseline
...
Former-commit-id: 8f3c9ebfb71f542697cb
2012-05-21 17:48:55 -05:00
Steve Harris
c452cce633
12.5.1-6 baseline
...
Former-commit-id: 24474489f9fa87dc6cf1
2012-05-16 16:41:22 -05:00
Steve Harris
a821111fbf
12.5.1-2 baseline
...
Former-commit-id: 84d191e7b6b36c69cc67
2012-05-03 19:17:13 -05:00
Steve Harris
aabc3842ac
12.4.1-10 baseline
...
Former-commit-id: 704b75e1a101457fbbde
2012-04-24 15:38:29 -05:00
Steve Harris
d9f966008c
12.4.1-7 baseline
...
Former-commit-id: 90ae4bbb36cca73b3c62
2012-04-24 15:24:39 -05:00
Steve Harris
a4e519f3cd
12.4.1-4 baseline
...
Former-commit-id: 67a5a683002a216f333c
2012-04-18 15:18:16 -05:00
Max Schenkelberg
993cac891e
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 9b0d01f8b507cf5069ba
2012-03-30 10:51:31 -05:00
Steve Harris
6aa18f74f6
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: d3ad6095b75cdda77afb
2012-03-30 09:50:48 -05:00
Steve Harris
ce3b74c605
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f22bd792cd9
2012-03-30 08:38:33 -05:00
Steve Harris
6884520750
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 70357d90bca0abcf8120
2012-03-29 10:03:05 -05:00
Max Schenkelberg
ac11dd0c18
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: 15a9245592f10f1a5319
2012-03-28 13:32:04 -05:00
Max Schenkelberg
954073b38c
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: cd6ebd80d4b9085db25d
2012-03-16 10:13:31 -05:00
Max Schenkelberg
1e5c074e3b
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: cc111ab9ac258d57e825
2012-03-16 09:03:50 -05:00
Max Schenkelberg
ba8af4dcc1
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: 719f87c261556a270a09
2012-03-14 18:03:44 -05:00
Max Schenkelberg
cf440b3884
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: 6e5964df9d50765e8a34
2012-03-14 09:49:32 -05:00
Max Schenkelberg
4662ece060
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: d43b0456d889f603f448
2012-03-09 12:31:50 -06:00
David Gillingham
bc61eb1e43
Issue #354 : Refactor AbstractParmManager to better handle ISC parm
...
pre-loading.
Former-commit-id: d68e3a7eea494fbe93db
2012-03-05 11:23:11 -06:00
David Gillingham
b3df043f97
Issue #346 : Convert GFE to use identity-based ListenerLists, increase
...
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: f6f0ca24df0c0f659896
2012-03-02 13:22:46 -06:00
Max Schenkelberg
3212cc6ebb
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: ae47d9683e48b6d45f00
2012-03-01 16:59:40 -06:00
Steve Harris
db45babec8
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 951ecfe3dd787aed90f8
2012-03-01 14:01:16 -06:00
Steve Harris
6f5c182af0
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c21bd2719c9bdea0399f
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
3220ee4745
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: 49cce84edf7c2409eab0
2012-03-01 12:44:43 -06:00
Steve Harris
06baad5169
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 703cb6e748dd52eb4d40
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
84e6c9beb8
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 5c303ed189c61e40c426
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
e52c2ffb20
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: 5dee50e7e9d7a63995f1
2012-02-28 15:20:37 -06:00
Steve Harris
fdd6018d1a
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: aa597242f9a4538f0a48
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
62f1ea0aac
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 357dc4d88b637c051a23
2012-02-24 14:57:23 -06:00
David Gillingham
f9ed20bada
Issue #346 : Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
...
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: d79f7e96135aa5b51a55
2012-02-23 14:40:25 -06:00
David Gillingham
88dcd4d09d
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 32b2c0698885998bc654
2012-02-23 13:23:59 -06:00
Steve Harris
938dc5b21c
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: dcadf7baa486e586befe
2012-02-23 12:38:55 -06:00
Steve Harris
e6c3afa7a2
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: 957d232286a82f2c5750
2012-02-23 10:19:54 -06:00
Steve Harris
3d511fe719
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: d0bbbfefcc7a10ca9766
2012-02-23 10:06:18 -06:00
Ben Steffensmeier
5d6b036ed7
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 06c9d4cdcf55aa66a510
2012-02-22 17:40:48 -06:00
Steve Harris
4450cf8963
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae9874154be9660f1
2012-02-22 11:14:43 -06:00
Steve Harris
aaead73ec5
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 94c2ea985b9995d22e25
2012-02-22 10:12:49 -06:00
Steve Harris
6d1b04e62c
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 84926c80bef3fe839c1c
2012-02-21 10:37:36 -06:00
Nate Jensen
13ea11ddfc
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
...
Former-commit-id: b90611d995ec0cd8d086
2012-02-21 08:57:12 -06:00
Ben Steffensmeier
dcbe4fc7da
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 69e8cde11573d24fad2f
2012-02-20 15:28:20 -06:00
Steve Harris
33483f3960
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: cabf9fd9565e9d2dd367
2012-02-20 13:03:39 -06:00
Steve Harris
d133454b27
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: 6a064cb78bd02529fef4
2012-02-20 12:54:25 -06:00
Steve Harris
54b5b6baef
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: 4b76d22f77cc66c8be24
2012-02-20 12:43:38 -06:00
Steve Harris
0fab56e0f1
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 62c587b841c825bd03a2
2012-02-20 07:49:13 -06:00
Steve Harris
65b22abd24
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 93f6535bd8b137302802
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
d4e7df98a9
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
...
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 26d82729c93e3e4bd4e3
2012-02-16 16:36:56 -06:00
