Steve Harris
4c10c7a5be
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: b64fbe549a28ef804e1bb8f0635ad6b64fbe549a28ef804e1bb8f0635ad67fcf9f1cb2b8f0635ad67fcf9f1cb2027eda5dce2a26783ba7900b9aadde22bb7ecd33481cee4c74
2013-03-18 16:52:00 -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: 3e69490ab227c418812f1a999fee5a3e69490ab227c418812f1a999fee5ac18b96dc4c1a999fee5ac18b96dc4c0e9919f6beea27f9cd17245afb28c8fc6748cb3e9d4d1baefe
2013-03-18 16:43:22 -05:00
Steve Harris
0b0c5e4bec
13.3.1-8 baseline
...
Former-commit-id: dd30a5f940bc9df0a8f9f97d78994bdd30a5f940bc9df0a8f9f97d78994bc15b3ffe20f97d78994bc15b3ffe202fd4ac939781a3f29afc5f492500ea0c94cc97fb1c2dffd66d
2013-03-18 15:43:32 -05:00
Roger Ferrel
69ecbd4f6f
Issue #1790 Changes for non-blocking TabularDisplayDlg.
...
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d
Former-commit-id: a19092d5c2818b856f97c43b7777e1a19092d5c2818b856f97c43b7777e1ebe57f1cbcc43b7777e1ebe57f1cbccec76b08bf46428ed944ff944b47681cada5eec3d8000c1526
2013-03-14 15:38:08 -05:00
Ben Steffensmeier
c903521884
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: 8e2333d0d7d27d30c2dbf46686a6e28e2333d0d7d27d30c2dbf46686a6e22ca86633d6f46686a6e22ca86633d64936191404334af0001b5068b18c6a0778375180866c873f71
2013-02-28 17:00:56 -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: abdc73315164744fdb19a0573644c4abdc73315164744fdb19a0573644c42641d578e2a0573644c42641d578e27e48d3e6844f155a183a33dd2589f1f3c3191a1cb5d9e75b95
2013-02-21 15:41:39 -06:00
Steve Harris
fac2d20002
13.3.1-1 baseline
...
Former-commit-id: e0406d31838ae397085e71e8990021e0406d31838ae397085e71e8990021d2a654625f71e8990021d2a654625fdb712e1fcfe4435815c946d28be4a4b3b56830b08c828dbd75
2013-02-20 16:19:40 -06:00
Ben Steffensmeier
0713bb380c
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
...
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: bd6e0f84621940a92596aa4c7526ffbd6e0f84621940a92596aa4c7526ff8c0e9d3d9eaa4c7526ff8c0e9d3d9e4140260659086f6aabe9455aa4628f49b700da85c300faa186
2013-02-14 15:34:25 -06:00
Roger Ferrel
b8a09f0ab6
Issue #1578 Changes for non-blocking DataTashCanDlg and clean up to data managers.
...
Review changes 2.
Change-Id: I4d697ccc5a2e5ab63dfef3e52e88d039adfcdaa0
Former-commit-id: 247d0550b9b0d1575727b2dc220bcd247d0550b9b0d1575727b2dc220bcddd85695eb9b2dc220bcddd85695eb92321480a4fb04dee98c70731398ac783fc1951f48c2defd927
2013-02-07 09:12:24 -06:00
Steve Harris
b92dfd1b62
13.2.1-2 baseline
...
Former-commit-id: a4fa438a4133bc5fd81683e9157df7a4fa438a4133bc5fd81683e9157df7328c6dccad83e9157df7328c6dccadce726fadc7d9be4dce2147cc08ac79547c1dedd12779f5c6d9
2013-01-23 11:18:44 -05:00
Steve Harris
2c834d0f58
13.2.1-1 baseline
...
Former-commit-id: 11b05eedeb48d1aa77329771dfae6b11b05eedeb48d1aa77329771dfae6bc63f9bcae09771dfae6bc63f9bcae01d1791b3b48ed6a53113f6670806bf9146e727f908bf724a6c
2013-01-23 11:13:03 -05:00
Max Schenkelberg
56d05965a7
Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames
...
Amend: Cleaned up comments and some bugs in code after review
Amend: Rebased changes
Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d
Former-commit-id: 77c2ae6ad1e5cd1901a5ff72ce0b0c77c2ae6ad1e5cd1901a5ff72ce0b0cdb3e7bab99ff72ce0b0cdb3e7bab994e507c57f6fac8769336c246f5656821dae56a1bbe1fb93c1b
2013-01-15 14:41:19 -06:00
Richard Peter
0a55bcfd67
Merge branch 'ss_builds' (13.2.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 6e42fa32d3a966546e313fb7d96ec16e42fa32d3a966546e313fb7d96ec11dbb34523b3fb7d96ec11dbb34523bd880361e0679ef100838345dfd2ca9cd2014bf8de838f2db25
2013-01-14 18:07:17 -06:00
Steve Harris
e5f32a2bbe
13.2.1-1 baseline
...
Former-commit-id: 8dd688c8785dfe4d10f1e62172c8c78dd688c8785dfe4d10f1e62172c8c781849e3cbbe62172c8c781849e3cbb3d35fd52d5e34695538d8713dfc5caebff2a6275b4556ea28f
2013-01-14 18:42:21 -05:00
Richard Peter
7d529beed2
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 95f0508c29d0a6ba23e5029ebaa63a95f0508c29d0a6ba23e5029ebaa63a328be6ac2b029ebaa63a328be6ac2b177a54d19a80bf1d7a286a5a0d7d09709af3b25e398b47967d
2013-01-09 17:55:05 -06:00
Steve Harris
3e63f280a2
13.1.2-6 baseline
...
Former-commit-id: 1d4d25b49befd3392abe8e5f9e0e6c1d4d25b49befd3392abe8e5f9e0e6c59969775ad8e5f9e0e6c59969775adfe763963e982a1ed77a4dbcae57f5705bdc0ecd2b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f03151208e5515c0c1d56f3ae8f4a2f03151208e5515c0c1d56f3a4ba416aeb3c0c1d56f3a4ba416aeb382cdde8491cd4185ef5c941337c553b6fa9b4858f52ec0b0a0
2013-01-06 14:32:24 -06:00
Max Schenkelberg
8f83ab09b5
Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
...
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb
Former-commit-id: 24938de2d2be99f6c7ca3e128b266a24938de2d2be99f6c7ca3e128b266a5db71ca9433e128b266a5db71ca943cf9e6ff3b2d43e0c1c25b74d788909206116ab662030832669
2012-12-12 11:39:32 -06:00
Max Schenkelberg
8215537399
Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
...
Amend: Added back in TimeMatchBasisCapability. Someday will need to figure out bundle migration since this unused class can never die
Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6
Former-commit-id: a113ecd2ea56ae27e172b648c5828ea113ecd2ea56ae27e172b648c5828eed77d56a84b648c5828eed77d56a841f8c88490af681c1304cb24440cc37b8b98a78c3a7b239f9c1
2012-11-29 10:29:36 -06:00
Steve Harris
b5fd6ed2fd
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 1ee89387488fc896f7d4448dd1c35f1ee89387488fc896f7d4448dd1c35f00f3d51546448dd1c35f00f3d5154698670f1cc221ecd53719c8cac5291559efd9a217ae9d9985cd
2012-11-13 17:28:50 -06:00
Steve Harris
9e4dbe2640
12.12.1-2 baseline
...
Former-commit-id: 7192b19284ed809a02dba8560580f87192b19284ed809a02dba8560580f86868eb9b23a8560580f86868eb9b235365b72401111e7607cfdf89fe9bed96a4a4f3f553d74c66e7
2012-11-13 17:14:24 -06:00
Ben Steffensmeier
84ee3cecaa
merge Unified_Grid with ss_builds to 12.11.1-7
...
Former-commit-id: 1a215cb42a4f503d3a1e6a9ff88b331a215cb42a4f503d3a1e6a9ff88b33c2934ae7a56a9ff88b33c2934ae7a524de7509329b8f2bcdbda77d2097f8dd5ab10b6186562637f0
2012-10-25 12:22:11 -05:00
Steve Harris
e42c12350b
12.11.1-3 baseline
...
Former-commit-id: a65c057df5196afa0e5f2d0c424713a65c057df5196afa0e5f2d0c4247135d796f775c2d0c4247135d796f775c7fcbb49a3e725b2f8ba55723fb0031bf1f88482bc25ebcdc41
2012-10-15 16:30:31 -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: a67ce9586cde3769129c8b7256b1aea67ce9586cde3769129c8b7256b1ae266a2f317f8b7256b1ae266a2f317f97c23508d7fde1e73d58fed5a35af3b2fdd9283d29777154bb
2012-10-12 12:45:50 -05:00
Steve Harris
75d99f4e93
12.11.1-2 baseline
...
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 04da0dbf5075901860c2c12ee14e6604da0dbf5075901860c2c12ee14e661e02387ff1c12ee14e661e02387ff16e0b2c55d7772c60efa442bf60b2fce72b6d5da6ff9321e3ce
2012-10-08 13:26:20 -05:00
Ben Steffensmeier
2495d79171
Issue #189 convert hydro and hydrocommon to grid.
...
Former-commit-id: a5c60f0f133e0da6d1718d150d404ca5c60f0f133e0da6d1718d150d404c3e93e8980b8d150d404c3e93e8980bf976af446f3a1ba7bd87734922cb4424e6010646d3f7a486e7
2012-10-01 14:05:40 -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: 9eecab65c04fe2127bfbbd8eb7fc159eecab65c04fe2127bfbbd8eb7fc1505849f634dbd8eb7fc1505849f634d6af74b843c6b058ace34b547d9dd8fa28984c40c9509d72ef9
2012-09-18 15:19:05 -05:00
Steve Harris
987397b2db
12.10.1-4 baseline
...
Former-commit-id: ddc923e3e09cd1f3ec0f791ef6cedfddc923e3e09cd1f3ec0f791ef6cedf92cc2d8605791ef6cedf92cc2d860527d8601fe0f641cdd4e0b4d2a0e8dd451459d8cbf61c5114e8
2012-09-13 12:33:36 -05:00
Steve Harris
ed04125cd7
12.10.1-4 baseline
...
Former-commit-id: 0d8d18d7e2e38e81ab8cfd19ca56240d8d18d7e2e38e81ab8cfd19ca562449c3861597fd19ca562449c3861597424c32bd5d684feb34e52ba58a357626b7d083ece57e7237a9
2012-09-13 12:08:11 -05:00
Steve Harris
bc97cf788a
12.10.1-1 baseline
...
Former-commit-id: 7248f8b7620abf64b77c195158c0047248f8b7620abf64b77c195158c004d708932029195158c004d7089320299f4fa7bf83e720b8ed317bd9c63dc7d65f35ffe9a924a8347a
2012-09-04 12:07:27 -05:00
Steve Harris
aec9addbfc
12.9.1-11 baseline
...
Former-commit-id: a2bb1dabe0d07c18918d6eb6b0909ba2bb1dabe0d07c18918d6eb6b0909bfc405efab76eb6b0909bfc405efab7503b7bf15cdc5ec3d16da14374fcd4f401755cde982804ee0e
2012-08-30 14:36:12 -05:00
Steve Harris
98059f9ef1
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5a1d931fd4461f269f54c77cbd6c1e5a1d931fd4461f269f54cf2fac3942861f269f54cf2fac39428d9faed979f7fb0b17bd572824561cb9b5c2094ed2d928d328e
2012-08-21 15:27:03 -05:00
Steve Harris
867586657b
12.9.1-4 baseline
...
Former-commit-id: 71b024e3a136c108e960dcda3a229071b024e3a136c108e960dcda3a229033b95fb96ddcda3a229033b95fb96d80655bf0a3d7d60cc6239990bf909bde9b64b5017e1d1f6e08
2012-08-15 15:19:10 -05:00
Steve Harris
31353e2296
12.9.1-1 baseline
...
Former-commit-id: b9fb1c89d48309193ce931ae7ea218b9fb1c89d48309193ce931ae7ea21879ce6cfd9731ae7ea21879ce6cfd97d3023f15acaed7a644df0c5d9e241663bcadf12116d7d955fc
2012-08-15 13:59:00 -05:00
Steve Harris
1098368e19
12.8.1-5 baseline
...
Former-commit-id: 2e804fc8c42653ddc2e3fd2abfb6f12e804fc8c42653ddc2e3fd2abfb6f1cd49ef3edafd2abfb6f1cd49ef3eda4f47148ceddab00b12e6e0c3722fd1e86949a8d3d3be09bd74
2012-08-01 10:45:37 -05:00
Steve Harris
23dc8deeb0
12.7.1-8 baseline
...
Former-commit-id: b242dd98d611f96dbedd16bf591a33b242dd98d611f96dbedd16bf591a33c42ae0fa3916bf591a33c42ae0fa39e1eb7f5972f2102bfb249f971829649aabe438b936e2ad3023
2012-07-19 16:20:40 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e48552902906b13cbb7e002f10c7a1e48552902906b13cbb7e003904c4ccf5b13cbb7e003904c4ccf51f521a70b397c4db937e676ea3192f9054c5ab6c39ff9954f8
2012-06-08 13:39:48 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069750b7543dd67a5a683004767b0e069750b7543dd67a5a683002a216f333c67a5a683002a216f333c98d8b3f188a2a6a18faea4e519f3cd8cd5974f4c74b66d9683
2012-04-18 15:18:16 -05:00
Steve Harris
9340618732
12.3.1-10 baseline
...
Former-commit-id: 760ead20470e4128712b4068f5295f760ead20470e4128712b4068f5295f22bd792cd94068f5295f22bd792cd911e448aa398bc60b1e32ce3b74c6052e0f4b241b293563cfe7
2012-03-30 08:38:33 -05:00
Matt Nash
7cb78d5150
Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
...
Former-commit-id: e512d27770a659029ea0f4c5d7f94be512d27770a659029ea0f4c5d7f94b28e3da498ef4c5d7f94b28e3da498e628da725c18dbb17b2e8ef18b8c47fcc50a3273253612b087f
2012-02-07 11:45:28 -06:00
Matt Nash
e1956ce215
Issue #26 tear off menu changes to fix issues
...
Former-commit-id: 41d93a82a10ea872be36542049e45541d93a82a10ea872be36542049e4550ff3ef8d72542049e4550ff3ef8d72b6f2bb73c3919433b8d488689efbfa6f5a048cac817e2a41d6
2012-02-03 13:13:15 -06:00
Matt Nash
515196cb86
Moving 12.1.1 into ss_sync
...
Former-commit-id: d8da2252c3580e2938d766be3bec40d8da2252c3580e2938d766be3bec40c83e5ff47466be3bec40c83e5ff474fa4cd88c9082300ccdcf21d2361f001faae4248421d2361f00bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67a02aeb236c9f19e3f712133dc97f67a02aeb236c9f19e3f71206a8b51d6d9f19e3f71206a8b51d6d9bb8decbcf8e80217e59377dcd10b93360eb6c5f377dcd10b9e2ecdcfe33
2012-01-06 08:55:05 -06:00
