Commit graph

1964 commits

Author SHA1 Message Date
Bryan Kowal
6103e7c485 Issue #1416: added the python package shapely
- shapely and dependencies will now be built as part of the
  32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
  MSFT Windows environment


Former-commit-id: 8d1e29448a [formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]
Former-commit-id: 5e22c24657
2012-12-17 15:27:43 -06:00
Richard Peter
ce427112a9 Merge "Issue #1262:" into development
Former-commit-id: dc528d3e14 [formerly 6ad2bed46b41a9071f6a7ef70ae267d57e824e1d]
Former-commit-id: c4028fe005
2012-12-17 12:20:50 -06:00
Nate Jensen
65dc6cbd0e Merge "Issue #1369 fix reproject geotiffs" into development
Former-commit-id: ed075faf68 [formerly 310f0e9e274ded8256d6b644ade33cea427638f0]
Former-commit-id: 0316240cf6
2012-12-17 12:14:07 -06:00
Matt Nash
c3d94429f7 Issue #1369 fix reproject geotiffs
Change-Id: I576fa38e88afc95914db26c9232acb9e9d3bd6ce

Former-commit-id: 2ed0f446d9 [formerly 6b06041578eb02e8955ab7d614e2574b5838181e]
Former-commit-id: 323e97d617
2012-12-17 11:31:20 -06:00
Bryan Kowal
c44c4bd061 Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds

Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396

Former-commit-id: 660a9b615f [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]
Former-commit-id: f39489c44c
2012-12-16 21:40:26 -06:00
Richard Peter
48641ca26f Revert "Issue #1262:"
This reverts commit 9490652103 [formerly 0970259114] [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]


Former-commit-id: 9a7cfa2383 [formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]
Former-commit-id: f37f948456
2012-12-16 20:37:21 -06:00
Richard Peter
0295be792f Merge "Issue #1428: Optimize deserialize to directly lookup set method" into development
Former-commit-id: 76e643e876 [formerly a5d9b113bbf644a613015fe593f4b9d4070ab167]
Former-commit-id: b0d47ed420
2012-12-14 17:38:41 -06:00
Richard Peter
279fb8d21f Issue #1428: Optimize deserialize to directly lookup set method
Change-Id: I8efb8ea6d67a42e5e2b1f2e6587a2fcd785df914

Former-commit-id: a4d36258d0 [formerly 33ecdcf14de180606cb487e13aa940e913a8a405]
Former-commit-id: 061104acf1
2012-12-14 17:37:50 -06:00
Richard Peter
cd9fa8e508 Merge "Issue #1262:" into development
Former-commit-id: d091159ef2 [formerly cea057d02c0eba841295a25abce31ea17022e2e9]
Former-commit-id: 70d2347dca
2012-12-14 10:07:31 -06:00
Jonathan Sanchez
61f80591bb Issue #1424 Removed coordinate truncate when adding vertex.
Former-commit-id: ccc37dc454 [formerly 5531ffd29021d7e0db627f2c59ad7ef6de71a896]
Former-commit-id: 351148804c
2012-12-14 07:42:39 -06:00
Ron Anderson
cb4721ae15 Merge "Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item." into development
Former-commit-id: 6f79ba14e6 [formerly 6e0bfe56d437622b9c5f6e3d4d8d9c0192fc5a46]
Former-commit-id: c17e0a19c9
2012-12-13 15:47:04 -06:00
Ron Anderson
995f28220a Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1

Former-commit-id: 753fa0487b [formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]
Former-commit-id: 639b5abbd9
2012-12-13 15:25:24 -06:00
Nate Jensen
0388c1b179 Merge "Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension" into development
Former-commit-id: 67d30566c0 [formerly e7b347563598a3f4809cc74096de1f2dc0ef0788]
Former-commit-id: 823bedcebd
2012-12-13 14:25:56 -06:00
Lee Venable
1be8e81228 Merge "Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit." into development
Former-commit-id: d098b2e271 [formerly c7e9e83612df941e1c6a99cac5d07a724525bbb3]
Former-commit-id: 3ca1080fa0
2012-12-13 14:24:55 -06:00
Nate Jensen
e5ad2acde4 Merge "Issue #1369 add pattern to p2-build.xml file to match the new cots product" into development
Former-commit-id: f0340fba98 [formerly 4663e9a09db1fbf0e3f72dd9893e5daa73698f90]
Former-commit-id: 59f315f14b
2012-12-13 14:13:57 -06:00
Roger Ferrel
258dd80db8 Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit.
Change-Id: Iaff7b8b64e2b1a94680c29087d174a27658c5873

Former-commit-id: 65699f7a26 [formerly 8eee3bf91d4e40b55b36f699ecf7ca37bc6591aa]
Former-commit-id: 77c60c8925
2012-12-13 13:50:47 -06:00
Matt Nash
7d5f78c785 Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension
Change-Id: I6cc0d8eb6079efc224136b67962903b75330c8e1

Former-commit-id: c992d831af [formerly 8e1660c65bbb6ad76bdc44c3327819170c3244f5]
Former-commit-id: 3ff52fb9ff
2012-12-13 13:00:09 -06:00
Matt Nash
83b9a4dfb7 Issue #1369 add pattern to p2-build.xml file to match the new cots product
Change-Id: I5a30c7fd6067b1c59794983c67b8186775af3849

Former-commit-id: cf0090b7d4 [formerly a862d259af867bd15d381e05e421d8d653ae4f21]
Former-commit-id: 87b4d4b4e6
2012-12-13 12:42:40 -06:00
Bryan Kowal
9490652103 Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib


Former-commit-id: a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]
Former-commit-id: 0970259114
2012-12-13 12:40:31 -06:00
Richard Peter
d0cdd8f533 Merge "Issue #1415 fix or level node time matching Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a" into development
Former-commit-id: 4b2e80da58 [formerly 1f04e62af4557d74f9a5378d88571a01060b9891]
Former-commit-id: fffeaecbe5
2012-12-13 11:57:37 -06:00
Ben Steffensmeier
199577ed39 Issue #1415 fix or level node time matching
Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a

Former-commit-id: 3ac43300fc [formerly 7ad0749d76328eafcd2f02137c099f7a302e0387]
Former-commit-id: 9da83d3f4f
2012-12-13 11:35:15 -06:00
Nate Jensen
8208937771 Merge "Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore" into development
Former-commit-id: 8953fcf4af [formerly 93c0e07b71d33560678eb3781465e20e9222642d]
Former-commit-id: 8a6844e5a3
2012-12-13 11:05:12 -06:00
Richard Peter
f7859723e5 Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7

Former-commit-id: 513dd75a23 [formerly fb25e736d298225d217a1775891a65de7e0bd50c]
Former-commit-id: 08919e73c3
2012-12-13 11:02:07 -06:00
Matt Nash
d24fab93dd Issue #1369 add geosolutions project to cots feature
Change-Id: I62dd15c2f0d2ee017fcb3ad9483399b688c508f3

Former-commit-id: 1d56d879fb [formerly 01033bfd4b1b298095697267be60d978aa5c14a5]
Former-commit-id: ab07a92d48
2012-12-13 09:40:49 -06:00
Ben Steffensmeier
ff5a5cac4c Issue #1401 add the word Grid in front of load properties because that always makes things better.
Former-commit-id: 1848f614fd [formerly 345673524a287d87efbdfcb60ef838dd78c33ae3]
Former-commit-id: d43336bcbd
2012-12-12 14:33:48 -06:00
Nate Jensen
196fdc6110 Merge "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" into development
Former-commit-id: d0fe7c860f [formerly 9a388df8f163c1bbde711c12dcda1a7c8f70bf06]
Former-commit-id: 6debcb5ff4
2012-12-12 12:27:30 -06:00
Max Schenkelberg
b74d788909 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: 3e128b266a [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]
Former-commit-id: 5db71ca943
2012-12-12 11:39:32 -06:00
Nate Jensen
3c2865bbd7 Issue #1409 Initial implementation of hydro data access
Change-Id: I309694f9477384446658520794e19ca9493473fb

Former-commit-id: 817717fe0a [formerly ae7ac8a8bfc51d1c7dc3493c8fc036a87772f323]
Former-commit-id: 85658e7e1d
2012-12-12 11:20:42 -06:00
Ron Anderson
17b983ba02 Issue #1395 Comment out change in p2-build.xml to fix build
Change-Id: I47d426383734b876d5def9ba03677ef7ff745403

Former-commit-id: 5327d88a6d [formerly 4636ad873e7de401e6384dd42857265e962aa8d9]
Former-commit-id: 06fdf91a1c
2012-12-12 09:09:28 -06:00
Ben Steffensmeier
47cb87096a Issue #1356 add javadoc to subgrid changes.
Former-commit-id: 6da5ac2873 [formerly 618c8a0accbfde0e95d47b76659f3804b32a7652]
Former-commit-id: 7e6d6fa794
2012-12-11 17:40:28 -06:00
Richard Peter
ada54d8e92 Merge "Issue #1356 create subgrid for grib files with extra columns" into development
Former-commit-id: 9f9c32fc4e [formerly d489dcb15e98ae3b07665df4fc2edd2bb852c7db]
Former-commit-id: 4082968b07
2012-12-11 17:05:27 -06:00
Richard Peter
1100c4fa8b Merge "Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea" into development
Former-commit-id: 63465edb95 [formerly 5117b93ee59b6c291d16e084d7a0be0e492b120f]
Former-commit-id: 2a5171c2f3
2012-12-11 16:38:53 -06:00
Ben Steffensmeier
9277840fad Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes
Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea

Former-commit-id: b77f1592a7 [formerly a6c7730ba1c0b07fdf21bef19717859fc7238724]
Former-commit-id: 11d3ee3014
2012-12-11 16:12:53 -06:00
Ron Anderson
087af45be8 Merge "Issue #1395 Modifed AwipsCalender and added additional date/time related widgets" into development
Former-commit-id: d05dc0c6ca [formerly c6c26811ad96f862ae3ffb0e6d9056f0d9edecfb]
Former-commit-id: 277c9cb0ec
2012-12-11 16:09:24 -06:00
Ben Steffensmeier
64922c17c5 Issue #1356 create subgrid for grib files with extra columns
Former-commit-id: c3e1005dc8 [formerly c9c82e37fa21a01a7357c2e065aea435b325587f]
Former-commit-id: a7a13d27cd
2012-12-11 16:00:03 -06:00
Roger Ferrel
f64a99d554 Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4

Former-commit-id: b677a5ba3d [formerly b406c990607a06678a58e36118edcddaab073b26]
Former-commit-id: aefa650cda
2012-12-11 15:43:54 -06:00
Ron Anderson
641d268bd8 Issue #1395 Modifed AwipsCalender and added additional date/time related widgets
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b

Former-commit-id: bc5f445ecf [formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]
Former-commit-id: 43881be47a
2012-12-11 13:31:05 -06:00
Nate Jensen
5b1ca237b2 Merge "Issue #1362 create a new resource handler when nsharp is created in a side pane." into development
Former-commit-id: decb23f4ae [formerly 273aed63277891eb091817c5769fe53ef3813759]
Former-commit-id: 773ff8c027
2012-12-11 12:42:51 -06:00
Dustin Johnson
e72d5dc09d Issue #1407 EventBus changes to support sending notifications for subscription verification
Change-Id: I8f979e44520e32fa908aa700bb0c93596a2dd820

Former-commit-id: 8b942c31dd [formerly 12b51905d9b710ebc6fa54346d82cad9178b0bba]
Former-commit-id: 3d900240b7
2012-12-11 09:37:20 -06:00
Steve Harris
113fdcb679 Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]
Former-commit-id: ce72ebb094
2012-12-11 08:56:54 -06:00
Steve Harris
6287b32e7d 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: 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]
Former-commit-id: f6988eefff
2012-12-11 08:45:53 -06:00
Ben Steffensmeier
84fa621b55 Issue #1362 create a new resource handler when nsharp is created in a side pane.
Former-commit-id: 52497f5630 [formerly 62cb0df39d0c24edc80d635f3bf90d2abc564b04]
Former-commit-id: 0eb454f0d4
2012-12-10 17:58:04 -06:00
Brad Gonzales
065ddf4d4a Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d

Former-commit-id: bcff2c134c [formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]
Former-commit-id: 6ab74bb6ab
2012-12-10 14:08:54 -06:00
Richard Peter
932f49fd2c Merge "Issue #1367: Fix static topo route uri" into development
Former-commit-id: 9a5fc20edb [formerly 0bfbe098d5ae0bc93f536fd09e6fa5e63c6dd10d]
Former-commit-id: a33301394c
2012-12-10 12:59:36 -06:00
Lee Venable
f122f274ac Merge "Issue #1353 Changes for non-blocking DamDisplayControlDlg." into development
Former-commit-id: ef814e2d0b [formerly ce03df033eac42f2d035a7483349ba9db315a2e4]
Former-commit-id: 1175e34b0d
2012-12-10 12:55:16 -06:00
Richard Peter
8ba7c0ae7c Issue #1367: Fix static topo route uri
Change-Id: Iba75a46bcd52356fd190573520639217aaa77d02

Former-commit-id: 44f90a6f65 [formerly b4b395876a00f9b1a80314a90c0d88ea913e52bc]
Former-commit-id: 7d292d1731
2012-12-10 12:40:18 -06:00
Richard Peter
0cdb86b6ac Issue #1394: Reduce GFE Grid Database calls
Change-Id: I7462cca18b1b46169b25611dddbad844895be0cd

Former-commit-id: 3c3c695f24 [formerly bc127f06236cb1e09dc0c87fee578e4a0cb60063]
Former-commit-id: 0670ac79fa
2012-12-10 11:59:54 -06:00
Roger Ferrel
fdad99bcc8 Issue #1353 Changes for non-blocking DamDisplayControlDlg.
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475

Former-commit-id: 35261a7964 [formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]
Former-commit-id: 40b8e4ec57
2012-12-10 11:30:06 -06:00
Lee Venable
f3b9d1cb38 Merge "Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg." into development
Former-commit-id: 59b2cf8872 [formerly 050d9cebb8de520c7ed0d27c686ebf84dc6d084c]
Former-commit-id: 8e7143967b
2012-12-10 11:28:34 -06:00
Roger Ferrel
053584c4e2 Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481

Former-commit-id: 921566317a [formerly 62cdaba1d9e59c77efe6253105582894cd8596a0]
Former-commit-id: 81966d39fc
2012-12-07 14:43:53 -06:00