Max Schenkelberg
b32fbad9c8
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
...
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: 7b37bda291882ff345d466f4338b6707ed84d4d5
2013-04-01 12:41:50 -05:00
Lee Venable
4a8c4b64df
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
...
Former-commit-id: 9c117d43e77ffa074c8464771918116f8835b382
2013-04-01 12:26:23 -05:00
Steve Harris
140765a43e
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c
2013-04-01 12:19:04 -05:00
Steve Harris
74a47b9bd9
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
...
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: 98ddc22749f0e5cdb0f4f8f0084ee742486461d5
2013-04-01 12:15:04 -05:00
Lee Venable
fe89cb7fe4
Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
...
Former-commit-id: fe244abd3f625d7334284d4657bd8f35737e86a5
2013-04-01 12:06:16 -05:00
Steve Harris
7bf9966dcb
13.3.1-17 baseline
...
Former-commit-id: 0eb0081dbf1af625ca75e98ab775247c924c3527
2013-04-01 12:04:56 -05:00
Steve Harris
51380726d4
13.3.1-16 baseline
...
Former-commit-id: 18321f88c2efedf141b84e7de18c200e1037f740
2013-04-01 11:39:08 -05:00
Mike Duff
261a39122d
Issue #1830 - Don't allow base level config files for FFMP
...
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: 9ecafb5aacbdb2928902435f342aa4547c2f5903
2013-04-01 11:36:53 -05:00
Richard Peter
e221223f8a
Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
...
Former-commit-id: 6b3523df82d62d75db483baad329cc6d9a2ade13
2013-04-01 11:33:59 -05:00
Steve Harris
eb1dab3864
13.3.1-15 baseline
...
Former-commit-id: 369cf4feaee63c96725cb6efc5774b8f6b8cbf08
2013-04-01 11:33:20 -05:00
Max Schenkelberg
321a29ffa4
Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
...
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments
Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835
Former-commit-id: 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a
2013-04-01 10:19:36 -05:00
Lee Venable
2875600910
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
...
Former-commit-id: 4dad96cbc70936f43a65519eff70ac72c904c9e5
2013-04-01 09:40:59 -05:00
Roger Ferrel
0d269691e2
Issue #1790 Changes for non-blocking StationProfileDlg.
...
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: 57eb492610a3cc2974badc6072c2a026f5640b79
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
eeeede7288
Issue #1799 fix modal tools again.
...
Former-commit-id: c1a69f88df85478571394c0e125617c93100168d
2013-03-29 14:30:54 -05:00
Roger Ferrel
c5a95dcb44
Issue #1790 Changes for non-blocking StationListDlg.
...
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 5d68d67451c45d38a962f58c246b2effcd0cc253
2013-03-29 13:46:51 -05:00
Roger Ferrel
8f4492c63c
Issue #1790 Last of the bug fixes. Reviewer changes
...
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 336427570fba81616b8d02f3ed2948042d7dbf41
2013-03-29 11:35:08 -05:00
Ron Anderson
0f4fb125b0
Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
...
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089
Former-commit-id: 3a3f0a47ac33d19259cfc447b0abedd9930e2c64
2013-03-29 10:48:26 -05:00
Nate Jensen
214b2ed4ba
Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
...
Former-commit-id: d14cbd8b4a99316bbbf015e1392a34f63a1082d6
2013-03-28 17:02:14 -05:00
Ben Steffensmeier
50a276a7e2
Issue #1799 fix activation of tools for new perspectives.
...
Former-commit-id: a4c1e2f9526efa227b246b8dc4df9cb00566def1
2013-03-28 15:47:36 -05:00
Ron Anderson
5bb47b7931
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: aee839a85ec68c7eb80ef1e7236af6cb4666372b
2013-03-28 13:37:29 -05:00
Max Schenkelberg
573b441662
Issue #1638 Fix merge error
...
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 9c7c89f148adba714839f9ff4fa9bdda10f0edc0
2013-03-28 10:20:54 -05:00
Lee Venable
e7805ded92
Merge "Issue #1790 Bug fixes for SCAN." into development
...
Former-commit-id: 657dace6ad43e57bfcb99deb14717ce893bd9710
2013-03-28 10:04:34 -05:00
Roger Ferrel
9c560ab626
Issue #1790 Bug fixes for SCAN.
...
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65
Former-commit-id: 2bb23a6015638266ed17034777489c9ec6dc1307
2013-03-28 09:16:24 -05:00
Roger Ferrel
98d056c3a1
Issue #1790 bug fix for GFE dialogs in ticket 1353.
...
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612
Former-commit-id: ee4a6d815bc85f861bb7d77719c5787343625741
2013-03-28 09:04:10 -05:00
Steve Harris
9a321b6ac8
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e
2013-03-27 22:16:15 -05:00
Roger Ferrel
a8410499bc
Issue #1790 Bug fix for dialogs in ticket 1578
...
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90
Former-commit-id: 9bc7fe4c771e534148b446d33de969ef53be3b0d
2013-03-27 21:54:26 -05:00
Steve Harris
2a0e399dc8
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: 6f42195bd8f6087fb8bb55232082c0ec5f867e12
2013-03-27 18:21:05 -05:00
Steve Harris
9022c500ce
13.3.1-14 baseline
...
Former-commit-id: 0b52508caf520abeba4a75d38c9ed9130cc12c9e
2013-03-27 17:59:34 -05:00
Roger Ferrel
04b57a8582
Issue #1790 Bug fixes for ticket 1353.
...
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc
Former-commit-id: e0c3e3b81f679985a048047b3e5aa69992577d78
2013-03-27 16:56:17 -05:00
Dustin Johnson
52c27ec57f
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: 0011ef9ba9d014decf30acc2913fa535562d0de2
2013-03-27 15:38:36 -05:00
Roger Ferrel
d69674d595
Issue #1790 Fix dialog in current phase.
...
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b
Former-commit-id: 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54
2013-03-27 14:11:36 -05:00
Nate Jensen
faf937d3b0
Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
...
Former-commit-id: 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac
2013-03-27 11:32:19 -05:00
Nate Jensen
ff7631d847
Merge "Issue #1735 Performance improvments for LLWSData." into development
...
Former-commit-id: 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa
2013-03-26 16:28:38 -05:00
Nate Jensen
f3fd91c311
Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
...
Former-commit-id: a12ccd946a59dae45a4b5b754655d8eef7a56a29
2013-03-26 16:15:27 -05:00
Lee Venable
1a59204892
Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
...
Former-commit-id: 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3
2013-03-26 15:01:51 -05:00
Ben Steffensmeier
6870045005
Issue #1791 Fix problems in SmartScript when there is no data.
...
Former-commit-id: 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984
2013-03-26 14:46:11 -05:00
Lee Venable
c86daf885b
Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
...
Former-commit-id: 8753aa9e648778c2eabbf959c1b270ebe5add67c
2013-03-26 14:33:24 -05:00
Steve Harris
5fcfaf4360
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 99cd1f52511023794d9dcb21c68720c4e47faec5
2013-03-26 12:47:40 -05:00
Steve Harris
e71c69c383
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 741a32d9209897e84da068626d28c7d7af47f9c1
2013-03-26 12:44:24 -05:00
Steve Harris
c77a452f5a
13.3.1-13 baseline
...
Former-commit-id: 9c263e3ffc35677d7015158e06b64f376e7f801d
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
79d87a96e7
Issue #1819 Added precision fields for point source configuration.
...
Former-commit-id: b250ff50f8a2ac6ad8ec91e14735edcd6f053343
2013-03-26 12:29:18 -05:00
Ben Steffensmeier
2b898e58c7
Issue #1782 fix merge problems related to graphics API.
...
Former-commit-id: 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8
2013-03-26 12:06:45 -05:00
Ben Steffensmeier
643c1c77d0
Issue #1799 Fix pan/zoom when in views.
...
Former-commit-id: 2061956526bdc3da43280e6c829de1deb0a098ba
2013-03-26 11:44:23 -05:00
Steve Harris
fd71e44f0f
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.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/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: d0ce26b91945ae5388028c312cbafd314d57c0e6
2013-03-26 10:12:34 -05:00
Mike Duff
5d72795e1b
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
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
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: 98d23aed31d7226576943b6da0b1a0bcdc1eef58
2013-03-26 09:19:39 -05:00
Ron Anderson
f4f180face
Merge "Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
...
Former-commit-id: 8394ce66975f5915fd82dbc950ce43e5db3cfbe3
2013-03-25 17:53:46 -05:00
Lee Venable
e467daec0c
Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
...
Former-commit-id: 65989516cda62a95cb7b6d67bea8aa20138def2a
2013-03-25 17:20:25 -05:00
Mike Duff
afd0de8b5b
Issue #1781 - Constrain the tabular TS query by time.
...
Change-Id: I648913c157585283cdc96793d18d36933589b3e9
Former-commit-id: 027807d7e4ac171498f267759a4e34f75e1e4d46
2013-03-25 16:03:18 -05:00
Roger Ferrel
feadd01ad9
Issue #1735 Performance improvments for LLWSData.
...
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f
Former-commit-id: 0c067f6bd45f0474708af1715278d21a2a963868
2013-03-25 15:41:01 -05:00
Max Schenkelberg
fd375314cd
Issue #1638 Made Map scales more generalized for use outside of D2D
...
Amend: Added generalization to JaxbManager
Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a
Former-commit-id: 1e5812d9796a77559d70392be18619a8f7316f2d
2013-03-25 15:38:36 -05:00
