Commit graph

59 commits

Author SHA1 Message Date
Max Schenkelberg
b093240644 Issue #1222 Fixed MapResourceGroup to manage keeping capabilties in sync with underlying resources by using listeners. Also fixed issue where you can set map resources to be time match basis to avoid errors. Fixed build when merging in 12.10
Change-Id: Iec0389be3a563df2d14f079cdd127a32ba552237

Former-commit-id: 8cd4f17cd4 [formerly 8cd4f17cd4 [formerly ac247423f66f1b29b2235595f08b8cee03962842]]
Former-commit-id: d63f741ab5
Former-commit-id: b35aefa9e0
2012-09-28 11:43:03 -05:00
Roger Ferrel
8dda0a658f Issue #1196 Added isDisposed to CaveJFACEDialog.
Change-Id: I6ad1c3e1ba9015d87d04603a30ac8d02bb36abe5

Former-commit-id: d1e52778db [formerly d1e52778db [formerly 0eee43ff9fc99f027a295abebf64a98bbfeabe26]]
Former-commit-id: bfd519cefe
Former-commit-id: 59b174d6bd
2012-09-27 16:31:11 -05:00
Roger Ferrel
3dd5de22ac Issue #1196 Changes for Valid Period Dialog.
Changes from review.

Change-Id: I6adeb9741c0b8a6bb02525021b5c5b0b75ea43ee

Former-commit-id: 031fabe87a [formerly 031fabe87a [formerly 2d73c05dcff07658fc1bcd9ab878a9bca73b4aa3]]
Former-commit-id: b3cd481696
Former-commit-id: 1ef155a4f0
2012-09-27 10:40:47 -05:00
Roger Ferrel
f34bb941c0 Issue #1196 Changes for WmoIdSelectiondialog and modification to CaveJFACEDialog's setBlockOnOpen.
Change-Id: I3b9cc2bdc32a8f82a2d9ca6927c7fcda02254e9a

Former-commit-id: 6cd9792f46 [formerly 6cd9792f46 [formerly 54e670d97751f1f78d472d742c4f362c7deee625]]
Former-commit-id: 471bab8172
Former-commit-id: 3bf89d2240
2012-09-20 12:14:42 -05:00
Lee Venable
0a23610dee Issue #1165 : initial update for the dialog refactor.
Issue #1165 - added JFACE code update.

Issue #1165 - changed method names.
Change-Id: I4fab0a7c1384a4f3e5f66a9daf90027d39421110

Former-commit-id: 045297e677 [formerly 045297e677 [formerly 687a13eb43abd6ff17b3aa82f2a0265159f5e6cc]]
Former-commit-id: 14eb99add7
Former-commit-id: 9267113411
2012-09-14 08:39:38 -05:00
Steve Harris
0b647c0c9d Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 91e39617cb [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]
Former-commit-id: a71dac6cad
Former-commit-id: 87a602dfee
2012-08-27 09:53:55 -05:00
David Gillingham
1856f2b941 Issue #1087: Enable DRT for CAVE operational mode.
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9

Former-commit-id: f7182ae9c7 [formerly f7182ae9c7 [formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]]
Former-commit-id: ec2d211800
Former-commit-id: cbd3bfacfa
2012-08-23 11:21:23 -05:00
Max Schenkelberg
362d34bee0 Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014

Former-commit-id: b69d2cad1c [formerly b69d2cad1c [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]
Former-commit-id: 1b406ecfca
Former-commit-id: aa9df46a1d
2012-08-20 14:47:14 -05:00
root
1792158ef8 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: cb46f57879 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
62979089d3 Issue #1065 fix contexts to deactivate when unrecognized views activate.
Former-commit-id: 6d9d0a406f [formerly 6d9d0a406f [formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]
Former-commit-id: 4203807a77
Former-commit-id: 8a170234b8
2012-08-15 16:36:05 -05:00
Ben Steffensmeier
a17bae6f40 Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
Former-commit-id: a4c46c7f55 [formerly a4c46c7f55 [formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]
Former-commit-id: 0857d971b5
Former-commit-id: a02bb2c092
2012-08-14 10:25:38 -05:00
Nate Jensen
cc4d1777e6 Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
Former-commit-id: c0dad4432c [formerly c0dad4432c [formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]]
Former-commit-id: 1b3d6560e4
Former-commit-id: 565100d787
2012-07-12 17:17:57 -05:00
Ben Steffensmeier
4fbdefff68 Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
Former-commit-id: ea0c7046af [formerly ea0c7046af [formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]]
Former-commit-id: 8984b35ff8
Former-commit-id: 1c68f4e01e
2012-07-12 13:35:52 -05:00
Roger Ferrel
d6d4222e24 Issue #875 - Create com.raytheon.uf.viz.points
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: 0cf7d64cf4 [formerly 0cf7d64cf4 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]
Former-commit-id: 9071334fe9
Former-commit-id: b3df932794
2012-07-12 11:32:03 -05:00
Max Schenkelberg
d876190d68 Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 9bbb68a547 [formerly 9bbb68a547 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 7286b4e962
2012-07-06 16:01:47 -05:00
Max Schenkelberg
d12df1af56 Issue #821 Fixed editor menu so plugin.xml action contribution items
are created every time the menu is shown to make sure any submenus are
recreated in the action.

Change-Id: I9f2103b1e8fcddc5bc790d74753733a42f9e6382

Former-commit-id: 84ae717563 [formerly 84ae717563 [formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]]
Former-commit-id: 668838364d
Former-commit-id: e3524fd4df
2012-06-28 11:53:21 -05:00
Bryan Kowal
611925412d Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a33740e915 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: b87b66abc5
Former-commit-id: 9a7d0492fe
2012-06-27 17:21:48 -05:00
Max Schenkelberg
34cb1fc585 Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it.
Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5

Former-commit-id: d0b06374e9 [formerly d0b06374e9 [formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]
Former-commit-id: 130692aefd
Former-commit-id: 859e041e10
2012-06-21 16:07:20 -05:00
Steve Harris
75f77df418 Revert "12.6.1-10 baseline"
This reverts commit aecc6a8474 [formerly b33c5bdfcf] [formerly a2c0893d1a] [formerly ddde63eee0 [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].


Former-commit-id: b4b1f6975f [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
2012-06-21 08:51:08 -05:00
Steve Harris
aecc6a8474 12.6.1-10 baseline
Former-commit-id: ddde63eee0 [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
2012-06-21 08:38:48 -05:00
Max Schenkelberg
f2e34fe03c Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: dd99479eeb [formerly dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]
Former-commit-id: fceef3c5a1
Former-commit-id: e5e1a4de6a
2012-06-13 17:52:11 -05:00
Matt Nash
8eac89d337 Issue #659 fix floating view issue when minimize happened
Former-commit-id: 96bf8b356a [formerly 96bf8b356a [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]
Former-commit-id: b65a0f124e
Former-commit-id: 3bd1a43af2
2012-06-13 10:04:12 -05:00
Steve Harris
2838ca117f Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
	cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java

Former-commit-id: 2f20a86a30 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]
Former-commit-id: 48860df690
Former-commit-id: 27b50c57bd
2012-06-12 14:37:12 -05:00
Steve Harris
91e65230ad 12.6.1-5 baseline
Former-commit-id: c99afab05f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: 8947efbc7f
Former-commit-id: a945ed8e6d
2012-06-11 16:23:47 -05:00
Matt Nash
94bc675780 Issue #659 make fixes to float/dock
Former-commit-id: cc5c172a77 [formerly cc5c172a77 [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]]
Former-commit-id: 1f54c2d09d
Former-commit-id: ae53309d60
2012-06-11 10:21:40 -05:00
Steve Harris
9054c5ab6c 12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Matt Nash
637cbca41c Issue #659 toolbar is in session view now
Former-commit-id: 00f55c1d80 [formerly 00f55c1d80 [formerly a516cc2073fa33c88f13678a55dda4bdbe3ed120]]
Former-commit-id: e43fee4483
Former-commit-id: 304970e9a9
2012-06-05 13:25:36 -05:00
Matt Nash
22eb377b74 Issue #659 float button for cool detachable functionality
Former-commit-id: 855193aa77 [formerly 855193aa77 [formerly 9b1c62c4851f95ad270b58ceacf756a616f7c136]]
Former-commit-id: cab515cbfd
Former-commit-id: 633fd997e5
2012-05-30 16:13:21 -05:00
Steve Harris
2738af2019 12.5.1-6 baseline
Former-commit-id: 24474489f9 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: fa87dc6cf1
Former-commit-id: c452cce633
2012-05-16 16:41:22 -05:00
Nate Jensen
94661e501c Issue #590 fix issue when exiting GFE
Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157

Former-commit-id: 75754040cb [formerly 75754040cb [formerly 258fead57d05a908b32b0b74a2e34ab19be0947f]]
Former-commit-id: c92f9ee705
Former-commit-id: c55862a1ab
2012-05-11 13:58:46 -05:00
Max Schenkelberg
6cd18a09dc Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 78e1bd2c62 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 3ca8ca6f01
2012-05-09 15:02:30 -05:00
Steve Harris
7978d3b640 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: 27bc369818 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 58037cb5d1
Former-commit-id: 63ea8599d7
2012-05-09 13:14:00 -05:00
Steve Harris
377ae76413 12.5.1-2 baseline
Former-commit-id: 84d191e7b6 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: b36c69cc67
Former-commit-id: a821111fbf
2012-05-03 19:17:13 -05:00
Steve Harris
fd9e226b35 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: 2ed7249613 [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 7b75b781ad
Former-commit-id: 6dd3ee8809
2012-05-01 18:31:09 -05:00
Steve Harris
e5543a0e86 12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Steve Harris
3ed3a665cb 12.4.1-10 baseline
Former-commit-id: 704b75e1a1 [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]
Former-commit-id: 01457fbbde
Former-commit-id: aabc3842ac
2012-04-24 15:38:29 -05:00
Steve Harris
19657ae52d 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: 4d7572a632 [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]
Former-commit-id: 625cd4262c
Former-commit-id: def458753d
2012-04-19 11:11:02 -05:00
Steve Harris
8cd5974f4c 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Max Schenkelberg
a6c9c88b4f 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: cbe92bdf32 [formerly cbe92bdf32 [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]
Former-commit-id: 6812c1ba2b
Former-commit-id: 824b24dfcb
2012-04-06 10:23:24 -05:00
Max Schenkelberg
9bcd4b911a Issue #239 Added remote capability injection code through factory
method. Cleaned up old/unmaintained 3D references

Former-commit-id: 54aaf05209 [formerly 54aaf05209 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]
Former-commit-id: 16056d53c5
Former-commit-id: b4b754c7cc
2012-04-05 13:52:20 -05:00
Max Schenkelberg
5ebb709ef6 Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
Former-commit-id: 23d65caf2e [formerly 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]
Former-commit-id: 753de872e0
Former-commit-id: e3477c90ae
2012-04-02 16:15:21 -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: d3ad6095b7 [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]
Former-commit-id: 5cdda77afb
Former-commit-id: 6aa18f74f6
2012-03-30 09:50:48 -05:00
Nate Jensen
ac8087a21a Issue #427 Right click on editor tab support
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987

Former-commit-id: d2d3a245b3 [formerly d2d3a245b3 [formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]
Former-commit-id: aa000b4b06
Former-commit-id: 6aae45687a
2012-03-29 10:44:08 -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: 6e5964df9d [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]
Former-commit-id: 50765e8a34
Former-commit-id: cf440b3884
2012-03-14 09:49:32 -05:00
Max Schenkelberg
1303289d12 Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: d43b0456d8 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]
Former-commit-id: 89f603f448
Former-commit-id: 4662ece060
2012-03-09 12:31:50 -06:00
Max Schenkelberg
585e979c76 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: ae47d9683e [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]
Former-commit-id: 48b6d45f00
Former-commit-id: 3212cc6ebb
2012-03-01 16:59:40 -06:00
Steve Harris
acd7845ebd 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: cabf9fd956 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 33483f3960
2012-02-20 13:03:39 -06:00
Steve Harris
d9c8a99210 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: 6a064cb78b [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]
Former-commit-id: d02529fef4
Former-commit-id: d133454b27
2012-02-20 12:54:25 -06:00
Steve Harris
895404abeb Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 93f6535bd8 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
2012-02-17 10:55:02 -06:00
Steve Harris
dc9df63a11 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 2119a1513e [formerly 2119a1513e [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: cb3371ee28
2012-02-14 15:54:46 -06:00