Commit graph

251 commits

Author SHA1 Message Date
Ron Anderson
b628c604ad Merge "Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo XML files, modify ParameterInfo to provide list of valid levels for each parameter, create utility script to convert A1 CDL to A2 XML format, modify WeatherElementBrowser so database lists are always current." into development
Former-commit-id: 2dc48d6a85 [formerly 5cc4ec7f99bb7e8d3185b4c5aa2b40f86125b618]
Former-commit-id: 5c844b346c
2012-09-13 17:41:14 -05:00
Nate Jensen
661ef69489 Merge "Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well." into development
Former-commit-id: 1af2344565 [formerly 00c4c7a84f65c5c8bb45d3d3020d97c5b9d16eba]
Former-commit-id: 5e9ef6a224
2012-09-13 16:26:02 -05:00
David Gillingham
03a202134a Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo
XML files, modify ParameterInfo to provide list of valid levels for each
parameter, create utility script to convert A1 CDL to A2 XML format,
modify WeatherElementBrowser so database lists are always current.

Change-Id: If0513ed8ce8c1134e92c6702c58b2a49f17a6dc5

Former-commit-id: 99ab0a124b [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]
Former-commit-id: 21739d1d38
2012-09-13 15:39:58 -05:00
Steve Harris
9ae530cd1b Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: da0afec2c1 [formerly 165e2e8bfb9527ba1d5c274e351d63196eafa0e9]
Former-commit-id: abc2a7fb62
2012-09-13 15:21:40 -05:00
Max Schenkelberg
3cdabeb7cd Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well.
Change-Id: I4756cffb310ba9c7eab707b3764f667db01f886f

Former-commit-id: 932e4da3a9 [formerly ac26e6f39bc21ecb4b2bd13a20f72d4f4c470e67]
Former-commit-id: 5a9d7eea35
2012-09-13 14:37:20 -05:00
Steve Harris
04de1d5857 Merge branch 'ss_builds' (12.10.1-4) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 04d9735c8f [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]
Former-commit-id: 29e7427dc3
2012-09-13 13:26:13 -05:00
Steve Harris
e38e81ab8c 12.10.1-4 baseline
Former-commit-id: 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]
Former-commit-id: fd19ca5624
2012-09-13 12:08:11 -05:00
James Korman
6531df3ab0 Issue #1011 - Corrected AIREP turbulence decoding
Change-Id: Ie56a2b916df7b68f28cca73235f33596b903c5b1

Former-commit-id: d3fd8a53df [formerly 41dd04864bbd4b510b5e1b0c6e4259bb140b9b2e]
Former-commit-id: c0e5570aa2
2012-09-13 10:18:39 -05:00
Brad Gonzales
32df328434 Issue #951 added Appender EnvConfigurableRollingFileAppender.
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b

Former-commit-id: d10cabc917 [formerly 4d103fe06c94b8d5067e44aaabfdac88347f9a96]
Former-commit-id: 4b383c3274
2012-09-13 07:50:56 -05:00
Max Schenkelberg
e1b01588d1 Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT
Change-Id: I2e6e538870c605675d8070d79786398adbf7dbcb

Former-commit-id: cc37173be9 [formerly 42b8711fa44c85aee40070683729727192b62891]
Former-commit-id: eabc8d684b
2012-09-12 09:22:25 -05:00
Richard Peter
c8443cf85c Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
Former-commit-id: 60b21393fc [formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]
Former-commit-id: 701960a246
2012-09-12 08:27:11 -05:00
Steve Harris
d39a318583 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: adf25aa707 [formerly 6d859accd185300997d14e7daf17f3c3257c348d]
Former-commit-id: 503cddcc5e
2012-09-11 17:06:26 -05:00
Steve Harris
f94db138cd Merge branch 'ss_builds' (12.10.1-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
	cave/com.raytheon.uf.viz.kml.export.feature/build.properties
	cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
	cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
	cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment

Former-commit-id: 012c526816 [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]
Former-commit-id: 64d4e2bded
2012-09-11 16:57:03 -05:00
Steve Harris
de1639aea2 12.10.1-3 baseline
Former-commit-id: 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]
Former-commit-id: 21f430062b
2012-09-11 16:00:38 -05:00
Steve Harris
dde1f4c54d 12.10.1-2 baseline
Former-commit-id: a66f3f4b60 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]
Former-commit-id: 250f0ccac9
2012-09-11 15:50:57 -05:00
Max Schenkelberg
ab120dfec6 Issue #1138 Added null check to base ProtectedFile object since will be null when called recursively first time when constructing the base object. Organized static functions together from member functions.
Change-Id: I5dbef82932c9dc8623061361fad64fd0e8706546

Former-commit-id: c4398c09a4 [formerly edbff1f2b607d53e8247155a5526a7c21e40ac71]
Former-commit-id: fffe220e05
2012-09-11 14:04:14 -05:00
Lee Venable
f731ae885c Merge "Issue #1161 changed comparator" into development
Former-commit-id: a691386102 [formerly 2d9bf3e785e72e8bc3b3a04d186d3c76ddc1eebb]
Former-commit-id: 802b43036e
2012-09-11 10:02:21 -05:00
Dave Hladky
afb00feb6d Issue #1161 changed comparator
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962

Former-commit-id: af27b562d7 [formerly 36748378cf53d2ab7c6ba1e49be195d90e2dc385]
Former-commit-id: c78fb26fbf
2012-09-11 09:39:43 -05:00
Lee Venable
1f86d2c4ba Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
Former-commit-id: 83fc018f38 [formerly 19dc13a0d5ef2b0fc41300815dd6be34d7001afd]
Former-commit-id: 056e74d3cf
2012-09-11 09:15:47 -05:00
Dave Hladky
33f222783d Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
Change-Id: I23212f3281290d86621e72c88478b00d37336494

Former-commit-id: 6818408d40 [formerly 2088328c090d5a7d3f6218c42619fd3ab6d45dd9]
Former-commit-id: 28912552fe
2012-09-11 08:56:51 -05:00
Max Schenkelberg
6d78afd423 Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536

Former-commit-id: 84658dd03a [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]
Former-commit-id: 80439b309b
2012-09-10 10:45:37 -05:00
David Gillingham
cff73c9e1d Issue #1150: Fix regression caused by previous text product generation changes by ensuring all
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: 83681d1ff6 [formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]
Former-commit-id: f192c8d115
2012-09-07 12:29:36 -05:00
Bryan Kowal
3c63f21cfc Issue #1134 - edex will now use the same jep library that CAVE does
Former-commit-id: 04b574f56e [formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]
Former-commit-id: ec89c440fe
2012-09-07 10:28:51 -05:00
Steve Harris
0e046d847a Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]
Former-commit-id: bba4eb12d0
2012-09-04 12:11:03 -05:00
Steve Harris
0abf64b77c 12.10.1-1 baseline
Former-commit-id: d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: 195158c004
2012-09-04 12:07:27 -05:00
Steve Harris
f52c8b374d Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 34cbde4124 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]
Former-commit-id: 3a9d4961e2
2012-08-30 14:40:34 -05:00
Steve Harris
d07c18918d 12.9.1-11 baseline
Former-commit-id: fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]
Former-commit-id: 6eb6b0909b
2012-08-30 14:36:12 -05:00
Steve Harris
bdb45cdfae 12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]
Former-commit-id: 3adc50a783
2012-08-30 14:28:27 -05:00
Steve Harris
51eb89eb2a 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: a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]
Former-commit-id: 91e39617cb
2012-08-27 09:53:55 -05:00
Jonathan Sanchez
20c65a4677 Issue #1006 Implemented urban areas. Cherry picked from development on SS builds
Conflicts:

	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java

Change-Id: Ife20e07ccffeb6e6f5cc4aabdc6c57c9ed6e9ff8

Former-commit-id: f646b185da [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]
Former-commit-id: 1b45f1b6d9
2012-08-23 09:27:46 -05:00
Richard Peter
0dd2c44c9c Merge "Issue #798 - Correct for hdfFileId" into development
Former-commit-id: 4c56f4e20d [formerly 6aa68692dc050d61946be620a6f629c186e0fdaf]
Former-commit-id: 6c1690e063
2012-08-22 17:07:17 -05:00
Steve Harris
7a4f4ac493 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: b77a4d40d7 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]
Former-commit-id: b8ab6066f6
2012-08-22 16:00:33 -05:00
James Korman
6d250cf9f3 Issue #798 - Correct for hdfFileId
Former-commit-id: c2c228b429 [formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]
Former-commit-id: 56d6b1e886
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
04389b9f21 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: a5c57e8d24 [formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]
Former-commit-id: a501aacb3b
2012-08-22 13:03:24 -05:00
Steve Harris
04c8c3ca55 Issue #915 Set the user data. (cherry picked from development_on_ss_builds)
Conflicts:

	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java


Former-commit-id: b8629a0f20 [formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]
Former-commit-id: 8e3ecc1efd
2012-08-22 13:01:08 -05:00
Steve Harris
084ac9fbd4 Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
	edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
	nativeLib/rary.cots.jasper/jasper-1.900.1/configure
	rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
	rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/i386/build.sh
	tools/scripts/commit-msg
	tools/scripts/git-u-setup
	tools/scripts/uamend
	tools/scripts/ucommit
	tools/scripts/upull
	tools/scripts/upush
	tools/scripts/ustat

Former-commit-id: 44a7cb75e7 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]
Former-commit-id: d38f8b80f0
2012-08-21 16:17:58 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Ron Anderson
16231374f8 Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.

Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff

Former-commit-id: 7662d249ab [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]
Former-commit-id: d7a818fd1d
2012-08-17 12:41:49 -05:00
Ron Anderson
93c632c1ff Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: 819b9c8e56 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]
Former-commit-id: 1321db6a99
2012-08-17 12:20:08 -05:00
root
ac8888ae10 Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: 6eec24180e [formerly 2368421395496141fdc6467fd165babc282b65ac]
Former-commit-id: 342bda7e5f
2012-08-15 22:29:38 +00:00
root
d170ae704b Merge branch 'reconcile' into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java

Former-commit-id: ba40e18fb2 [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]
Former-commit-id: b93989daaf
2012-08-15 22:29:07 +00:00
root
0987fc6b3d Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]
Former-commit-id: cb46f57879
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
dd8ed9eca0 Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: 7bad34f906 [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]
Former-commit-id: 72c63e1a6f
2012-08-15 16:22:39 -05:00
Steve Harris
36c108e960 12.9.1-4 baseline
Former-commit-id: 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]
Former-commit-id: dcda3a2290
2012-08-15 15:19:10 -05:00
Steve Harris
c11f7d396e 12.9.1-3 baseline
Former-commit-id: 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]
Former-commit-id: 36d80b1f60
2012-08-15 14:26:10 -05:00
Steve Harris
27871051e3 12.9.1-2 baseline
Former-commit-id: a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]
Former-commit-id: d1d877d319
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
f37a75f265 Issue #915 Set the user data.
Former-commit-id: 03ed8ee0b0 [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]
Former-commit-id: 865136f6ef
2012-08-15 14:05:50 -05:00
Steve Harris
8309193ce9 12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]
Former-commit-id: 31ae7ea218
2012-08-15 13:59:00 -05:00
Ron Anderson
bac68cc1de Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 81abb2c60b [formerly 373ac200fcd1c9a39244a2775d95c7b891334632]
Former-commit-id: 17f636c2a2
2012-08-14 16:27:11 -05:00
Ben Steffensmeier
54b538bb07 Issue #947 revert changes to dataTime format
Former-commit-id: 70ba8d82db [formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]
Former-commit-id: 50cb7383a6
2012-08-14 16:20:36 -05:00