Max Schenkelberg
5729c0acc5
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 06ee0bbf6f
[formerly 78e1bd2c62
] [formerly 06ee0bbf6f
[formerly 78e1bd2c62
] [formerly 1f5abc6e20
[formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 2db836b296
[formerly 3ca8ca6f01
]
Former-commit-id: 6cd18a09dc
2012-05-09 15:02:30 -05:00
Steve Harris
1d2ad9224a
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 572e1bb476
[formerly 27bc369818
] [formerly 572e1bb476
[formerly 27bc369818
] [formerly 58037cb5d1
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 9c9e01dbda
[formerly 63ea8599d7
]
Former-commit-id: 7978d3b640
2012-05-09 13:14:00 -05:00
Steve Harris
491aa53a0c
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: 4ec294b525
[formerly 2ed7249613
] [formerly 4ec294b525
[formerly 2ed7249613
] [formerly 7b75b781ad
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 7c7fc97131
[formerly 6dd3ee8809
]
Former-commit-id: fd9e226b35
2012-05-01 18:31:09 -05:00
Steve Harris
0c25458510
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82
[formerly a28d70b5c5
]
Former-commit-id: e5543a0e86
2012-05-01 18:06:13 -05:00
Steve Harris
9b8c6e395d
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: 63f11892e8
[formerly 4d7572a632
] [formerly 63f11892e8
[formerly 4d7572a632
] [formerly 625cd4262c
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: e86dc647be
[formerly def458753d
]
Former-commit-id: 19657ae52d
2012-04-19 11:11:02 -05:00
Steve Harris
74b66d9683
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae
[formerly a4e519f3cd
]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
Max Schenkelberg
54d8c44956
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: a5fa19c914
[formerly cbe92bdf32
] [formerly a5fa19c914
[formerly cbe92bdf32
] [formerly 6812c1ba2b
[formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]]
Former-commit-id: 6812c1ba2b
Former-commit-id: 532f2d691b
[formerly 824b24dfcb
]
Former-commit-id: a6c9c88b4f
2012-04-06 10:23:24 -05:00
Max Schenkelberg
01bf183cf3
Issue #239 Added remote capability injection code through factory
...
method. Cleaned up old/unmaintained 3D references
Former-commit-id: 48ca9ca105
[formerly 54aaf05209
] [formerly 48ca9ca105
[formerly 54aaf05209
] [formerly 16056d53c5
[formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]]
Former-commit-id: 16056d53c5
Former-commit-id: 20ad9fe872
[formerly b4b754c7cc
]
Former-commit-id: 9bcd4b911a
2012-04-05 13:52:20 -05:00
Max Schenkelberg
8e521d2c29
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
...
Former-commit-id: c56707c6bc
[formerly 23d65caf2e
] [formerly c56707c6bc
[formerly 23d65caf2e
] [formerly 753de872e0
[formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]
Former-commit-id: 753de872e0
Former-commit-id: c7165384f1
[formerly e3477c90ae
]
Former-commit-id: 5ebb709ef6
2012-04-02 16:15:21 -05:00
Steve Harris
1556e72eeb
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: a4e4792bb5
[formerly d3ad6095b7
] [formerly a4e4792bb5
[formerly d3ad6095b7
] [formerly 5cdda77afb
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: 9845ef53f9
[formerly 6aa18f74f6
]
Former-commit-id: 9fee09c9e4
2012-03-30 09:50:48 -05:00
Nate Jensen
a0c6c92587
Issue #427 Right click on editor tab support
...
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987
Former-commit-id: 202bd0adf8
[formerly d2d3a245b3
] [formerly 202bd0adf8
[formerly d2d3a245b3
] [formerly aa000b4b06
[formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]]
Former-commit-id: aa000b4b06
Former-commit-id: 9792be406a
[formerly 6aae45687a
]
Former-commit-id: ac8087a21a
2012-03-29 10:44:08 -05:00
Max Schenkelberg
9366a5f308
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: 8fb7eccb73
[formerly 6e5964df9d
] [formerly 8fb7eccb73
[formerly 6e5964df9d
] [formerly 50765e8a34
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 8f08fab0a7
[formerly cf440b3884
]
Former-commit-id: 6378e8c4ee
2012-03-14 09:49:32 -05:00
Max Schenkelberg
0f005d3521
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 18805c68f7
[formerly d43b0456d8
] [formerly 18805c68f7
[formerly d43b0456d8
] [formerly 89f603f448
[formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: f78b932abb
[formerly 4662ece060
]
Former-commit-id: 1303289d12
2012-03-09 12:31:50 -06:00
Max Schenkelberg
ae389f0b57
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: e2cd95d3f4
[formerly ae47d9683e
] [formerly e2cd95d3f4
[formerly ae47d9683e
] [formerly 48b6d45f00
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 0554abdde0
[formerly 3212cc6ebb
]
Former-commit-id: 585e979c76
2012-03-01 16:59:40 -06:00
Steve Harris
bcccffbaa4
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: d971880b98
[formerly cabf9fd956
] [formerly d971880b98
[formerly cabf9fd956
] [formerly 5e9d2dd367
[formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: b12f5e5d75
[formerly 33483f3960
]
Former-commit-id: acd7845ebd
2012-02-20 13:03:39 -06:00
Steve Harris
d3c80a1557
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: a2fd2cf6fa
[formerly 6a064cb78b
] [formerly a2fd2cf6fa
[formerly 6a064cb78b
] [formerly d02529fef4
[formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]
Former-commit-id: d02529fef4
Former-commit-id: b41e5f2415
[formerly d133454b27
]
Former-commit-id: d9c8a99210
2012-02-20 12:54:25 -06:00
Steve Harris
9a09879521
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: c209d6de36
[formerly 93f6535bd8
] [formerly c209d6de36
[formerly 93f6535bd8
] [formerly b137302802
[formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: 1ac6b36d1f
[formerly 65b22abd24
]
Former-commit-id: 895404abeb
2012-02-17 10:55:02 -06:00
Steve Harris
0d9992da14
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 46dda7b8bd
[formerly 2119a1513e
] [formerly 46dda7b8bd
[formerly 2119a1513e
] [formerly 2e29bc8ee2
[formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: d23d12d596
[formerly cb3371ee28
]
Former-commit-id: dc9df63a11
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
eaf930f7b8
Issue #235 add an export menu to cave to handle screen capture, print, and displays
...
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: 6e95175ba2
[formerly ebbbd0bafc
] [formerly 6e95175ba2
[formerly ebbbd0bafc
] [formerly f7985bff7b
[formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]]]
Former-commit-id: f7985bff7b
Former-commit-id: 99557a2a0f
[formerly a9e13fac26
]
Former-commit-id: 7d16f12962
2012-02-10 12:13:34 -06:00
Ben Steffensmeier
e50ddeed23
Issue #235 Added ability to capture multiple frames to NSharp
...
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 08e8343d98
[formerly 5cdcd5a261
] [formerly 08e8343d98
[formerly 5cdcd5a261
] [formerly 6bfd8ccfee
[formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: 9d442083a1
[formerly 512e0f1bd5
]
Former-commit-id: e1eeef7827
2012-02-09 10:54:02 -06:00
Steve Harris
87ffdc4f01
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 695e2979c3
[formerly 1002555dbd
] [formerly 695e2979c3
[formerly 1002555dbd
] [formerly f693b6d0a7
[formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]
Former-commit-id: f693b6d0a7
Former-commit-id: 93e856457b
[formerly f650243958
]
Former-commit-id: 3cbce90726
2012-02-09 08:54:18 -06:00
Ben Steffensmeier
5a3c1c56ac
Issue #235 Ability to screen capture or print multiple frames at once.
...
Change-Id: I58176883e701fbe0d9e0bcc0e43b60bd5c0053a7
Former-commit-id: 2e37808e48
[formerly e904dadb5e
] [formerly 2e37808e48
[formerly e904dadb5e
] [formerly c74dae631e
[formerly 9062fe4b8fdb62840b21aba7c648f48fa691986a]]]
Former-commit-id: c74dae631e
Former-commit-id: 9c6081d7a3
[formerly 0873a518c6
]
Former-commit-id: 4b748f8a34
2012-02-07 15:33:23 -06:00
Matt Nash
53612b087f
Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
...
Former-commit-id: a659029ea0
[formerly f4c5d7f94b
] [formerly a659029ea0
[formerly f4c5d7f94b
] [formerly 28e3da498e
[formerly c12bae0a615198f6d409cf5e6d79a6a32e57494d]]]
Former-commit-id: 28e3da498e
Former-commit-id: 8dbb17b2e8
[formerly ef18b8c47f
]
Former-commit-id: cc50a32732
2012-02-07 11:45:28 -06:00
Matt Nash
d757beaf59
Issue #206 radio buttons only select one at a time
...
Former-commit-id: 42b4f10d37
[formerly 5094c1ec1c
] [formerly 42b4f10d37
[formerly 5094c1ec1c
] [formerly c8365fa660
[formerly 38de69ea29c429a2295518fb9d8c1707efe1d3c4]]]
Former-commit-id: c8365fa660
Former-commit-id: e977aefb73
[formerly 3b247ad783
]
Former-commit-id: ca6b480fb8
2012-01-27 11:50:34 -06:00
Ben Steffensmeier
3e5db64692
Issue #199 Do not endFrame for panes which are not drawn. This prevents
...
gl from swapping buffers which leads to a flicker on intel graphics
cards.
Former-commit-id: 6cdc7f561a
[formerly 6cbe5bbf71
] [formerly 6cdc7f561a
[formerly 6cbe5bbf71
] [formerly 0f906ac4d5
[formerly 05ac4ac87d5371cabc91d82322b2c9728373e8b1]]]
Former-commit-id: 0f906ac4d5
Former-commit-id: 54990c6377
[formerly 0e27eeebf6
]
Former-commit-id: f03edcc502
2012-01-26 15:20:56 -06:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d7
[formerly 66be3bec40
] [formerly 580e2938d7
[formerly 66be3bec40
] [formerly c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf
[formerly 1faae42484
]
Former-commit-id: 21d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c
[formerly 9f19e3f712
] [formerly a02aeb236c
[formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59
[formerly 3360eb6c5f
]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00