Commit graph

4787 commits

Author SHA1 Message Date
Ben Steffensmeier
121d858bdc Omaha #4693 Bring alertview to top instead of activating it.
Former-commit-id: fc3bfc4997b276445471f0a6896e8cb3561a6010
2015-08-04 10:44:15 -05:00
Steve Harris
7b0c814fd0 Merge tag 'OB_16.1.1-2' into omaha_16.1.1
16.1.1-2


Former-commit-id: afbe137f83e60abbabd7a38890a1d3bde5f96555
2015-08-03 16:39:02 -05:00
David Friedman
4bdfeb8da8 Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
	cave/build/static/linux/alertviz/alertviz.sh
	cave/build/static/linux/cave/cave.sh
	cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration

Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226

Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
Richard Peter
9952a991c1 Omaha #4500 - Fix ZoneSelectorResource
Change-Id: I27359e44e71c81ac9a31d308b9ef33d11574e9fc

Former-commit-id: db10c872cc24aed1d5c352179bb4500f8f1b606b
2015-07-30 15:38:06 -05:00
steve.naples
6b295a0981 ASM #17471 - MPE: Radar Bias Edit table showing incorrect data.
Change-Id: I4d07d6c602f3f20bec64c3241dbf66bce6da5e97

Former-commit-id: 17fb48e1d5e973cfe04697c7fa8d0a325710b224
2015-07-29 15:28:37 +00:00
Fay.Liang
2002605bf0 Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: e53d85aa872541d9542bd486e959384115d8f4d5
2015-07-28 16:27:03 -04:00
Yun.Teng
2a3badf998 ASM #17257 - Change CheckTandTd/CheckWindGust to use selected time range and improve efficiency, and combine to make procedure CheckTTdWind
Change-Id: Ide50e3cc57fac8e5d69b398441e1c43983616d30

Former-commit-id: 1e2508936f79544ec987b682d25d0362d487e2e3
2015-07-28 16:26:25 +01:00
Fay.Liang
60cc8c8f22 Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: e4af7e2ef3af5a32f2cc9e5a5c905d5d4c2a74c9
2015-07-27 17:08:46 -04:00
David Friedman
2121ce36d7 ASM #13849 - Use a unique Eclipse configuration directory for each CAVE/AlertViz instance
Change-Id: I98cd38b2ada1197511861841b07caf943438cfd3

Former-commit-id: 349b4665855bed697948aadb8fba23a2a761c83f
2015-07-23 21:03:06 +00:00
David Lovely
0216db5985 Omaha #4295 Cleaned up CAVE icon locations
Former-commit-id: e3f7c784ea0dab0bd38e5217a3291f558029e851
2015-07-23 06:50:16 -05:00
David Lovely
a56f97be01 Omaha #4295 Export icons for CAVE application window.
Former-commit-id: c516fedfd76cdb32f029b54ad25ed9097aaaf47a
2015-07-22 14:13:31 -05:00
Ying-Lian.Shi
4cf38a9488 ASM #13753 keep Issue time unchange while update other times
Change-Id: Id8d36e484c6cd2527d35039a6c0a02f474c440bc

Former-commit-id: 654f11435e1f4a0970ec2d6bf4a7f84da8dbce91
2015-07-22 18:03:16 +00:00
David Friedman
876ed4837a ASM #17534 - TextWS "No product" message box prevents WarnGen scratch products from being edited
Change-Id: Id7ae458cb978f2e0cf644eca82fb17b65cf0eb38

Former-commit-id: f47ecc5c2f83f890431a70464ce08c8303c69033
2015-07-22 15:37:40 +00:00
Richard Peter
7a79834265 Omaha #4500 - Update hydro blind casts to use Number
Change-Id: Ide22b937047d254cb3fb003df630c936d601fe22

Former-commit-id: 877a65681207ae7d93ac385e88dbc213980a49de
2015-07-21 17:17:27 -05:00
Richard Peter
c3bf9eb17c Omaha #4500 - Fix ZoneSelectorResource column mapping
Change-Id: I541f9e6003e5dcd0a29078df32677ccc5dcb8c68

Former-commit-id: b7a7761543d5dbdbf6288afc45bd01fea650cb96
2015-07-21 11:45:27 -05:00
Juliya Dynina
cf848b6ffd Merge "ASM #17584 SCAN: Problem with storm cell table display during data update" into asm_16.1.1
Former-commit-id: a54ea78a3373e2a32f3b2e5da37d17495ae13091
2015-07-20 14:50:44 -05:00
Ying-Lian.Shi
44d9356389 ASM #17584 SCAN: Problem with storm cell table display during data update
Change-Id: I6e38fcd8e6209d45f0826302d2d0b83b07afcbdc

Former-commit-id: 96d045d9c30e4f01a0a8ba3cd7a0a7ce233158f4
2015-07-20 17:46:45 +00:00
Fay.Liang
54c8991452 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 1fd720950240b2d57c4689d1994ad68d51855017
2015-07-20 11:37:24 -04:00
David Friedman
9db5891824 ASM #17314 - WarnGen: certain counties not locking in WarnGen
Change-Id: I756afe7cb6f590bb6f48c36a9bcf69fcac022e07

Former-commit-id: 8d5845c49eb706b28c85d836cbc35c7e20ea1adf
2015-07-17 20:05:26 +00:00
Richard Peter
dfc255531a Merge "Omaha #4500 - Fix SQL Injection Concerns." into omaha_16.1.1
Former-commit-id: 2b25be688266a27f564d5acff991d1e9a94dd081
2015-07-17 13:35:21 -05:00
steve.naples
bdd9b93873 ASM #17561 - MPE: Daily QC disagg 6 hr values always zero.
Change-Id: I91ca25ae0afd442759315e0cd2d894ecc2001214

Former-commit-id: 450ff9256aa4ca845f3267e049153278bf350280
2015-07-16 17:23:27 +00:00
Juliya Dynina
71a18fe5df Merge "ASM #16769 - Warngen can include a city in the 4th bullet (locations impacted list) that is not officially in that county." into asm_16.1.1
Former-commit-id: e9dd4381ac017046db7f8413e2323f445dfe7edb
2015-07-16 10:16:16 -05:00
Michael Gamazaychikov
ff5198a58e ASM #16769 - Warngen can include a city in the 4th bullet (locations impacted list) that is not officially in that county.
Change-Id: I7d4ca4b5b50ea03cbd9f693a32b4cae8ce99b098

Former-commit-id: cef7dbe4975453510ae7a58bd7b58be7bebd3b9b
2015-07-16 10:40:17 -04:00
David Friedman
37082b074d ASM #17741 - Watches not showing up in Warning Products in 15.1.1
Change-Id: I0ecd8d7de532465ded64f67a20758cfdb7c2d7d1

Former-commit-id: 5e316fafdd46ab5fe30c24dd67ac86669cdb69ac
2015-07-16 14:12:24 +00:00
Lee Venable
bf7b520ae0 Merge "Omaha #4311 Additional fixes for alertViz to prevent display ressizing to 0 height and acknowledge confirmation dialog going behind" into omaha_16.1.1
Former-commit-id: b920e261b160e54c21128b1b6718ee3ff27863e4
2015-07-14 17:34:29 -05:00
David Friedman
168de4d871 ASM #13900 - Loading 4 panels from procedures are not time matched
Change-Id: If3f116711ede5e5c78a3f08c3f9a05887e54ba95

Former-commit-id: 262cb246a874c1f123385ba1fed679f2d1f96cf2
2015-07-14 20:21:37 +00:00
Ron Anderson
f010ad8605 Omaha #4311 Additional fixes for alertViz to prevent display ressizing to 0 height
and acknowledge confirmation dialog going behind

Change-Id: Ie4b3c6f910037db765aa46d619df491bdf7221db

Former-commit-id: 5640b3c3594d74614907af06b8f9452c917a04ee
2015-07-14 10:40:35 -05:00
Steve Harris
55b82a66ff Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java


Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
2015-07-13 18:39:29 -05:00
Steve Harris
30d49fff86 Merge branch 'omaha_15.1.1' into omaha_sails_15.1.1
Former-commit-id: cf104ad05ee334aee224342743ab3b142d62cacd
2015-07-13 18:29:34 -05:00
Steve Harris
c2ab43b206 Merge tag 'OB_15.1.1-22' into omaha_15.1.1
15.1.1-22


Former-commit-id: 2db2aac7112c3cb27eee4a8ac233865ffe2d6b0b
2015-07-13 18:13:44 -05:00
Richard Peter
47bdd9984d Omaha #4500 - Fix SQL Injection Concerns.
Change-Id: I3af5ce39d163a212f66e675d3386ae5c68b9b295

Former-commit-id: 7613c06d4351c52dcc8e49d6bc64ecb0166f72e7
2015-07-13 16:31:26 -05:00
Ben Steffensmeier
aa964932a3 Omaha #4474 Fix alert view dispose error.
Former-commit-id: 23c0ed05a9f3546217089af681c4cc3fff5fbc3d
2015-07-13 16:03:08 -05:00
Juliya Dynina
d111e04954 Merge "ASM #16907 AvnFPS: Climate download files from NCDC server changed in format" into asm_16.1.1
Former-commit-id: c7c1f6bcf71cd2020c56c080a47533fb9814efd1
2015-07-10 14:41:56 -05:00
Fay.Liang
208bfc4b87 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: de43ecb072da23016bd82cfa1a47924201c958f3
2015-07-10 15:16:15 -04:00
Zhidong.Hao
3e12a5ecf4 ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
Change-Id: Ifa6ee6b0fb64ce2a4fd9a9ac0f7976e855242d33

Former-commit-id: fc4a2bcfb918cce995444464aefe92a438ba995f
2015-07-10 15:13:44 -04:00
Juliya Dynina
80c156d451 Merge "ASM #17167 Remove the nulls from incoming xmlString" into asm_16.1.1
Former-commit-id: 6cca988a7ee7aeb0d62fe61b6423b6792553e9c7
2015-07-10 13:17:33 -05:00
Juliya Dynina
6cefea5270 Merge "ASM #15044 Implemented tabbing and tabs to spaces in Text Workstation" into asm_16.1.1
Former-commit-id: c5bbd7aa80bd7fade249da221bcdcf2a002239fd
2015-07-10 13:17:19 -05:00
Daniel.Huffman
2bc03d1bf4 ASM #15044 Implemented tabbing and tabs to spaces in Text Workstation
Change-Id: I9707994490ff80d29a7e45dec0a2e7ffb47bf8e7

Former-commit-id: 38480f629c04003db315f0e439ce556084909bb2
2015-07-10 13:09:50 +00:00
Ron Anderson
ea9ca58229 Omaha #4442 Fix locking of primary cause in non-convective flood warning
Change-Id: Iec6abdc69e54d1a6b0ca9971ec4c27e4eb5c2ade

Former-commit-id: 5a57cfe5f99b9d83c37d903a57df734299354086
2015-07-09 13:39:54 -05:00
Ron Anderson
dfffdececc Omaha #4441 Fix UGC count error for Baltimore City
Change-Id: I8627d6835dccae8180ca608034375cf646cd30b4

Former-commit-id: b8b694cdd9a71d1054a019c8e627f89abc983b27
2015-07-09 13:34:30 -05:00
steve.naples
28927a04fd ASM #14618 MPE - Daily QC missing 6 hour display.
Change-Id: Ib9af81273c8e971870f035adcc109ff717a9f530

Former-commit-id: 6ededf355d17106b62776dd151ae1bccbc961f90
2015-07-09 17:31:17 +00:00
Daniel.Huffman
c1dde0afa1 ASM #17167 Remove the nulls from incoming xmlString
Change-Id: I1a50c718ee6b9872f58cac61831eeab6092a04ec

Former-commit-id: e8139effcb2bba62bc2ef429d812c709bc773cd2
2015-07-09 12:36:45 +00:00
Nate Jensen
bc954bd3c3 Merge "Omaha #4474 Make AlertView popup more interactive." into omaha_16.1.1
Former-commit-id: def84ba17c5e1560f38d8fd6b672eda9fc12a2a9
2015-07-08 18:18:33 -05:00
Ben Steffensmeier
41d8c370ab Omaha #4474 Make AlertView popup more interactive.
Former-commit-id: 3b7e322a3748f339a7b470ee5d55d639e64f5b3f
2015-07-08 16:50:00 -05:00
steve.naples
53aa702a53 ASM #16790 - Fix issue with MPE not loading correct data when up for long time.
Change-Id: I9d0e53b1ed5b374f465e1342da7330d38c4f47a3

Former-commit-id: a808823d7b6a975114b22ad6ce52a999c3260be5
2015-07-08 18:52:06 +00:00
Ron Anderson
5eac3a423a Omaha #4259 Fix error in SmartScript.getGrids that caused scalar grids to fail.
Change-Id: Ief6e27abe1824c326550837e2bc0a8ab2e276a98

Former-commit-id: 686ab4bd37aa6cc656fdb1e8622a87a84872529a
2015-07-08 12:42:54 -05:00
Matthew Howard
35723aa1d4 Merge "ASM #16907 AvnFPS: Climate download files from NCDC server changed in format" into asm_16.1.1
Former-commit-id: 57305dbcb42ac4f649d536e8af6b793f5e8439c2
2015-07-07 20:15:02 -05:00
Zhidong.Hao
02599a6039 ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
Change-Id: Ibfd5fa35b58ffd66eaf81945fb0b31f7ea632b65

Former-commit-id: 81c22bdd36a80a1f5deaf81926f8f07f24c929f9
2015-07-07 14:33:12 -04:00
Ron Anderson
4626fd62a9 Omaha #4259 Remove comment from SmartScript.getLatLonGrids() as it does not apply here.
Change-Id: Id5b4663cc3cd866ac72a80f2d5bf3dfa3883c60c

Former-commit-id: 4604302350e3c09fa6770fe0d1a644bf18a65c4c
2015-07-07 13:24:21 -05:00
Matthew Howard
c7737cf711 Merge "ASM #14739 - Fix callSmartTool() to return with updated varDict" into asm_16.1.1
Former-commit-id: 90cfdc7a1385d1e99a4237c31dc4c01e3f905a97
2015-07-07 12:40:49 -05:00