Commit graph

11604 commits

Author SHA1 Message Date
Mark Ruebens
99b1b62c99 Merge changes I7e4d3cca,Id75ad2d2 into asm_16.2.1-p1
* changes:
  ASM #18950 - WarnGen Templates: Special marine warning followup has formatting problem with front event type and line of storms
  ASM #18958 - WarnGen Templates: Misc template fixes post 16.1.2 implementation


Former-commit-id: 7ecb4d6a9904cf2f0552454a9f3fdf991d3ec2bb
2016-05-13 14:28:21 -05:00
Mark Ruebens
236d191804 Merge "ASM #18968 - WarnGen Template: OF needs to be of in VM_global_library.vm" into asm_16.2.1-p1
Former-commit-id: 54b6eff2eddd813b0f08d6344bb0aef6fa6683dd
2016-05-13 13:03:11 -05:00
Ron Anderson
1c0252b602 Merge "Omaha #5516 Cleaned up GUI code for FFMP Table" into omaha_16.2.1-lx
Former-commit-id: 988f22f8ea975f35f865339894de514cd1e3ac32
2016-05-13 12:31:53 -05:00
Shawn.Hooper
cb2a92c16d Merge remote-tracking branch 'vlab/ohd_16.2.2' into master_16.2.2
Former-commit-id: 621247965d7e00d548804e7f2871739b2a6867f6
2016-05-13 13:16:13 -04:00
Shawn.Hooper
cb056721af Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Former-commit-id: ae99c4e7b743ff3ae10a73796a14b72426598401
2016-05-13 13:15:53 -04:00
Shawn.Hooper
c58c624779 ASM #18987 - Updates to Extreme Wind Warning Followup Template
Change-Id: I2a8598e6af722a5fbed353f6c8d41c241ad6c45f

Former-commit-id: 7dd216cc9a264147189806ca3549700acb0d5c0b
2016-05-13 12:51:30 -04:00
Penghai Wang
2519dfda38 VLab Issue #18616 - DR18984 enable to load all levels of gfeParamInfo.xml; fixes #18616
Change-Id: If56ee04aa285a9e9d89b31ec73319070c9b45e1f

Former-commit-id: f026d9b5539377db251ce7ba1795bad9d7d686c5
2016-05-13 16:41:05 +00:00
Shawn.Hooper
3aea06ff70 ASM #18950 - WarnGen Templates: Special marine warning followup has formatting problem with front event type and line of storms
Change-Id: I7e4d3cca6fa3f87c90b5fcec1aee53b97ccfd644

Former-commit-id: b3417552085340863cf193e7555a581c17ec6332
2016-05-13 11:30:20 -04:00
Shawn.Hooper
52976849d0 ASM #18958 - WarnGen Templates: Misc template fixes post 16.1.2 implementation
Change-Id: Id75ad2d2e0204e5ae85249e431a2a189f56d2a6a

Former-commit-id: 1e92a24fe8d7fd3654cb2a0425efce683d7d1d9f
2016-05-13 11:27:01 -04:00
Shawn.Hooper
afd1a817f6 ASM #18968 - WarnGen Template: OF needs to be of in VM_global_library.vm
Change-Id: I8234fa9d8011e77a2d26a36fdb5fc6c6e0596ca5

Former-commit-id: d018dfc0d57751b0cf024bad237d004ff49d5367
2016-05-13 11:23:52 -04:00
Tom Gurney
e2befbb257 Omaha #5345 Update METAR sea level pressure units
Change-Id: I35909de7e85b263118e6e245a575cface980cbde

Former-commit-id: 84005c09fc0685ed1ba95ccf1f5715ce0936009b
2016-05-13 10:15:41 -05:00
Steve Harris
426033b0c2 Omaha #5586 - moving NASA SPoRT plugins to AWIPS2_NASA_SPoRT repository
Former-commit-id: e82f241c3b7ea1be18e140dbba838ebcc90d33fd
2016-05-13 10:09:49 -05:00
Penghai Wang
eb40be2b22 VLab Issue #18566 - DR18988 STQ missing emergency phone; fixes #18566
Change-Id: Id7c11f79a0cf8bdbc8e5d6c627d95aa1d79b9c6a

Former-commit-id: 49b5c8e98c58581ad8f4a285b5a0420016d568b9
2016-05-12 18:06:14 +00:00
Shawn.Hooper
4e20a3c69b ASM #17308 - Revert gridImageryStyleRules.xml to 16.2.2-2 version
Change-Id: I24a03427b2d37b3e7188f104cc96e4a7baa5a147

Former-commit-id: 4f083feb5675ed0249459a62c793814a9eb83095
2016-05-12 11:07:49 -04:00
Shawn.Hooper
7f0fe3253a Merge tag 'OB_16.2.2-7' into asm_16.2.2
16.2.2-7


Former-commit-id: c095fe2d4e634aff4ebd6e1d7bf676436ba4b80b
2016-05-12 11:05:15 -04:00
Jingtao Deng
bb33cfa4c0 VLab Issue #18549 - Hydrobase UELE when updates River Gage data; fixes #18549
Change-Id: I4783ee8b723cbb95ec1819fc206f1deefcccc1cc

Former-commit-id: 91568da77e23d0d314b027cb63845c2d4a3dc8e5
2016-05-12 10:43:35 -04:00
Steve Harris
ec8b83dd67 Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2
16.2.1-lx-29

 Conflicts:
	cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/total/TotalLightningDecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm


Former-commit-id: 17c68986a20e9a589d40407800dd52678fcda68b
2016-05-12 09:28:49 -05:00
Bryan Kowal
d6d2bc47c2 Merge "Omaha #5483 - fix Hydro GUI sizing issues." into omaha_16.2.1-lx
Former-commit-id: 3aba4b9f8be1a5e9bbcc9018dcdf1f2df3edee38
2016-05-11 11:27:08 -05:00
Bryan Kowal
d572270f5c Omaha #5483 - fix Hydro GUI sizing issues.
Former-commit-id: b2cbd21c2f8b7214323eaa6e93b6e25f20e5f0ed
2016-05-11 10:47:00 -05:00
Ron Anderson
93b01c5f0c Omaha #5516 Cleaned up GUI code for FFMP Table
Change-Id: Ia62c796ecb3fe4b8b3fbb0431f51a810df71e6f7

Former-commit-id: 1becfebe522a27f8d85898cdcfa358d49626a27a
2016-05-10 16:20:09 -05:00
Richard Peter
7d1e95be34 Omaha #5642 - Fix GridCoverage transaction nesting
Change-Id: I5347dad1ccc4278823ab10763184ddbd1bdbabda

Former-commit-id: 82b0193e98fe4bb8a6ae7c1a9ab0baf288db8c32
2016-05-10 16:09:43 -05:00
Ron Anderson
6fd641194c Merge "Omaha #5517 Fix initial location of AlertViz bar after caveData is cleared" into omaha_16.2.1-lx
Former-commit-id: ea9b494a382e3dc9a5578891f9990855096fdbbf
2016-05-10 15:56:39 -05:00
Ron Anderson
f5e5b2c9dd Merge "Omaha #5483 - Fix layout of hydro Toggle Time Series dialog." into omaha_16.2.1-lx
Former-commit-id: 7fef2307965f8c339a64dfcf72b902854aa15d6f
2016-05-10 15:47:25 -05:00
Ron Anderson
f4dcd5f5e0 Omaha #5517 Fix initial location of AlertViz bar after caveData is cleared
Change-Id: I828ba04158d0735805d8becec03be4e26d1cd179

Former-commit-id: 1cb1a2a46b4f7aa8bacb7c030698798e13bb6cda
2016-05-10 13:52:40 -05:00
David Gillingham
b151a86896 Omaha #5483 - Fix layout of hydro Toggle Time Series dialog.
Change-Id: I1e3af9de34dc85c3671935787f25d8a9d84ec2d3

Former-commit-id: 0c3c30902be5dd0c3da093b87de97b0539e806ad
2016-05-10 11:06:07 -05:00
Ron Anderson
5664c4ad11 Merge "Omaha #5483 - Fix hi-dpi layout issues in hydro Questionable / Bad Data dialog." into omaha_16.2.1-lx
Former-commit-id: 71feb37e424e81a0d0c3dc2b376b5866b54f7a61
2016-05-10 10:36:32 -05:00
Bryan Kowal
f63ab4b76e Omaha #5609 - ensure all appended vmargs remain at the end of the command as they previously did.
Former-commit-id: f487e2a6be5fb53e9802cd190bed49bc645a3b9a
2016-05-10 09:06:10 -05:00
Steve Harris
e35226095b Merge tag 'OB_16.2.2-7' into omaha_16.2.2
16.2.2-7


Former-commit-id: b065e24a42300c3b4fec66a2ff0648ec0614769b
2016-05-09 21:55:59 -05:00
Bryan Kowal
06b2e72249 Omaha #5483 - fix Hydro GUI sizing issues.
Change-Id: I33e36d996f6c25ff711b7a45e34a48a03ef32218

Former-commit-id: 4668a16070e57e3c452c5131b7c7e36b0d3c8b1f
2016-05-09 16:19:31 -05:00
Steve Harris
b1de331f75 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Former-commit-id: 28a3c0d5a5cb8564aeb023cc6911a3ab774d9435
2016-05-09 16:03:53 -05:00
Steve Harris
48e5f5f0c7 Merge tag 'OB_16.2.1-29' into omaha_16.2.1
16.2.1-29


Former-commit-id: f836d0703c8a8c575ebb2b210a5236a2b0379dfa
2016-05-09 15:57:56 -05:00
Rici.Yu
047cd1003d ASM #18967 - Remove contours plotted over ProposedWatches grid after running ViewWCL
Change-Id: I9350247111463a78c6e83c987bef306ee9f92397

Former-commit-id: 1afa90016cda1522de6ef33c1502ec7680f98bc1
2016-05-06 16:37:30 -04:00
David Gillingham
1246387734 Omaha #5483 - Fix hi-dpi layout issues in hydro Questionable / Bad Data dialog.
Change-Id: Ibb9b856fcc3916bc57cd5291d05f7ad5a559a0aa

Former-commit-id: 16f16155f397713e380a20d923506dc1d6ca38f6
2016-05-06 14:14:40 -05:00
Ron Anderson
884edbe13f Merge "Omaha #5483 - Fix hi-dpi issues in hydro Station Reporting Status dialog." into omaha_16.2.1-lx
Former-commit-id: f4001d69d79f7400c8db9f2d9484870a28253ec6
2016-05-06 10:17:21 -05:00
Shawn.Hooper
8977a0a91c Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Former-commit-id: f45d120949051fa6ffe06b225a05571244042a73
2016-05-05 14:15:17 -04:00
Shawn.Hooper
3c315c8ee4 Merge remote-tracking branch 'vlab/asdt_16.2.2' into master_16.2.2
Former-commit-id: 4701750f64bc9d7c911b1bb58a1b48cbb99b85ce
2016-05-05 14:15:12 -04:00
Shawn.Hooper
30c550ee69 Merge remote-tracking branch 'vlab/field_16.2.2' into master_16.2.2
Former-commit-id: a9509b9f570d8a23fe1ed54e8949f30ebad1726f
2016-05-05 14:15:09 -04:00
Melissa Porricel
45c1f60ebb ASM #18361 - Some synoptic obs data not being decoded
Change-Id: I474a1c31787fb98f841ad20ddd5bccb2a9a1e0d9

Former-commit-id: a53d7f9691e47257915174556c97c6af139d1d52
2016-05-05 09:09:37 -04:00
Steve Harris
5419e1a273 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: a1bc44e359360b9718945f9db2f435e267a15730
2016-05-04 21:13:12 -05:00
Steve Harris
4951edcdd6 Merge tag 'OB_16.2.1-28' into omaha_16.2.1
16.2.1-28


Former-commit-id: ae0f7da6907879dd437bcbc25b7cb50e8ba3c9ab
2016-05-04 20:58:32 -05:00
David Gillingham
76be4503c9 Omaha #5483 - Fix hi-dpi issues in hydro Station Reporting Status dialog.
Change-Id: I1cf30ffbf13c4245207b88a0118f9b1015126a8d

Former-commit-id: 82fe2885ed305c62d8b550d386c270ff5f8755bf
2016-05-04 18:02:44 -05:00
David Gillingham
12a0735bb5 Omaha #5054 - Fix dialog parenting of SaveLevel2Data dialog when closing MPE daily QC dialog.
Change-Id: Ic4a60bb56d00f506d063e5137a70a627c4f0c7a9

Former-commit-id: 830f1ef6cad1bb9104d459f5bac2acbad98bc89c
2016-05-04 12:38:57 -05:00
Penghai Wang
87fda2aad8 Merge "VLab Issue #18075 - DR 18336 fix. All keep-alives were being treated as NLDN. Get source from WMO header instead; fixes #18075" into asdt_16.2.2
Former-commit-id: 6b10f777d56029f04826d0789b1dd3aa3969bc3d
2016-05-04 13:11:05 +00:00
Shawn.Hooper
6dd7d6e445 Merge branch 'master_16.2.1' into master_16.2.1-lx
Former-commit-id: c2912e8f8c98c1e7a4b97fc431db7f054452425a
2016-05-03 13:51:27 -04:00
Shawn.Hooper
2104f21b18 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 0b4194e31947218d89150aaa8001d8ce206887dc
2016-05-03 13:50:58 -04:00
Andrew Moore
de50a8ac01 VLab Issue #18075 - DR 18336 fix. All keep-alives were being treated as NLDN. Get source from WMO header instead; fixes #18075
Change-Id: I53a392780148de85de9c25fff05c313737137b57

Former-commit-id: 3cf025add9b0c2636a442784bb977601ed7b434e
2016-05-03 17:04:25 +00:00
Ana Rivera
3a3da7aa68 Merge "VLab Issue #17882 - Fixes to DCS18425 per DR 18886; fixes #17882" into field_16.2.2
Former-commit-id: 30f0c54c15061d0229bdd291cd0d4222792d94b7
2016-05-03 14:12:45 +00:00
Matthew Foster
432d75d807 VLab Issue #17882 - Fixes to DCS18425 per DR 18886; fixes #17882
Change-Id: I2787bef9456db1ef05796402bb9b95a2aa172d36

Former-commit-id: 760f6aa3052890cd7f0f3759a952b2bd8ae821cc
2016-05-03 13:59:14 +00:00
Mark Ruebens
569b3dcadb Merge "ASM #18947 - Text Workstation: QC Error if enough UGCs are listed, sending one to 2nd line (additional check-in)" into asm_16.2.1
Former-commit-id: 7f65c72fb7f17a38f6afc4c053718aa2e539f792
2016-05-02 15:24:14 -05:00
Penghai Wang
3464ad6b11 Merge branch 'master_16.2.2' into asdt_16.2.2
Former-commit-id: 02133bf406abe2ba96c7037cbb30675de2e02918
2016-05-02 19:52:55 +00:00