Commit graph

3473 commits

Author SHA1 Message Date
Richard Peter
6c1690e063 Merge "Issue #798 - Correct for hdfFileId" into development
Former-commit-id: 6aa68692dc050d61946be620a6f629c186e0fdaf
2012-08-22 17:07:17 -05:00
Steve Harris
b8ab6066f6 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e977bd92cef6986b14725164c9eaa417ecf359cf
2012-08-22 16:00:33 -05:00
James Korman
56d6b1e886 Issue #798 - Correct for hdfFileId
Former-commit-id: 3dd604623685cd5aba9e0a28001004cecef8d29a
2012-08-22 13:24:28 -05:00
Benjamin Phillippe
a501aacb3b Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: ccb9b1b4e9caf8523706535b141b0e54dd798c70
2012-08-22 13:03:24 -05:00
Steve Harris
8e3ecc1efd 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: ef64da82bb8594eddead221f7c5bf5fa95e4ff8b
2012-08-22 13:01:08 -05:00
Steve Harris
d38f8b80f0 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: 6d33469c48d659279c02e5e9489b67b00576381a
2012-08-21 16:17:58 -05:00
Steve Harris
61f269f54c 12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Ron Anderson
d7a818fd1d 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: 18f0efe7a8d9f2c31786fc449403f720b554b95d
2012-08-17 12:41:49 -05:00
Ron Anderson
1321db6a99 Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: 9287cf98369abb8a674fd5bab99439d055218a05
2012-08-17 12:20:08 -05:00
root
342bda7e5f Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: 2368421395496141fdc6467fd165babc282b65ac
2012-08-15 22:29:38 +00:00
root
b93989daaf 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: 6e4d168bf9ea0c252d0923e4e2595d9c4df06289
2012-08-15 22:29:07 +00:00
root
cb46f57879 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: a178af491f4b4cd75ed1517f023354bab0b9c8c8
2012-08-15 22:15:20 +00:00
Benjamin Phillippe
72c63e1a6f Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3

Former-commit-id: b30ec7ab0f96f1155e2c13587a1b4f179ce3da51
2012-08-15 16:22:39 -05:00
Steve Harris
dcda3a2290 12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
36d80b1f60 12.9.1-3 baseline
Former-commit-id: 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86
2012-08-15 14:26:10 -05:00
Steve Harris
d1d877d319 12.9.1-2 baseline
Former-commit-id: 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
865136f6ef Issue #915 Set the user data.
Former-commit-id: d0e0b6160cc0969353555bd7282829a3440c9ef6
2012-08-15 14:05:50 -05:00
Steve Harris
31ae7ea218 12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00
Steve Harris
346d775f57 Merge branch 'development' into Enhanced_points
Former-commit-id: 25026a4d9955b76039bf25861380cadebff19665
2012-08-15 13:35:47 -05:00
Ron Anderson
17f636c2a2 Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 373ac200fcd1c9a39244a2775d95c7b891334632
2012-08-14 16:27:11 -05:00
Ben Steffensmeier
50cb7383a6 Issue #947 revert changes to dataTime format
Former-commit-id: 53a441f310e35d80ceb0ff28c156bf15ba1b5893
2012-08-14 16:20:36 -05:00
Ron Anderson
71d74b1dcf Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 564b72997c59a665398c8687d6bafdb54c469881
2012-08-14 16:20:23 -05:00
Ben Steffensmeier
ce689ad5fa Issue #947 revert changes to dataTime format
Former-commit-id: 5c560da8d485f2ca2b6ca24925480aa61fb994de
2012-08-14 16:12:02 -05:00
Ben Steffensmeier
c6a121962f Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 06c2c85159598ca803c663de97caed4b6841c135
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
525c0b21a9 Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 045952304218c867d8fe89df9828f70632df2d00
2012-08-09 17:50:23 -05:00
Nate Jensen
eeaa2c798f Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds
Former-commit-id: 70f2bcb38c03eee2d389774f92a4676b0d4cae43
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
066a5af2a6 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 51acdac79ebfa11abb5d69707a0a7b059e1a2e57
2012-08-09 17:16:38 -05:00
Nate Jensen
a88d7bcedc Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
Former-commit-id: b7cac9d262bd99e74a51d903042fb7ad79eddfa8
2012-08-08 16:10:13 -05:00
Ben Steffensmeier
97ba96759c Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 30ebbadbbffce0c3b1a236d36be5f3013124e7cd
2012-08-08 14:41:33 -05:00
Steve Harris
bbf4b18204 Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: d8080798d6c69b9cf0f9042660c5ad910cf123c6
2012-08-08 13:57:46 -05:00
Roger Ferrel
2e3fc4b400 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: c8e5bf1a82979ebc2445acb88682e32ca8813f43
2012-08-08 13:35:47 -05:00
Steve Harris
926ff5dc5a Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 5717f9bf344b6d78ca30f1387679e535bac5a13c
2012-08-07 15:29:25 -05:00
Steve Harris
6dae0398d3 Fixed merge of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 34a733bb4701c6f083595be42e5b15cd4ba868bd
2012-08-07 10:04:39 -05:00
Steve Harris
d90c5f989d Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 2a2487546a533987bc618b06780bba4d0bc61da8
2012-08-06 11:13:47 -05:00
Max Schenkelberg
36bf80d13e Issue #626 Fixed GLStats to print proper message name. Fixed SatelliteDao to correctly use UnsignedByteArrayWrapper to properly reflect data. Modified UnsignedShortArrayWrapper to extend ShortArrayWrapper like Byte/UnsignedByteArrayWrapper does. Fixed DataTime legend generation when time range is not even hour increment
Change-Id: Ie79883c1d901f24042234fe5e79b5ae903e5792b

Former-commit-id: b0466e68bea4102f397db214bb58b66c10a338ed
2012-08-06 09:44:44 -05:00
Steve Harris
f0b7d5e4c5 Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: f6fc0581c3100ef186b90668cb1f1ae4283eaa7b
2012-08-06 09:38:26 -05:00
Steve Harris
b5e8fee24d 12.8.1-10 baseline
Former-commit-id: 7c799ab7b99993c77b6568529b46aaf13d01300b
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
dbd30e3b67 Issue #1006 Implemented urban areas.
Former-commit-id: 8f7bbb2509278237184cbcee81ff1cc6eb61aa72
2012-08-06 08:41:52 -05:00
Steve Harris
24799cd93d Merge branch 'development' into development_on_ss_builds
Former-commit-id: fa3dac43f4e945514906fb7844f10fb3782bcead
2012-08-06 08:23:04 -05:00
Bryan Kowal
c6b2d65308 Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties.
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36

Former-commit-id: d64577e7804cc8a235efebff53722bac3cde9cc7
2012-08-02 10:33:55 -05:00
James Korman
7928d912e1 Issue #798 - Updates to satellite
Former-commit-id: 0fbc98c1fbbf683e14cf39ed962308496dff67dd
2012-08-01 16:31:59 -05:00
Steve Harris
6d77b94217 Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: 1b17cebeb85f871d950bd02e27141b11d977c3ad
2012-08-01 12:43:12 -05:00
Max Schenkelberg
2d36eb040d Issue #626 Fixed changes to GridDownscaler in SatelliteDao
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90

Former-commit-id: 1370a27f85173509b66a7ea861ed0b04225709e0
2012-08-01 11:36:44 -05:00
Max Schenkelberg
f635e9c332 Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet.
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac

Former-commit-id: 0f59e9ea9e204bc49e14135249ef859903a2cbcb
2012-08-01 10:51:32 -05:00
Steve Harris
fd2abfb6f1 12.8.1-5 baseline
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
2012-08-01 10:45:37 -05:00
James Korman
14e68406b4 Issue #798 - Code review changes
Former-commit-id: c58e900204016e026c6023e7beb33bc82a6cdeaf
2012-07-31 14:34:27 -05:00
James Korman
38a2e426d9 Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: cb05a9f95384806537106dc804833331d6c7db48
2012-07-31 13:38:23 -05:00
Richard Peter
97a1d083cd Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
Former-commit-id: 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13
2012-07-31 09:16:23 -05:00
Nate Jensen
a65e9608fd Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25
2012-07-31 08:57:54 -05:00
Ron Anderson
7c6686f2f4 Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62

Former-commit-id: 181fba1a75357aa39a54267c6df907075f4601dc
2012-07-31 08:36:27 -05:00