xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5128 commits 31 branches 40 tags 3.8 GiB
Commit graph

174 commits

Author SHA1 Message Date
Roger Ferrel
acc563c2eb Issue #1229 Changes for non-blocking SWTMessageBox. 
Change-Id: Id9954878c2764f4527e85b958a0fec7a05548db9

Former-commit-id: e17d8d4c37 [formerly 610444ee88] [formerly e17d8d4c37 [formerly 610444ee88] [formerly 38ae2b122e [formerly b073d27b36543630e3fd04623e22cd5242e5ed1f]]]
Former-commit-id: 38ae2b122e
Former-commit-id: 2ddf95c587 [formerly db1a29205a]
Former-commit-id: 71c69e504e
 2012-10-18 14:06:02 -05:00
Roger Ferrel
6aa28a9ede Issue #1229 Changes for non-blocking SetTimeDialog. 
Change-Id: I0a5d497a29b5a6e9e7441e130ce081058e78f4e3

Former-commit-id: abd0476b6a [formerly 40fb3f9729] [formerly abd0476b6a [formerly 40fb3f9729] [formerly 4cd2f1c851 [formerly 5e4edda802714c236334500a12c2020386770dd2]]]
Former-commit-id: 4cd2f1c851
Former-commit-id: d51dc93248 [formerly 7a095d2d99]
Former-commit-id: 05c83289b6
 2012-10-18 07:36:31 -05:00
Roger Ferrel
e676beaa66 Issue #1229 Changes for non-blocking LabelOffsetDialog. 
Change-Id: Ic0d821549a300c53e29f4c321af3c51e22fb308e

Former-commit-id: 3af99829a6 [formerly 66379c3210] [formerly 3af99829a6 [formerly 66379c3210] [formerly d319101ed9 [formerly f1131f2d9d1d5e0194a65e787e2628e733563683]]]
Former-commit-id: d319101ed9
Former-commit-id: 4d39ffd53d [formerly 928e9f6a1d]
Former-commit-id: fae6e2ec44
 2012-10-17 15:12:55 -05:00
Roger Ferrel
e838ddc344 Issue #1229 Changes for non-blocking ImagingDialog. 
Change-Id: Iddcbf248949a082f734f6b5de8d8941089746468

Former-commit-id: 3d15bf8be1 [formerly c73acb0c30] [formerly 3d15bf8be1 [formerly c73acb0c30] [formerly 460acb4337 [formerly 185024d06da214041273674716a7efce4b2a98f1]]]
Former-commit-id: 460acb4337
Former-commit-id: a9cb110036 [formerly b42cae4034]
Former-commit-id: b164d67e54
 2012-10-17 13:53:29 -05:00
Roger Ferrel
382f5b234c Issues #1229 Changes for non-blocking ColormapDialog. 
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: cdf5c546ab [formerly 8e86f32714] [formerly cdf5c546ab [formerly 8e86f32714] [formerly 6833c7e04c [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]]
Former-commit-id: 6833c7e04c
Former-commit-id: 1075e8ba16 [formerly d5acf40cc2]
Former-commit-id: a53f94e93d
 2012-10-17 10:20:18 -05:00
Roger Ferrel
b0f167507b Issue #1229 Changes for non-blocking SaveColorMapDialog. 
Change-Id: I5308c5f2ca546c825863f89162f2f1143f0431fc

Former-commit-id: 086223e764 [formerly 5e79024db3] [formerly 086223e764 [formerly 5e79024db3] [formerly 7f3ab5434c [formerly b902eadfca48628bf8944d97019263e94618667a]]]
Former-commit-id: 7f3ab5434c
Former-commit-id: e4016f2f59 [formerly f77e146c65]
Former-commit-id: d9cfa1f2f6
 2012-10-17 08:15:21 -05:00
Roger Ferrel
a3fad37043 Issue #1229 Changes for non-blocking BackgroundColorDialog. 
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9

Former-commit-id: ac30143335 [formerly 59a2dd6a3a] [formerly ac30143335 [formerly 59a2dd6a3a] [formerly d60b4ca396 [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]]]
Former-commit-id: d60b4ca396
Former-commit-id: f253f2191b [formerly 757affcc66]
Former-commit-id: a6e13f80d4
 2012-10-16 17:00:11 -05:00
Steve Harris
35e34308c5 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
 2012-10-16 13:27:07 -05:00
James Korman
f8fd2ba572 Issue #1229 - Issue #1229 - Change to use non-blocking. 
Change-Id: I2da0ebd176f7f50d63d70aed28bfe3385ac39a48

Former-commit-id: 0bffd25bdc [formerly 7769d4cc14] [formerly 0bffd25bdc [formerly 7769d4cc14] [formerly 860bd4af04 [formerly ae8a0dcce3055931c901093e148639f959c70a97]]]
Former-commit-id: 860bd4af04
Former-commit-id: 502510ff48 [formerly 3be1610080]
Former-commit-id: d53badbe68
 2012-10-11 11:31:43 -05:00
Ron Anderson
419eac95ff Issue #1242 Fix wierd GFE behavior when Grid Manager is maximized. 
Change-Id: I2e6d6929a8a8af8dab3320bdf8cda3466fe05fa8

Former-commit-id: 8136beddc7 [formerly b041ccf099] [formerly 8136beddc7 [formerly b041ccf099] [formerly 8e8c713884 [formerly 4fb21077aba1dd9cfafc7f046b02f24f750c6384]]]
Former-commit-id: 8e8c713884
Former-commit-id: 436284848c [formerly 60171b46a2]
Former-commit-id: 51abd858bc
 2012-10-04 12:15:01 -05:00
Max Schenkelberg
c1b115e17f 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: eb9cd3003a [formerly 8cd4f17cd4] [formerly eb9cd3003a [formerly 8cd4f17cd4] [formerly d63f741ab5 [formerly ac247423f66f1b29b2235595f08b8cee03962842]]]
Former-commit-id: d63f741ab5
Former-commit-id: 962ea1d376 [formerly b35aefa9e0]
Former-commit-id: b093240644
 2012-09-28 11:43:03 -05:00
Roger Ferrel
5155e03896 Issue #1196 Added isDisposed to CaveJFACEDialog. 
Change-Id: I6ad1c3e1ba9015d87d04603a30ac8d02bb36abe5

Former-commit-id: fa0913508c [formerly d1e52778db] [formerly fa0913508c [formerly d1e52778db] [formerly bfd519cefe [formerly 0eee43ff9fc99f027a295abebf64a98bbfeabe26]]]
Former-commit-id: bfd519cefe
Former-commit-id: 54a1ad88b1 [formerly 59b174d6bd]
Former-commit-id: 8dda0a658f
 2012-09-27 16:31:11 -05:00
Steven Harris
2f855322f6 12.11.1-1 baseline 
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
 2012-09-27 15:57:45 -05:00
Roger Ferrel
d7d19ebc5c Issue #1196 Changes for Valid Period Dialog. 
Changes from review.

Change-Id: I6adeb9741c0b8a6bb02525021b5c5b0b75ea43ee

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

Former-commit-id: 6fa8e82174 [formerly 6cd9792f46] [formerly 6fa8e82174 [formerly 6cd9792f46] [formerly 471bab8172 [formerly 54e670d97751f1f78d472d742c4f362c7deee625]]]
Former-commit-id: 471bab8172
Former-commit-id: d28e0d8560 [formerly 3bf89d2240]
Former-commit-id: f34bb941c0
 2012-09-20 12:14:42 -05:00
Lee Venable
6875f14e23 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: 6ac7e90550 [formerly 045297e677] [formerly 6ac7e90550 [formerly 045297e677] [formerly 14eb99add7 [formerly 687a13eb43abd6ff17b3aa82f2a0265159f5e6cc]]]
Former-commit-id: 14eb99add7
Former-commit-id: 68d0ee976a [formerly 9267113411]
Former-commit-id: 0a23610dee
 2012-09-14 08:39:38 -05:00
Steve Harris
5030894212 12.10.1-3 baseline 
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db [formerly 438d139fdd]
Former-commit-id: faadb51529
 2012-09-11 16:00:38 -05:00
Steve Harris
3f44e46a6f 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: 51eb89eb2a [formerly 91e39617cb] [formerly 51eb89eb2a [formerly 91e39617cb] [formerly a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: dbcb28ce77 [formerly 87a602dfee]
Former-commit-id: 0b647c0c9d
 2012-08-27 09:53:55 -05:00
David Gillingham
d1801d7942 Issue #1087: Enable DRT for CAVE operational mode. 
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9

Former-commit-id: f3a33e3df4 [formerly f7182ae9c7] [formerly f3a33e3df4 [formerly f7182ae9c7] [formerly ec2d211800 [formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]]]
Former-commit-id: ec2d211800
Former-commit-id: 3b41cd02f4 [formerly cbd3bfacfa]
Former-commit-id: 1856f2b941
 2012-08-23 11:21:23 -05:00
Steve Harris
2d928d328e 12.9.1-5 baseline 
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
 2012-08-21 15:27:03 -05:00
Max Schenkelberg
dcbab7d58f 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: fc06265360 [formerly b69d2cad1c] [formerly fc06265360 [formerly b69d2cad1c] [formerly 1b406ecfca [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]]
Former-commit-id: 1b406ecfca
Former-commit-id: 47cefd1513 [formerly aa9df46a1d]
Former-commit-id: 362d34bee0
 2012-08-20 14:47:14 -05:00
root
0eb9520e15 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209]
Former-commit-id: 1792158ef8
 2012-08-15 22:15:20 +00:00
Ben Steffensmeier
2256ec871d Issue #1065 fix contexts to deactivate when unrecognized views activate. 
Former-commit-id: e8524301b5 [formerly 6d9d0a406f] [formerly e8524301b5 [formerly 6d9d0a406f] [formerly 4203807a77 [formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]]
Former-commit-id: 4203807a77
Former-commit-id: d7597d8cf7 [formerly 8a170234b8]
Former-commit-id: 62979089d3
 2012-08-15 16:36:05 -05:00
Steve Harris
16d7d955fc 12.9.1-1 baseline 
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416]
Former-commit-id: 63bcadf121
 2012-08-15 13:59:00 -05:00
Ben Steffensmeier
d6c42b28bf Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container 
Former-commit-id: 474fe44037 [formerly a4c46c7f55] [formerly 474fe44037 [formerly a4c46c7f55] [formerly 0857d971b5 [formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]]
Former-commit-id: 0857d971b5
Former-commit-id: 08021bcfc2 [formerly a02bb2c092]
Former-commit-id: a17bae6f40
 2012-08-14 10:25:38 -05:00
Nate Jensen
f3d7771e92 Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development 
Former-commit-id: da1e9ae3c3 [formerly c0dad4432c] [formerly da1e9ae3c3 [formerly c0dad4432c] [formerly 1b3d6560e4 [formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]]]
Former-commit-id: 1b3d6560e4
Former-commit-id: ca0c314851 [formerly 565100d787]
Former-commit-id: cc4d1777e6
 2012-07-12 17:17:57 -05:00
Ben Steffensmeier
0559de8925 Issue #808 create API for managing floating views and made CaveDetachedWindow more robust. 
Former-commit-id: 45a1cc1997 [formerly ea0c7046af] [formerly 45a1cc1997 [formerly ea0c7046af] [formerly 8984b35ff8 [formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]]]
Former-commit-id: 8984b35ff8
Former-commit-id: 32d4848ef2 [formerly 1c68f4e01e]
Former-commit-id: 4fbdefff68
 2012-07-12 13:35:52 -05:00
Roger Ferrel
b75d001a2a Issue #875 - Create com.raytheon.uf.viz.points 
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: bfcefac909 [formerly 0cf7d64cf4] [formerly bfcefac909 [formerly 0cf7d64cf4] [formerly 9071334fe9 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]]
Former-commit-id: 9071334fe9
Former-commit-id: c317c5d0a3 [formerly b3df932794]
Former-commit-id: d6d4222e24
 2012-07-12 11:32:03 -05:00
Steve Harris
37f2b6e138 12.6.1-9 baseline 
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
 2012-07-10 07:53:49 -05:00
Max Schenkelberg
3325ed5deb 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: 7d13c7d339 [formerly 9bbb68a547] [formerly 7d13c7d339 [formerly 9bbb68a547] [formerly 98c2ec7dc5 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: c6d324aaeb [formerly 7286b4e962]
Former-commit-id: d876190d68
 2012-07-06 16:01:47 -05:00
Max Schenkelberg
b378e3cdb4 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: 53fd2ec047 [formerly 84ae717563] [formerly 53fd2ec047 [formerly 84ae717563] [formerly 668838364d [formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]]]
Former-commit-id: 668838364d
Former-commit-id: f1eb4b4713 [formerly e3524fd4df]
Former-commit-id: d12df1af56
 2012-06-28 11:53:21 -05:00
Bryan Kowal
2e5a850d28 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: b1b294c401 [formerly a33740e915] [formerly b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: b4917e6708 [formerly 9a7d0492fe]
Former-commit-id: 611925412d
 2012-06-27 17:21:48 -05:00
Max Schenkelberg
ecc5316b44 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: a691f425ea [formerly d0b06374e9] [formerly a691f425ea [formerly d0b06374e9] [formerly 130692aefd [formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]]
Former-commit-id: 130692aefd
Former-commit-id: e8e159bed0 [formerly 859e041e10]
Former-commit-id: 34cb1fc585
 2012-06-21 16:07:20 -05:00
Steve Harris
e77a15c047 Revert "12.6.1-10 baseline" 
This reverts commit 95e7f4fc0c [formerly aecc6a8474] [formerly f8497470fc [formerly b33c5bdfcf]] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]].


Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 333fd9c64e [formerly 8367fb50f5]
Former-commit-id: 75f77df418
 2012-06-21 08:51:08 -05:00
Steve Harris
95e7f4fc0c 12.6.1-10 baseline 
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]
Former-commit-id: a2c0893d1a
Former-commit-id: f8497470fc [formerly b33c5bdfcf]
Former-commit-id: aecc6a8474
 2012-06-21 08:38:48 -05:00
Max Schenkelberg
7bac48f643 Issue #697 added support for multiple editors 
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: 51c2a41e68 [formerly dd99479eeb] [formerly 51c2a41e68 [formerly dd99479eeb] [formerly fceef3c5a1 [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]
Former-commit-id: fceef3c5a1
Former-commit-id: f0d2893e97 [formerly e5e1a4de6a]
Former-commit-id: f2e34fe03c
 2012-06-13 17:52:11 -05:00
Matt Nash
576e5c5310 Issue #659 fix floating view issue when minimize happened 
Former-commit-id: 3689ed489e [formerly 96bf8b356a] [formerly 3689ed489e [formerly 96bf8b356a] [formerly b65a0f124e [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]]
Former-commit-id: b65a0f124e
Former-commit-id: 9e81392638 [formerly 3bd1a43af2]
Former-commit-id: 8eac89d337
 2012-06-13 10:04:12 -05:00
Steve Harris
70a928d039 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: af6c0529ad [formerly 2f20a86a30] [formerly af6c0529ad [formerly 2f20a86a30] [formerly 48860df690 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]
Former-commit-id: 48860df690
Former-commit-id: d7a4853091 [formerly 27b50c57bd]
Former-commit-id: 2838ca117f
 2012-06-12 14:37:12 -05:00
Steve Harris
3b468d9f50 12.6.1-5 baseline 
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: b69fa75919 [formerly a945ed8e6d]
Former-commit-id: 91e65230ad
 2012-06-11 16:23:47 -05:00
Matt Nash
e1d1dbe568 Issue #659 make fixes to float/dock 
Former-commit-id: 5accda84c9 [formerly cc5c172a77] [formerly 5accda84c9 [formerly cc5c172a77] [formerly 1f54c2d09d [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]]]
Former-commit-id: 1f54c2d09d
Former-commit-id: b55c763a34 [formerly ae53309d60]
Former-commit-id: 94bc675780
 2012-06-11 10:21:40 -05:00
Steve Harris
39ff9954f8 12.5.1-15 baseline 
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
 2012-06-08 13:39:48 -05:00
Matt Nash
d47328be4a Issue #659 toolbar is in session view now 
Former-commit-id: 373db85359 [formerly 00f55c1d80] [formerly 373db85359 [formerly 00f55c1d80] [formerly e43fee4483 [formerly a516cc2073fa33c88f13678a55dda4bdbe3ed120]]]
Former-commit-id: e43fee4483
Former-commit-id: f2d8da6b3d [formerly 304970e9a9]
Former-commit-id: 637cbca41c
 2012-06-05 13:25:36 -05:00
Matt Nash
927b2967d7 Issue #659 float button for cool detachable functionality 
Former-commit-id: 2b1ce9e674 [formerly 855193aa77] [formerly 2b1ce9e674 [formerly 855193aa77] [formerly cab515cbfd [formerly 9b1c62c4851f95ad270b58ceacf756a616f7c136]]]
Former-commit-id: cab515cbfd
Former-commit-id: 945095e345 [formerly 633fd997e5]
Former-commit-id: 22eb377b74
 2012-05-30 16:13:21 -05:00
Steve Harris
26ed02c3dc 12.5.1-6 baseline 
Former-commit-id: df80148db6 [formerly 24474489f9] [formerly df80148db6 [formerly 24474489f9] [formerly fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 4792884ab2 [formerly c452cce633]
Former-commit-id: 2738af2019
 2012-05-16 16:41:22 -05:00
Nate Jensen
99130351c6 Issue #590 fix issue when exiting GFE 
Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157

Former-commit-id: 7abedf8904 [formerly 75754040cb] [formerly 7abedf8904 [formerly 75754040cb] [formerly c92f9ee705 [formerly 258fead57d05a908b32b0b74a2e34ab19be0947f]]]
Former-commit-id: c92f9ee705
Former-commit-id: 4be7493c21 [formerly c55862a1ab]
Former-commit-id: 94661e501c
 2012-05-11 13:58:46 -05:00
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
ef49f63d8d 12.5.1-2 baseline 
Former-commit-id: ac708c050d [formerly 84d191e7b6] [formerly ac708c050d [formerly 84d191e7b6] [formerly b36c69cc67 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: f6300cd995 [formerly a821111fbf]
Former-commit-id: 377ae76413
 2012-05-03 19:17:13 -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