Steve Harris
634d40a156
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: 625cd4262c
[formerly 4d7572a632
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]
Former-commit-id: 4d7572a632
Former-commit-id: 63f11892e8
2012-04-19 11:11:02 -05:00
Steve Harris
4767b0e069
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
2012-04-18 15:18:16 -05:00
Max Schenkelberg
46c1cf8e39
Issue #239 Got reprojection event working
...
Former-commit-id: 005beff18a
[formerly 29f24e3ec5
[formerly 99e432cd258c9bf570a66be4702d28ac68204052]]
Former-commit-id: 29f24e3ec5
Former-commit-id: 6efccf10a5
2012-04-18 14:01:09 -05:00
Max Schenkelberg
ee7595c10b
Issue #239 Fixed mosaic bug, refactored dispatching colormap images so
...
mosaic could resuse
Former-commit-id: 29184d46ce
[formerly 40ca446e53
[formerly aea5c30443970933bf1517ced6d7e91a1008c9d5]]
Former-commit-id: 40ca446e53
Former-commit-id: c1ebd04d4d
2012-04-17 13:09:07 -05:00
Max Schenkelberg
9b8f9de1fa
Issue #239 Added wireframe shape capability
...
Former-commit-id: 5be2b4e745
[formerly 12dcb4b044
[formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]
Former-commit-id: 12dcb4b044
Former-commit-id: 7900e78944
2012-04-12 14:46:08 -05:00
Max Schenkelberg
da48c4f6ac
Issue #239 got offscreen rendering working for clients
...
Former-commit-id: 2de39bb487
[formerly 5ae0ed10d5
[formerly f41733465eb0ee048fb76a0d5467ce456d1cf7c9]]
Former-commit-id: 5ae0ed10d5
Former-commit-id: b1687af0ac
2012-04-12 10:45:50 -05:00
Max Schenkelberg
7416bd9839
Issue #239 Got zoom/pan events working for remote users
...
Former-commit-id: 18e9f2c6ad
[formerly 6e0c5c3cdf
[formerly a817a720868fe887deca6ce6589014f0cd439c2d]]
Former-commit-id: 6e0c5c3cdf
Former-commit-id: 65f6c07530
2012-04-10 14:40:51 -05:00
Steve Harris
6a1f2160bd
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
...
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: fee53dea94
[formerly ed26e06df2
[formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]
Former-commit-id: ed26e06df2
Former-commit-id: c90ce9d54e
2012-04-10 12:50:03 -05:00
Max Schenkelberg
65e7184cc4
Issue #239 Fixed D2D context activation so as not to override important
...
keys when a unrelated view is active such as Product Browser or
Collaboration views.
Former-commit-id: 6812c1ba2b
[formerly cbe92bdf32
[formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]
Former-commit-id: cbe92bdf32
Former-commit-id: a5fa19c914
2012-04-06 10:23:24 -05:00
Max Schenkelberg
e525c9c35d
Issue #239 Added remote capability injection code through factory
...
method. Cleaned up old/unmaintained 3D references
Former-commit-id: 16056d53c5
[formerly 54aaf05209
[formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]
Former-commit-id: 54aaf05209
Former-commit-id: 48ca9ca105
2012-04-05 13:52:20 -05:00
Max Schenkelberg
6e94ff6098
Issue #239 Start of remote target capabilities
...
Former-commit-id: d2d03e2c64
[formerly 6c411ffb07
[formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]]
Former-commit-id: 6c411ffb07
Former-commit-id: ac1fc79f5b
2012-04-03 15:11:20 -05:00
Max Schenkelberg
0b1caa67df
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
...
Former-commit-id: 753de872e0
[formerly 23d65caf2e
[formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]
Former-commit-id: 23d65caf2e
Former-commit-id: c56707c6bc
2012-04-02 16:15:21 -05:00
Steve Harris
b4846ce8a8
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: 5cdda77afb
[formerly d3ad6095b7
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]
Former-commit-id: d3ad6095b7
Former-commit-id: a4e4792bb5
2012-03-30 09:50:48 -05:00
Nate Jensen
a4965d6bf9
Issue #427 Right click on editor tab support
...
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987
Former-commit-id: aa000b4b06
[formerly d2d3a245b3
[formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]
Former-commit-id: d2d3a245b3
Former-commit-id: 202bd0adf8
2012-03-29 10:44:08 -05:00
Max Schenkelberg
86d3763df0
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: f10f1a5319
[formerly 15a9245592
[formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]
Former-commit-id: 15a9245592
Former-commit-id: 66eaffb9ee
2012-03-28 13:32:04 -05:00
Max Schenkelberg
732c2ddb5c
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: 556a270a09
[formerly 719f87c261
[formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]
Former-commit-id: 719f87c261
Former-commit-id: 10b720381b
2012-03-14 18:03:44 -05:00
Max Schenkelberg
5a61f3ae23
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: 50765e8a34
[formerly 6e5964df9d
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]
Former-commit-id: 6e5964df9d
Former-commit-id: 8fb7eccb73
2012-03-14 09:49:32 -05:00
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
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
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
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
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
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
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
Max Schenkelberg
83de7660b6
Issue #206 Made tear off menu dialog activate contexts for perspective
...
Former-commit-id: e422b13ded
[formerly 5f8d30bb43
[formerly 56103eb133de5325d62bb3453b2353e5d5e23ddd]]
Former-commit-id: 5f8d30bb43
Former-commit-id: c410a4eb33
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
539ebd56d3
Issue #176 Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times.
...
Change-Id: I23763bae287d5c49d3973707228e78144cc83ab1
Former-commit-id: 9254b762ff
[formerly 9cc983549d
[formerly 94d4feb2973ed201d369a21126b3443606041179]]
Former-commit-id: 9cc983549d
Former-commit-id: 6194dc8210
2012-01-30 17:04:47 -06:00
Ben Steffensmeier
700cb47baa
Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
...
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a
Former-commit-id: 0d75fbf942
[formerly b3463d27fc
[formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]
Former-commit-id: b3463d27fc
Former-commit-id: 3c673896a0
2012-01-30 16:39:57 -06:00
Ben Steffensmeier
e74b1747a0
Issue #33 rearrange Thin Client preferences to allow connectivity preferences to enable/disable other preferences when they are selected.
...
Change-Id: I3647ea498e9e44d7175cc755183fefa3d322c059
Former-commit-id: 563f93b261
[formerly ab1273cc02
[formerly 53fac28e86ae499846a54cc175f72e2e16b24e37]]
Former-commit-id: ab1273cc02
Former-commit-id: 71ba2e305b
2012-01-27 13:17:08 -06:00
Ben Steffensmeier
e2ba42ca48
Issue #198 enable progress bar for satellite and cancel all jobs when it
...
is disposed or when it has successfully rendered a frame.
Former-commit-id: 6bb90885c8
[formerly e4875ea830
[formerly bb0d4d876c130f8d7beba34507466c4024ce3600]]
Former-commit-id: e4875ea830
Former-commit-id: 80766211c7
2012-01-26 15:45:27 -06:00
Matt Nash
ea6ef73802
Issue #26 add tear off code to git baseline
...
Former-commit-id: 4286cb0342
[formerly cf4e1f764e
[formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]]
Former-commit-id: cf4e1f764e
Former-commit-id: 892cb9a7ae
2012-01-25 12:50:31 -06:00
Dave Hladky
bf2470f405
Issue #15 Wes2Bridge time settings
...
Former-commit-id: b03b324ead
[formerly 594412a5b5
[formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]]
Former-commit-id: 594412a5b5
Former-commit-id: 66fbee3e04
2012-01-25 10:53:51 -06:00
Matt Nash
d8da2252c3
Moving 12.1.1 into ss_sync
...
Former-commit-id: c83e5ff474
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
2012-01-19 11:53:12 -06:00
root
133dc97f67
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00