Commit graph

67 commits

Author SHA1 Message Date
Max Schenkelberg
7e8fe1f4bd Issue #1638 Moved common map actions to core.maps from d2d
Change-Id: I1a41dc0ec41ea97172a5513b3018f22aa2f6879c

Former-commit-id: 4c3016f55c [formerly 82b7e03b10] [formerly 2592dafc5d] [formerly 4c3016f55c [formerly 82b7e03b10] [formerly 2592dafc5d] [formerly 0ad6f8a594 [formerly 2592dafc5d [formerly eacca79223be9b743e97ecfe00813f1d529a05de]]]]
Former-commit-id: 0ad6f8a594
Former-commit-id: 3022b0977d [formerly aca7e67133] [formerly 8385cdfbdb742cdca5ed9177b2194f3575ed4ced [formerly 7e84441327]]
Former-commit-id: 3749d3a6ae138cbb0ca1416b7c860a078a7c46ee [formerly 3493f6f282]
Former-commit-id: dd3b12f980
2013-04-25 16:02:02 -05:00
Steve Harris
c1bb0c2749 Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]]
Former-commit-id: c18b96dc4c
Former-commit-id: 0e9919f6be [formerly ea27f9cd17] [formerly e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]]
Former-commit-id: e6c80b59106bc4b2d5423de97088b928e09b489c [formerly fc6748cb3e]
Former-commit-id: 9d4d1baefe
2013-03-18 16:43:22 -05:00
Steve Harris
0b0c5e4bec 13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 2fd4ac9397 [formerly 81a3f29afc] [formerly 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]]
Former-commit-id: 419ae74464bf2fde736619a602f8bbae8a6b4c86 [formerly 0c94cc97fb]
Former-commit-id: 1c2dffd66d
2013-03-18 15:43:32 -05:00
Dave Hladky
87992329b4 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]]
Former-commit-id: 4b08491880
Former-commit-id: eefd544e4b [formerly 155903d135] [formerly ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]]
Former-commit-id: 70f3f744097c668c89b07b6780fc8db6c04380d8 [formerly 29ed641a13]
Former-commit-id: cdfbcc7136
2013-03-12 15:48:34 -05:00
Steve Harris
ed1788343e 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171 [formerly 6fe4b16924] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a]
Former-commit-id: c28f3aeb02
2013-03-12 08:35:45 -05:00
Steve Harris
86c1edf4ea Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 650db426b9 [formerly cd99e680bb] [formerly b50e384a0f] [formerly 650db426b9 [formerly cd99e680bb] [formerly b50e384a0f] [formerly e8135b9c14 [formerly b50e384a0f [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]]
Former-commit-id: e8135b9c14
Former-commit-id: e4b9ef2cd3 [formerly 901cbbf56d] [formerly 516b4ee30c97e99a87f971673c76dd8b45556e63 [formerly 2398ef1e85]]
Former-commit-id: 2360d951adc310ab576e9dbbb7077bb09c817c57 [formerly 1d8b6e0256]
Former-commit-id: 108abd5e69
2013-02-25 16:05:22 -06:00
Steve Harris
9d9a17aa64 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]]
Former-commit-id: 6ec9e73035
Former-commit-id: f30d1cdf87 [formerly e46625f8f2] [formerly bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1]]
Former-commit-id: 8958c8255ceab6eb6c8e58c5cb4c8a688e5de950 [formerly 140ae3191c]
Former-commit-id: 9db68d0585
2013-02-25 15:58:48 -06:00
Steve Harris
dbaeb28c82 13.3.1-2 baseline
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]]
Former-commit-id: 3d115ed3be
Former-commit-id: f2428e968a [formerly 370ed98038] [formerly 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]]
Former-commit-id: 6be2b60d013b857004e97817b3188f6eb4ae78f5 [formerly 2a2a9e03b7]
Former-commit-id: a43233f8c2
2013-02-25 10:18:36 -05:00
Ben Steffensmeier
da06d4860d Issue #1617 fixed vb sounding point selection for points which contain the word Point
Former-commit-id: 581c8ffcd5 [formerly be95659d4a] [formerly 1d8ad288b4] [formerly 581c8ffcd5 [formerly be95659d4a] [formerly 1d8ad288b4] [formerly 5701309bcb [formerly 1d8ad288b4 [formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]]]
Former-commit-id: 5701309bcb
Former-commit-id: 3dd76fdb04 [formerly 2892e64677] [formerly fded4c4c5e2d488ca4c56730b284454ede5f92c1 [formerly 7c0f1bf788]]
Former-commit-id: 4ac4da0e3a41ac7f07b242a496793956ec07fffc [formerly 4dad2798e8]
Former-commit-id: ba61a21c10
2013-02-21 16:28:41 -06:00
Steve Harris
34d0f59592 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684 [formerly 4f155a183a] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c]
Former-commit-id: b5d9e75b95
2013-02-21 15:41:39 -06:00
Steve Harris
067dfcb980 13.3.1-1 baseline
Former-commit-id: 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 96c7269df0 [formerly 0569ff413d] [formerly c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19]]
Former-commit-id: a43ccc92cdffebafcecdfdadcfc25825beb32b12 [formerly 654f15be5c]
Former-commit-id: 07e4e4c8fb
2013-02-21 09:36:59 -05:00
Steve Harris
fac2d20002 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
2013-02-20 16:19:40 -06:00
Steve Harris
b43935a991 13.2.1-6 baseline
Former-commit-id: 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 5027d2365b [formerly bbe92e6824] [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d [formerly 30d38334cc]]
Former-commit-id: 0cd3f4b5889bda9de32b546358edf3d8210d3ad8 [formerly 0c128dd8f0]
Former-commit-id: dc55ef579a
2013-02-07 16:00:39 -06:00
Steve Harris
91ea402e4a 13.2.1-6 baseline
Former-commit-id: 9b7251d17e [formerly cc48fa4fc6] [formerly b80782b081] [formerly 9b7251d17e [formerly cc48fa4fc6] [formerly b80782b081] [formerly 53adfb7345 [formerly b80782b081 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]]]
Former-commit-id: 53adfb7345
Former-commit-id: 12e0cd07f2 [formerly 1f44caaedb] [formerly c2b93522588c69765c159821337fa509e477775e [formerly dee1480773]]
Former-commit-id: 18ada68ce3b5705ca7409e9672f65a4b86114240 [formerly 16b7b742be]
Former-commit-id: 46eee24352
2013-02-07 16:38:44 -05:00
Brad Gonzales
b27bb93cf7 Issue #1517 Added SPC Prob menu changes.
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
       Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
       Updated units in spcGuideNDFD.xml.
       Removed local configuration menu items and tags.
       Updated pqact.conf.template SPC entry.
       Update SPC.py with levels.

Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1

Former-commit-id: 7cef72a460 [formerly 35cc853c74] [formerly f459554e33] [formerly 7cef72a460 [formerly 35cc853c74] [formerly f459554e33] [formerly 5bc6dd5498 [formerly f459554e33 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 3e4338339b [formerly 8fc5c18ebd] [formerly 62d4c20906235f41b4a9b49850da7af9a09a8dfd [formerly f3ef309293]]
Former-commit-id: 8092a6222319cfb79a0aacf062d8e75239f377da [formerly adbfa7ced1]
Former-commit-id: 7253bbf20e
2013-02-04 08:52:33 -06:00
Roger Ferrel
afe50ac914 Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes).
Change-Id: Icce03032714b09c67bbb4ec23a426ad1dcdd244b

Former-commit-id: 37bdfa5868 [formerly 3bc828f839] [formerly 5a23770931] [formerly 37bdfa5868 [formerly 3bc828f839] [formerly 5a23770931] [formerly dd41c60e3f [formerly 5a23770931 [formerly fcf6a52f2b172c2450f3f417e4256c04f5eefbcd]]]]
Former-commit-id: dd41c60e3f
Former-commit-id: 5951b04a4f [formerly d4667e3909] [formerly 27165535226953b58522aeb5bae5425c31f9b2fa [formerly e6ff72765a]]
Former-commit-id: 1b66ee7d7d223607fa4b64a5ed56661b5ff5d880 [formerly 6a870cbd8d]
Former-commit-id: 9fc3f7151f
2013-01-28 08:39:36 -06:00
Roger Ferrel
6e25c11a75 Issue #1492 Made GFE's GhgFontDlg and volume browser's InventoryDlg non-blocking; removed no longer needed "original" classes. No code changes merge conflict?
Change-Id: I28676d7b6d016e3f4f61fcc667c2e1d2af9e53d1

Former-commit-id: 413e9beda4 [formerly fbf6bc87c4] [formerly 5250a0addf] [formerly 413e9beda4 [formerly fbf6bc87c4] [formerly 5250a0addf] [formerly cabdfd569f [formerly 5250a0addf [formerly 5444e7653c0cf488eb424a16816beb2e6a9335b1]]]]
Former-commit-id: cabdfd569f
Former-commit-id: 9e9eaa3d4a [formerly 5187be10ca] [formerly 4ee08f43125d4ae99c00e0d968468d22822b0fc2 [formerly e8d8dcc795]]
Former-commit-id: ba6bf8fd510b31739983af51e7ae6b34c91ec512 [formerly 3a9b914186]
Former-commit-id: fe30158953
2013-01-16 13:07:58 -06:00
Max Schenkelberg
7f857992b6 Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously.
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: f51398595e [formerly 9aac1d2871] [formerly 02e7c79de9] [formerly f51398595e [formerly 9aac1d2871] [formerly 02e7c79de9] [formerly aa88b83859 [formerly 02e7c79de9 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]]]
Former-commit-id: aa88b83859
Former-commit-id: cea378c445 [formerly 410abb1144] [formerly 451ec6f6d7261a1c251d7e39253fc41e3af7c367 [formerly c6b6823228]]
Former-commit-id: 12984637b106529c3322a63eb74880567de70ad5 [formerly f35d30e675]
Former-commit-id: 5d6421259b
2013-01-15 14:13:36 -06:00
Richard Peter
7d529beed2 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e]
Former-commit-id: 398b47967d
2013-01-09 17:55:05 -06:00
Steve Harris
3e63f280a2 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
94cd5a1388 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de]
Former-commit-id: af59663a99
2012-11-07 12:41:20 -06:00
Ben Steffensmeier
3e225faa8b merge branch Unifeid_Grid into developement
Former-commit-id: c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 0ee5726a56 [formerly 1d94435220] [formerly e5e3edb870cf3d09a1893575414b5bd00a8d3081 [formerly 92fd247ccc]]
Former-commit-id: 51550491838571c9141b390aa875633f1c0b19a4 [formerly 38b0dafe0b]
Former-commit-id: 1931b503a2
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
84ee3cecaa merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 24de750932 [formerly 9b8f2bcdbd] [formerly de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8]]
Former-commit-id: c7706c1a1114c9415a5ad6c33596002a145bf919 [formerly dd5ab10b61]
Former-commit-id: 86562637f0
2012-10-25 12:22:11 -05:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00
Ben Steffensmeier
51d1c03c36 Merge branch 'ss_builds' into Unified_Grid
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]]
Former-commit-id: 266a2f317f
Former-commit-id: 97c23508d7 [formerly fde1e73d58] [formerly aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3]]
Former-commit-id: 4391a50cd6a1b526355ffcad5b2b61ac30604784 [formerly b2fdd9283d]
Former-commit-id: 29777154bb
2012-10-12 12:45:50 -05:00
Roger Ferrel
434b124dc0 Issue #1248 Changes to allow change listeners on Alter Bundles.
Changes from code review 2.

Change-Id: I8f8640a9c90c0191179c74570855a67370617a20

Former-commit-id: a001e54a85 [formerly 65a19e48b0] [formerly e7d27f4aab] [formerly a001e54a85 [formerly 65a19e48b0] [formerly e7d27f4aab] [formerly 03070aded9 [formerly e7d27f4aab [formerly de530f99fcc7f68a1bd84ed399ff04eac63e7a58]]]]
Former-commit-id: 03070aded9
Former-commit-id: 0653f130b8 [formerly 09bb914dc0] [formerly 1db773c056a395caee481c1f3227dcbac2e92bae [formerly f4861554cd]]
Former-commit-id: 0e45533af831d494fc18a8addc39159b04f67275 [formerly 8982e1baf9]
Former-commit-id: 7044db959a
2012-10-10 06:52:09 -05:00
Roger Ferrel
e7c3ee79c9 Issue #1235 Added checks for disposed widget in MenuContributionItem.
Change-Id: Id44a3d0d8f1e80e961fd5cd6ce4b1515c0670bc7

Former-commit-id: 7892f71ec9 [formerly 67475363ce] [formerly 46bb86c90e] [formerly 7892f71ec9 [formerly 67475363ce] [formerly 46bb86c90e] [formerly 098f41aa2d [formerly 46bb86c90e [formerly 3fb623c0078fe934c9a5d2814f9d450a82afb788]]]]
Former-commit-id: 098f41aa2d
Former-commit-id: cf1a8ef1f6 [formerly f3a45d59a4] [formerly ecad763ad5794b48d492324510634277c49ae594 [formerly b61aeb3d52]]
Former-commit-id: 7cf37ff48ae7291a9c51cc0849a8fcee60692a79 [formerly 42a3c2223e]
Former-commit-id: f83da4367e
2012-10-03 12:22:51 -05:00
Roger Ferrel
3433045261 Issue #1234 PointsMgrDialog now adds new nodes when no node selected and VolumeBrowserDlg accounts for having no points.
Change-Id: Ida0439f71f0aed57e18f0fc043f6ac5503fa11d1

Former-commit-id: 26c8ffc2d5 [formerly 01d49de150] [formerly d688c3793e] [formerly 26c8ffc2d5 [formerly 01d49de150] [formerly d688c3793e] [formerly c9674e872d [formerly d688c3793e [formerly f70c63c1ece76df9f94fdfcee3e373b5ae4cea3c]]]]
Former-commit-id: c9674e872d
Former-commit-id: 922dd8f1bb [formerly 694f955395] [formerly 55a3468fe088b3df6e3118fc7a7a0310231be97d [formerly 370e6956fc]]
Former-commit-id: 291296984cb4676f15f55d868ea2a8c46a653aa4 [formerly 1baa59490e]
Former-commit-id: 0858a1e61b
2012-10-02 14:41:30 -05:00
Roger Ferrel
be67d88be4 Issue #1216 Added Point Change Listeners to update the Volume Browser menus.
Clean up code to properly dispose of menus.

Change-Id: I99ff2dab3ce640eef0b007314cc59842c09119a7

Former-commit-id: cc5d2dd1ec [formerly c21208526f] [formerly 77f036e378] [formerly cc5d2dd1ec [formerly c21208526f] [formerly 77f036e378] [formerly df0a055852 [formerly 77f036e378 [formerly b8c5c0a1762d520bfd3990a418bb851baf234c05]]]]
Former-commit-id: df0a055852
Former-commit-id: 200fa6e150 [formerly 8d7ea9fed1] [formerly c2d29de4bfd5d650fddd5541ad9ffa3251829fec [formerly 77ec18868d]]
Former-commit-id: fa478ba872b51826c13f5ad9a9ce77c3b4551b6c [formerly 4058c3d439]
Former-commit-id: 215e97f51d
2012-09-27 08:19:21 -05:00
Roger Ferrel
a342d63ec3 Issue #1215 Added runWithEvent override in PointToolAction.
Reviewer comments implemented.
Change-Id: I60fbf26f8721750a11ada9ceaffe65a2d3c9dabf

Former-commit-id: 42030e5f4a [formerly 5d93bdd642] [formerly 99378b0fe5] [formerly 42030e5f4a [formerly 5d93bdd642] [formerly 99378b0fe5] [formerly 9df9bc7530 [formerly 99378b0fe5 [formerly c22956889d2368d0ec4fe8f524c98745791737c6]]]]
Former-commit-id: 9df9bc7530
Former-commit-id: d9771a94a1 [formerly 9cb2d0abea] [formerly 615049b73c1a7a84fabd68c3dd78e85a6dd37a6c [formerly 11a7956541]]
Former-commit-id: 13501a6e6f0d4722b49d0fa83bb7d8b35fc59c1e [formerly 1f3b361e0d]
Former-commit-id: 2c508b7ca3
2012-09-26 07:24:38 -05:00
Ben Steffensmeier
696c4400a9 Issue #189 conversion of vb to use grid correctly.
Former-commit-id: 15f284ac89 [formerly a0fd9c1fbf] [formerly ee36e85848] [formerly 15f284ac89 [formerly a0fd9c1fbf] [formerly ee36e85848] [formerly 393f087340 [formerly ee36e85848 [formerly b47ccc0e899e6067f6c827f5637bb250aa186d7c]]]]
Former-commit-id: 393f087340
Former-commit-id: 8de76a1f0c [formerly 04c99e842f] [formerly d9a033c3335f5a669789916e1922c8823b4a320e [formerly 7d9d3931b4]]
Former-commit-id: 4a5d5ba4b0ad3b7feabd462b8393538dc2df5106 [formerly d9fb077943]
Former-commit-id: 35677ab26c
2012-09-25 15:05:46 -05:00
Steve Harris
c340962852 Merge branch 'ss_builds' (12.10.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java

Former-commit-id: 6cb180ff5b [formerly 686b1756c9] [formerly 8354ca4e68] [formerly 6cb180ff5b [formerly 686b1756c9] [formerly 8354ca4e68] [formerly 3827a78a7b [formerly 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]]]
Former-commit-id: 3827a78a7b
Former-commit-id: 01f5a0b21a [formerly 8edfe17e7d] [formerly 194b5d78ca44a987232c43b536b8a7d0f46623ae [formerly f5f59b6aa5]]
Former-commit-id: abfb2e968285e9270187ca573daba380b3340361 [formerly a20533b551]
Former-commit-id: 94cb625e91
2012-09-25 10:31:57 -05:00
Steve Harris
60ef7d29e0 12.10.1-6 baseline
Former-commit-id: dd922048c0 [formerly 81d91a8289] [formerly cebe6534ae] [formerly dd922048c0 [formerly 81d91a8289] [formerly cebe6534ae] [formerly ba648f8e72 [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]]
Former-commit-id: ba648f8e72
Former-commit-id: d5ec4edea1 [formerly 0e77eb2fe2] [formerly e2eff41ad429447d5c80be0157ac1ea818d306fa [formerly 5d5a61bd75]]
Former-commit-id: ca8586dbe32865ad7ca07ad5a47da5d57ccd01ad [formerly e39023bb85]
Former-commit-id: 20732fcbd5
2012-09-25 10:14:23 -05:00
Ben Steffensmeier
2be6128151 Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 54767956bc [formerly 8e5b20236d] [formerly 9632663c0a] [formerly 54767956bc [formerly 8e5b20236d] [formerly 9632663c0a] [formerly f918b6636f [formerly 9632663c0a [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]]
Former-commit-id: f918b6636f
Former-commit-id: ecdef95d0a [formerly 9512238d6e] [formerly 7490d8b24afa2934ebd15d8ff27aa170ba918366 [formerly 6c38e6abb2]]
Former-commit-id: c681a18cb95fad2c1f4c02dc98365a32a2b66a40 [formerly 769e28c28d]
Former-commit-id: 231ab11d9a
2012-09-24 14:05:22 -05:00
Ben Steffensmeier
2c73e5a2d3 Issue #1131 merge multipane nsharp into D2D.
Former-commit-id: f68919cd08 [formerly cb6b9dda23] [formerly c04649842a] [formerly f68919cd08 [formerly cb6b9dda23] [formerly c04649842a] [formerly 2606f968cb [formerly c04649842a [formerly 14310917dffa9bb2a805f3ff8fc98ccfdd1c9d92]]]]
Former-commit-id: 2606f968cb
Former-commit-id: 81b569a8f8 [formerly b83ca44d6b] [formerly ffd63f3c9e74adbc96cb48f93c0afa5f9de5a89a [formerly 036aa08f2c]]
Former-commit-id: 2196697644a1958a810f83bd43efdccc96f18efc [formerly 8fc544b44f]
Former-commit-id: c43b7c1dd7
2012-09-20 17:28:54 -05:00
Ben Steffensmeier
d418d8c7bc Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 69283c27a8 [formerly 5f787b6a6b] [formerly 4be2aa88c7] [formerly 69283c27a8 [formerly 5f787b6a6b] [formerly 4be2aa88c7] [formerly 0132d35871 [formerly 4be2aa88c7 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]]]
Former-commit-id: 0132d35871
Former-commit-id: 263cfe59f4 [formerly d1c3a0c1eb] [formerly 6b333c59dfdca8b278d838cd1ed91e9d23e9ae87 [formerly 174d8ad029]]
Former-commit-id: 7dc1a53eb5c14b2a4f3a69bbdfcd21cb9ea1c4b6 [formerly 90dc005f25]
Former-commit-id: 3b6a1ac6a9
2012-09-20 12:24:35 -05:00
Ben Steffensmeier
f13ba32307 Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 9eecab65c0 [formerly 4fe2127bfb] [formerly bd8eb7fc15] [formerly 9eecab65c0 [formerly 4fe2127bfb] [formerly bd8eb7fc15] [formerly 05849f634d [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]]
Former-commit-id: 05849f634d
Former-commit-id: 6af74b843c [formerly 6b058ace34] [formerly 28ed264c21455f309a74a270145d56d9aa7064df [formerly b547d9dd8f]]
Former-commit-id: f3894ca9c56c5ba2f1f317fbf84aa3eceec77726 [formerly a28984c40c]
Former-commit-id: 9509d72ef9
2012-09-18 15:19:05 -05:00
Steve Harris
01248e7101 Merge branch 'development' into Enhanced_points
Former-commit-id: b84b354c01 [formerly 2e47ad78bc] [formerly 321e2191b1] [formerly b84b354c01 [formerly 2e47ad78bc] [formerly 321e2191b1] [formerly 6146f56ce4 [formerly 321e2191b1 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]]]
Former-commit-id: 6146f56ce4
Former-commit-id: 92bac7167a [formerly bc86013d8f] [formerly 1519ecf79b5f70bd2a5878e760356c231a28383c [formerly 9ca736f901]]
Former-commit-id: 8426fe487b6ac801ec3e1fdc9e8591d2f018b9cf [formerly 69b6272658]
Former-commit-id: 40ddaa276f
2012-09-13 15:25:12 -05:00
Steve Harris
987397b2db 12.10.1-4 baseline
Former-commit-id: ddc923e3e0 [formerly 9cd1f3ec0f] [formerly 791ef6cedf] [formerly ddc923e3e0 [formerly 9cd1f3ec0f] [formerly 791ef6cedf] [formerly 92cc2d8605 [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]]
Former-commit-id: 92cc2d8605
Former-commit-id: 27d8601fe0 [formerly f641cdd4e0] [formerly 53da655c90a1b4d0e3b7bbcaf373c23ba32edc6a [formerly b4d2a0e8dd]]
Former-commit-id: 5159825bf9b81d8d0188fb4bcfd469ccb27fd393 [formerly 451459d8cb]
Former-commit-id: f61c5114e8
2012-09-13 12:33:36 -05:00
Steve Harris
ed04125cd7 12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec]
Former-commit-id: e57e7237a9
2012-09-13 12:08:11 -05:00
Steve Harris
5b45d94813 Merge branch 'development' into Enhanced_points
Former-commit-id: bb6fe85a47 [formerly 892598dc66] [formerly 1dd1305a5d] [formerly bb6fe85a47 [formerly 892598dc66] [formerly 1dd1305a5d] [formerly ada1066831 [formerly 1dd1305a5d [formerly 632a766ec44337156bab8df73aecdee8b7bc2853]]]]
Former-commit-id: ada1066831
Former-commit-id: 0f90ce8b04 [formerly e0ee6bbf96] [formerly ad082c7958881e97fce6af73febade39a438deb1 [formerly d85659d9de]]
Former-commit-id: 5c4e50ab82874e05d162915d324435e735821222 [formerly d20a1de861]
Former-commit-id: 73b1005512
2012-09-12 14:14:56 -05:00
Steve Harris
4ccea19158 12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]]
Former-commit-id: a66f3f4b60
Former-commit-id: 406bde9fd0 [formerly ec74f638e5] [formerly f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d]]
Former-commit-id: c8612b01cf2efa0937102321eb6c14dfe7097005 [formerly cc3c3dadee]
Former-commit-id: 5684a84a46
2012-09-11 15:50:57 -05:00
Steve Harris
623ef12926 Merge branch 'development' into Enhanced_points
Former-commit-id: feccb1205d [formerly fa7c31206b] [formerly 5feac55dbd] [formerly feccb1205d [formerly fa7c31206b] [formerly 5feac55dbd] [formerly 32cf7fd764 [formerly 5feac55dbd [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]]]
Former-commit-id: 32cf7fd764
Former-commit-id: ff1a0c911d [formerly 5a8e58eda5] [formerly 9a3bf8cf46dc47950600c368d21537bbdc91f65e [formerly 592ab923bb]]
Former-commit-id: d4e2d37f80b06066e7cda073f08f001469489663 [formerly 66ac1051bc]
Former-commit-id: 7c1cebf5b1
2012-08-30 15:43:06 -05:00
Steve Harris
98059f9ef1 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
2012-08-21 15:27:03 -05:00
root
73466bae44 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8]
Former-commit-id: 0eb9520e15
2012-08-15 22:15:20 +00:00
Steve Harris
d7acb65c06 12.9.1-3 baseline
Former-commit-id: 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 988563a4b6 [formerly a535b51eba] [formerly 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a]]
Former-commit-id: 60681d51155fd0d8fea0ced04f4dc5174712adca [formerly 8c5c5ad6eb]
Former-commit-id: 03bb51ed0e
2012-08-15 14:26:10 -05:00
Roger Ferrel
1f7a1a5014 Issue #875 Markers and group added to Cave.
Amend: Removed python file

Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.

Amend: deleted unwanted .project file

Amend: Removed comment out code and fix class descriptions

Amend: Changes based on reviewer comments.

Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8

Former-commit-id: f8d0512703 [formerly b3c357c964] [formerly 2e3fc4b400] [formerly f8d0512703 [formerly b3c357c964] [formerly 2e3fc4b400] [formerly f4ae8eb150 [formerly 2e3fc4b400 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]]]
Former-commit-id: f4ae8eb150
Former-commit-id: f8e0bfb797 [formerly 69f22fe6bb] [formerly f9ea3b03486c9aff9f813d9e892a99cac8ea4ff8 [formerly ae41499ba2]]
Former-commit-id: 45c91ff9d7d494867bad9335476e510559f42a10 [formerly 4e356b8a13]
Former-commit-id: 4e15803926
2012-08-08 13:35:47 -05:00
Roger Ferrel
1b97f2ad09 Issue #875 - Create com.raytheon.uf.viz.points
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: cc1aecde2f [formerly bfcefac909] [formerly 0cf7d64cf4] [formerly cc1aecde2f [formerly bfcefac909] [formerly 0cf7d64cf4] [formerly 9071334fe9 [formerly 0cf7d64cf4 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]]]
Former-commit-id: 9071334fe9
Former-commit-id: 9116d93f52 [formerly c317c5d0a3] [formerly 02403b301463b98f598c97b53f769f6aa9cdf6a2 [formerly b3df932794]]
Former-commit-id: 1d76b537c3a1bcb9fb3c9d0a26d64d72d4c7a715 [formerly d6d4222e24]
Former-commit-id: b75d001a2a
2012-07-12 11:32:03 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
2012-07-10 07:53:49 -05:00