Steve Harris
96ba08115a
Merge branch 'omaha_13.3.1' into development
...
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 8db22baf07310474ae9b36df63be5ccb5ea76f9836df63be5ccb5ea76f98104e6e79e8d00dc0d174
2013-03-20 13:45:11 -05:00
Mike Duff
e205993cba
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
...
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: 361434a64f70efff8f0ab115d3611c058064ce0db115d3611c058064ce0d7e66c8e46d3e1b4ba54b
2013-03-19 10:10:01 -05:00
Steve Harris
027eda5dce
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: b64fbe549a28ef804e1bb8f0635ad67fcf9f1cb2b8f0635ad67fcf9f1cb2900b9aadde2a26783ba7
2013-03-18 16:52:00 -05:00
Steve Harris
0e9919f6be
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: 3e69490ab227c418812f1a999fee5ac18b96dc4c1a999fee5ac18b96dc4c245afb28c8ea27f9cd17
2013-03-18 16:43:22 -05:00
Steve Harris
2fd4ac9397
13.3.1-8 baseline
...
Former-commit-id: dd30a5f940bc9df0a8f9f97d78994bc15b3ffe20f97d78994bc15b3ffe205f492500ea81a3f29afc
2013-03-18 15:43:32 -05:00
Steve Harris
47cde9bd09
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 4c4c79036c36261cb095753a5213ab0cd7e56e65753a5213ab0cd7e56e65d5bcdb0015bca46a1354
2013-03-12 16:04:23 -05:00
Dave Hladky
eefd544e4b
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: e17f8e05115c65862b8fa1006667e04b08491880a1006667e04b084918806ea95002de155903d135
2013-03-12 15:48:34 -05:00
Steve Harris
0cec06c171
13.3.1-6 baseline
...
Former-commit-id: 4eef6862d62e110bd1513a4c7931e1566b677d093a4c7931e1566b677d094ed21b702b6fe4b16924
2013-03-12 08:35:45 -05:00
Ben Steffensmeier
4936191404
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: 8e2333d0d7d27d30c2dbf46686a6e22ca86633d6f46686a6e22ca86633d65068b18c6a334af0001b
2013-02-28 17:00:56 -06:00
Ron Anderson
c0364ee665
Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
...
Former-commit-id: 9c2caa95a070050ac749f1ad632c3f884d9ff787f1ad632c3f884d9ff7872c8d14406b744391e3f6
2013-02-19 18:46:16 -06:00
Steve Harris
bca88ba9c7
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: f1f5359a2fc2327ce33dea50a5db77d123c044c3ea50a5db77d123c044c31c08acab3881f1fb83a0
2013-02-19 12:22:00 -06:00
Steve Harris
db02d32440
13.2.1-8 baseline
...
Former-commit-id: d176ec1f3818da2e93d7f81b382c04053156f02ef81b382c04053156f02ec6d584758f8cffb55371
2013-02-18 09:09:41 -06:00
Ben Steffensmeier
4140260659
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
...
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: bd6e0f84621940a92596aa4c7526ff8c0e9d3d9eaa4c7526ff8c0e9d3d9e455aa4628f086f6aabe9
2013-02-14 15:34:25 -06:00
Mike Duff
ac13852b92
Issue #1550 - Add ability for MPE to preload maps on perspective open.
...
Former-commit-id: 1740e14fa9944c5a4732f9fec9668c5940423ac8f9fec9668c5940423ac8b55adb3cce2edb4f1117
2013-01-29 15:39:40 -06:00
Steve Harris
ce726fadc7
13.2.1-2 baseline
...
Former-commit-id: a4fa438a4133bc5fd81683e9157df7328c6dccad83e9157df7328c6dccad47cc08ac79d9be4dce21
2013-01-23 11:18:44 -05:00
Steve Harris
1d1791b3b4
13.2.1-1 baseline
...
Former-commit-id: 11b05eedeb48d1aa77329771dfae6bc63f9bcae09771dfae6bc63f9bcae0f6670806bf8ed6a53113
2013-01-23 11:13:03 -05:00
Max Schenkelberg
4e507c57f6
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: 77c2ae6ad1e5cd1901a5ff72ce0b0cdb3e7bab99ff72ce0b0cdb3e7bab99c246f56568fac8769336
2013-01-15 14:41:19 -06:00
Richard Peter
d880361e06
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: 6e42fa32d3a966546e313fb7d96ec11dbb34523b3fb7d96ec11dbb34523b345dfd2ca979ef100838
2013-01-14 18:07:17 -06:00
Steve Harris
3d35fd52d5
13.2.1-1 baseline
...
Former-commit-id: 8dd688c8785dfe4d10f1e62172c8c781849e3cbbe62172c8c781849e3cbb8713dfc5cae34695538d
2013-01-14 18:42:21 -05:00
Richard Peter
177a54d19a
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 95f0508c29d0a6ba23e5029ebaa63a328be6ac2b029ebaa63a328be6ac2b6a5a0d7d0980bf1d7a28
2013-01-09 17:55:05 -06:00
Steve Harris
fe763963e9
13.1.2-6 baseline
...
Former-commit-id: 1d4d25b49befd3392abe8e5f9e0e6c59969775ad8e5f9e0e6c59969775addbcae57f5782a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f03151208e5515c0c1d56f3a4ba416aeb3c0c1d56f3a4ba416aeb3941337c553cd4185ef5c
2013-01-06 14:32:24 -06:00
Max Schenkelberg
cf9e6ff3b2
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: 24938de2d2be99f6c7ca3e128b266a5db71ca9433e128b266a5db71ca943b74d788909d43e0c1c25
2012-12-12 11:39:32 -06:00
Steve Harris
377804398b
Merge branch 'ss_builds' (12.12.1-12) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: d27c5237c34d4771ee3a43ddfe98c4f6988eefff43ddfe98c4f6988eefff6287b32e7df02c1ef71d
2012-12-11 08:45:53 -06:00
Steve Harris
a45a7fe1bf
12.12.1-8 baseline
...
Former-commit-id: 8790caf84e2d338b4cec19962f41ba5093a7c44219962f41ba5093a7c442ee06a94735ff4131c2ee
2012-12-06 09:02:51 -06:00
Max Schenkelberg
1f8c88490a
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: a113ecd2ea56ae27e172b648c5828eed77d56a84b648c5828eed77d56a84b24440cc37f681c1304c
2012-11-29 10:29:36 -06:00
Steve Harris
98670f1cc2
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 1ee89387488fc896f7d4448dd1c35f00f3d51546448dd1c35f00f3d51546c8cac5291521ecd53719
2012-11-13 17:28:50 -06:00
Steve Harris
5365b72401
12.12.1-2 baseline
...
Former-commit-id: 7192b19284ed809a02dba8560580f86868eb9b23a8560580f86868eb9b23df89fe9bed111e7607cf
2012-11-13 17:14:24 -06:00
Dustin Johnson
cd5faf58bf
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
...
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: acd4cf94d8efd3d3735a064ef82d1e1dbeb22893064ef82d1e1dbeb228934222b24d092d1e886cf3
2012-11-08 09:57:16 -06:00
Dustin Johnson
fe8a2a3b09
Issue #1302 Merge branch '5-Data_Delivery' into development
...
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 7d0e4a6e758e69107b5a98d7beae5031d7d09c1098d7beae5031d7d09c10bcf575966be7a0f96a9a
2012-11-01 13:36:06 -05:00
Steve Harris
27d8601fe0
12.10.1-4 baseline
...
Former-commit-id: ddc923e3e09cd1f3ec0f791ef6cedf92cc2d8605791ef6cedf92cc2d8605b4d2a0e8ddf641cdd4e0
2012-09-13 12:33:36 -05:00
Steve Harris
424c32bd5d
12.10.1-4 baseline
...
Former-commit-id: 0d8d18d7e2e38e81ab8cfd19ca562449c3861597fd19ca562449c38615972ba58a3576684feb34e5
2012-09-13 12:08:11 -05:00
Steve Harris
c704490769
12.9.1-10 baseline
...
Former-commit-id: 264d870cbfbdb45cdfae3adc50a783cb9b80f3a03adc50a783cb9b80f3a0dc08c5a71af43a5af47f
2012-08-30 14:28:27 -05:00
Steve Harris
d9faed979f
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5a1d931fd4461f269f54cf2fac3942861f269f54cf2fac3942872824561cb7fb0b17bd5
2012-08-21 15:27:03 -05:00
Steve Harris
80655bf0a3
12.9.1-4 baseline
...
Former-commit-id: 71b024e3a136c108e960dcda3a229033b95fb96ddcda3a229033b95fb96d9990bf909bd7d60cc623
2012-08-15 15:19:10 -05:00
Steve Harris
988563a4b6
12.9.1-3 baseline
...
Former-commit-id: 8083b81729c11f7d396e36d80b1f6084bbf2573e36d80b1f6084bbf2573eedbbacfa8aa535b51eba
2012-08-15 14:26:10 -05:00
Steve Harris
330df3323f
12.8.1-10 baseline
...
Former-commit-id: 79d4d91e466244359a80b5e8fee24dca25d508ecb5e8fee24dca25d508ecd5563fc34078d34d65d2
2012-08-06 09:34:26 -05:00
Steve Harris
4f47148ced
12.8.1-5 baseline
...
Former-commit-id: 2e804fc8c42653ddc2e3fd2abfb6f1cd49ef3edafd2abfb6f1cd49ef3edae0c3722fd1dab00b12e6
2012-08-01 10:45:37 -05:00
Steve Harris
e1eb7f5972
12.7.1-8 baseline
...
Former-commit-id: b242dd98d611f96dbedd16bf591a33c42ae0fa3916bf591a33c42ae0fa399f97182964f2102bfb24
2012-07-19 16:20:40 -05:00
Steve Harris
e528bb0df2
12.6.1-9 baseline
...
Former-commit-id: 32fdf6ed3b7c064b68682c0ff851ca27afa603452c0ff851ca27afa603454f7bb90bb0dc50bc8443
2012-07-10 07:53:49 -05:00
Steve Harris
1f521a70b3
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e48552902906b13cbb7e003904c4ccf5b13cbb7e003904c4ccf5676ea3192f97c4db937e
2012-06-08 13:39:48 -05:00
Steve Harris
40aa780b3d
12.4.1-10 baseline
...
Former-commit-id: 7fa9dbd5fb4bfbdad17d9f8cb727a58485b90ff89f8cb727a58485b90ff8a28d70b5c533a67cdd82
2012-05-01 18:06:13 -05:00
Steve Harris
98d8b3f188
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069750b7543dd67a5a683002a216f333c67a5a683002a216f333ca4e519f3cda2a6a18fae
2012-04-18 15:18:16 -05:00
Steve Harris
11e448aa39
12.3.1-10 baseline
...
Former-commit-id: 760ead20470e4128712b4068f5295f22bd792cd94068f5295f22bd792cd9ce3b74c6058bc60b1e32
2012-03-30 08:38:33 -05:00
Matt Nash
149e9783f1
Issue #26 fix gage color for hydro to refresh
...
Former-commit-id: 09b640cd98c4fee978d7f7652d25e3bb4f690393f7652d25e3bb4f69039382089434e5d3433544ab
2012-02-07 16:49:34 -06:00
Matt Nash
628da725c1
Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
...
Former-commit-id: e512d27770a659029ea0f4c5d7f94b28e3da498ef4c5d7f94b28e3da498eef18b8c47f8dbb17b2e8
2012-02-07 11:45:28 -06:00
Max Schenkelberg
2683c94927
Issue #206 Made tear off menu dialog activate contexts for perspective
...
Former-commit-id: 83de7660b6c410a4eb335f8d30bb43e422b13ded5f8d30bb43e422b13ded3a26b0cea52185e1a31e
2012-02-01 17:03:20 -06:00
Matt Nash
e4fb11ce75
Issue #26 add tear off code to git baseline
...
Former-commit-id: ea6ef73802892cb9a7aecf4e1f764e4286cb0342cf4e1f764e4286cb03428e3d2af84ee8d239e963
2012-01-25 12:50:31 -06:00
Matt Nash
fa4cd88c90
Moving 12.1.1 into ss_sync
...
Former-commit-id: d8da2252c3580e2938d766be3bec40c83e5ff47466be3bec40c83e5ff47421d2361f001faae4248482300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67a02aeb236c9f19e3f71206a8b51d6d9f19e3f71206a8b51d6d377dcd10b93360eb6c5f8e80217e59
2012-01-06 08:55:05 -06:00
