xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33085 commits 31 branches 40 tags 3.8 GiB
Commit graph

282 commits

Author SHA1 Message Date
Steve Harris
01248e7101 Merge branch 'development' into Enhanced_points 
Former-commit-id: b84b354c01 [formerly 2e47ad78bc] [formerly 321e2191b1] [formerly b84b354c01 [formerly 2e47ad78bc] [formerly 321e2191b1] [formerly 6146f56ce4 [formerly 321e2191b1 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]]]
Former-commit-id: 6146f56ce4
Former-commit-id: 92bac7167a [formerly bc86013d8f] [formerly 1519ecf79b5f70bd2a5878e760356c231a28383c [formerly 9ca736f901]]
Former-commit-id: 8426fe487b6ac801ec3e1fdc9e8591d2f018b9cf [formerly 69b6272658]
Former-commit-id: 40ddaa276f
 2012-09-13 15:25:12 -05:00
Steve Harris
321e2191b1 Merge branch 'development' into Enhanced_points 
Former-commit-id: ee63462d73511ef55dc0d80b3e94ef08a37f3305
 2012-09-13 15:25:12 -05:00
Steve Harris
12c59e82df 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: bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9d1f595fe6 [formerly e23b030dfd] [formerly 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6]]
Former-commit-id: bd0ee0b429fad620ecf3eac1dfa68366ef64350e [formerly f80fb62837]
Former-commit-id: 30b0700044
 2012-09-13 13:26:13 -05:00
Steve Harris
29e7427dc3 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: 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb
 2012-09-13 13:26:13 -05:00
Steve Harris
791ef6cedf 12.10.1-4 baseline 
Former-commit-id: ce574eeff1d197862c8aac2d3fc838a452862576
 2012-09-13 12:33:36 -05:00
Steve Harris
987397b2db 12.10.1-4 baseline 
Former-commit-id: ddc923e3e0 [formerly 9cd1f3ec0f] [formerly 791ef6cedf] [formerly ddc923e3e0 [formerly 9cd1f3ec0f] [formerly 791ef6cedf] [formerly 92cc2d8605 [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]]
Former-commit-id: 92cc2d8605
Former-commit-id: 27d8601fe0 [formerly f641cdd4e0] [formerly 53da655c90a1b4d0e3b7bbcaf373c23ba32edc6a [formerly b4d2a0e8dd]]
Former-commit-id: 5159825bf9b81d8d0188fb4bcfd469ccb27fd393 [formerly 451459d8cb]
Former-commit-id: f61c5114e8
 2012-09-13 12:33:36 -05:00
Steve Harris
ed04125cd7 12.10.1-4 baseline 
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec]
Former-commit-id: e57e7237a9
 2012-09-13 12:08:11 -05:00
Steve Harris
fd19ca5624 12.10.1-4 baseline 
Former-commit-id: 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed
 2012-09-13 12:08:11 -05:00
Steve Harris
5b45d94813 Merge branch 'development' into Enhanced_points 
Former-commit-id: bb6fe85a47 [formerly 892598dc66] [formerly 1dd1305a5d] [formerly bb6fe85a47 [formerly 892598dc66] [formerly 1dd1305a5d] [formerly ada1066831 [formerly 1dd1305a5d [formerly 632a766ec44337156bab8df73aecdee8b7bc2853]]]]
Former-commit-id: ada1066831
Former-commit-id: 0f90ce8b04 [formerly e0ee6bbf96] [formerly ad082c7958881e97fce6af73febade39a438deb1 [formerly d85659d9de]]
Former-commit-id: 5c4e50ab82874e05d162915d324435e735821222 [formerly d20a1de861]
Former-commit-id: 73b1005512
 2012-09-12 14:14:56 -05:00
Steve Harris
1dd1305a5d Merge branch 'development' into Enhanced_points 
Former-commit-id: 632a766ec44337156bab8df73aecdee8b7bc2853
 2012-09-12 14:14:56 -05:00
Steve Harris
21f430062b 12.10.1-3 baseline 
Former-commit-id: 1a94c1ca3674c8e4dbb8847de5190efe33da371c
 2012-09-11 16:00:38 -05:00
Steve Harris
9d4e230e7a 12.10.1-3 baseline 
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
 2012-09-11 16:00:38 -05:00
Ben Steffensmeier
ac770a948b Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors 
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8

Former-commit-id: 513bd44ba0 [formerly dc6f5805ef] [formerly 4272f4c885] [formerly 513bd44ba0 [formerly dc6f5805ef] [formerly 4272f4c885] [formerly c618ee9057 [formerly 4272f4c885 [formerly 5da7b54e1bff66ed46400bc624b9d881d0b967ce]]]]
Former-commit-id: c618ee9057
Former-commit-id: 49524b9109 [formerly 66e9b24e51] [formerly 1e8fa5942894142a7af4316bb2f69d7081706dc3 [formerly e0a4fe2c43]]
Former-commit-id: 2609f964204294c255f42e29c0b9fb07af09999d [formerly 64ef6f58f1]
Former-commit-id: 44d8021a72
 2012-09-04 13:41:10 -05:00
Ben Steffensmeier
4272f4c885 Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors 
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8

Former-commit-id: 5da7b54e1bff66ed46400bc624b9d881d0b967ce
 2012-09-04 13:41:10 -05:00
Steve Harris
46d05b60a1 Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]]
Former-commit-id: af106f1d29
Former-commit-id: 20e088a957 [formerly f224e3e8ad] [formerly fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]]
Former-commit-id: 3d9b8193220e5e34df1a2294f95f1fef387de77d [formerly e9582cb789]
Former-commit-id: f8e7459dfb
 2012-09-04 12:11:03 -05:00
Steve Harris
bba4eb12d0 Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: 3eacf0da611b09faa416580b8d2db5bdc9af2d11
 2012-09-04 12:11:03 -05:00
Steve Harris
195158c004 12.10.1-1 baseline 
Former-commit-id: 7d17407c5b0a4a3f9b4b083891a5a5975c645810
 2012-09-04 12:07:27 -05:00
Steve Harris
bc97cf788a 12.10.1-1 baseline 
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83 [formerly e720b8ed31] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9]
Former-commit-id: a924a8347a
 2012-09-04 12:07:27 -05:00
Steve Harris
623ef12926 Merge branch 'development' into Enhanced_points 
Former-commit-id: feccb1205d [formerly fa7c31206b] [formerly 5feac55dbd] [formerly feccb1205d [formerly fa7c31206b] [formerly 5feac55dbd] [formerly 32cf7fd764 [formerly 5feac55dbd [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]]]
Former-commit-id: 32cf7fd764
Former-commit-id: ff1a0c911d [formerly 5a8e58eda5] [formerly 9a3bf8cf46dc47950600c368d21537bbdc91f65e [formerly 592ab923bb]]
Former-commit-id: d4e2d37f80b06066e7cda073f08f001469489663 [formerly 66ac1051bc]
Former-commit-id: 7c1cebf5b1
 2012-08-30 15:43:06 -05:00
Steve Harris
5feac55dbd Merge branch 'development' into Enhanced_points 
Former-commit-id: 3aec6326bfce36758b93c7955ce3d0ee49e30cc3
 2012-08-30 15:43:06 -05:00
Steve Harris
7f13d82b95 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: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]]
Former-commit-id: a71dac6cad
Former-commit-id: fd6e8d5b63 [formerly dbcb28ce77] [formerly 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]]
Former-commit-id: 8e63ec5399842340c4f27680b2ed51ba425ae251 [formerly 0b647c0c9d]
Former-commit-id: 3f44e46a6f
 2012-08-27 09:53:55 -05:00
Steve Harris
91e39617cb 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: b9db13cf5bff60511d815f92f0239a4313498265
 2012-08-27 09:53:55 -05:00
Steve Harris
61f269f54c 12.9.1-5 baseline 
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
 2012-08-21 15:27:03 -05:00
Steve Harris
98059f9ef1 12.9.1-5 baseline 
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
 2012-08-21 15:27:03 -05:00
root
73466bae44 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8]
Former-commit-id: 0eb9520e15
 2012-08-15 22:15:20 +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
Steve Harris
31ae7ea218 12.9.1-1 baseline 
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
 2012-08-15 13:59:00 -05:00
Steve Harris
31353e2296 12.9.1-1 baseline 
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
 2012-08-15 13:59:00 -05:00
Steve Harris
106e18e326 Merge branch 'development' into Enhanced_points 
Former-commit-id: 9a5ad2fdae [formerly e372481f81] [formerly 346d775f57] [formerly 9a5ad2fdae [formerly e372481f81] [formerly 346d775f57] [formerly f7f97d9f54 [formerly 346d775f57 [formerly 25026a4d9955b76039bf25861380cadebff19665]]]]
Former-commit-id: f7f97d9f54
Former-commit-id: 25585ca8d7 [formerly 73e357c39d] [formerly f736245d042a572679a95e4b5cdd7ce4dcb5ef0f [formerly 031b655ab5]]
Former-commit-id: 281b3f6641525153bf05935567c97d0e68556ff4 [formerly 14923a89e9]
Former-commit-id: 5fc58b8e12
 2012-08-15 13:35:47 -05:00
Steve Harris
346d775f57 Merge branch 'development' into Enhanced_points 
Former-commit-id: 25026a4d9955b76039bf25861380cadebff19665
 2012-08-15 13:35:47 -05:00
Ben Steffensmeier
7a076b4a0b Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container 
Former-commit-id: 2c64112a4c [formerly 474fe44037] [formerly a4c46c7f55] [formerly 2c64112a4c [formerly 474fe44037] [formerly a4c46c7f55] [formerly 0857d971b5 [formerly a4c46c7f55 [formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]]]
Former-commit-id: 0857d971b5
Former-commit-id: 47059f915b [formerly 08021bcfc2] [formerly 65c0e971652eab1efeba6ce2a63fccbf32b0da33 [formerly a02bb2c092]]
Former-commit-id: bc354bf6e6f8705f771409a71703c7dbefc1f8f2 [formerly a17bae6f40]
Former-commit-id: d6c42b28bf
 2012-08-14 10:25:38 -05:00
Ben Steffensmeier
a4c46c7f55 Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container 
Former-commit-id: 7ae4af9778cfa58fc755041479aadec5e6ad90b0
 2012-08-14 10:25:38 -05:00
Roger Ferrel
1f7a1a5014 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: f8d0512703 [formerly b3c357c964] [formerly 2e3fc4b400] [formerly f8d0512703 [formerly b3c357c964] [formerly 2e3fc4b400] [formerly f4ae8eb150 [formerly 2e3fc4b400 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]]]
Former-commit-id: f4ae8eb150
Former-commit-id: f8e0bfb797 [formerly 69f22fe6bb] [formerly f9ea3b03486c9aff9f813d9e892a99cac8ea4ff8 [formerly ae41499ba2]]
Former-commit-id: 45c91ff9d7d494867bad9335476e510559f42a10 [formerly 4e356b8a13]
Former-commit-id: 4e15803926
 2012-08-08 13:35:47 -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
Roger Ferrel
1b97f2ad09 Issue #875 - Create com.raytheon.uf.viz.points 
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: cc1aecde2f [formerly bfcefac909] [formerly 0cf7d64cf4] [formerly cc1aecde2f [formerly bfcefac909] [formerly 0cf7d64cf4] [formerly 9071334fe9 [formerly 0cf7d64cf4 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]]]
Former-commit-id: 9071334fe9
Former-commit-id: 9116d93f52 [formerly c317c5d0a3] [formerly 02403b301463b98f598c97b53f769f6aa9cdf6a2 [formerly b3df932794]]
Former-commit-id: 1d76b537c3a1bcb9fb3c9d0a26d64d72d4c7a715 [formerly d6d4222e24]
Former-commit-id: b75d001a2a
 2012-07-12 11:32:03 -05:00
Roger Ferrel
0cf7d64cf4 Issue #875 - Create com.raytheon.uf.viz.points 
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: f3d38c3b1ea1b8118f90ce38937a689a9581b2bb
 2012-07-12 11:32:03 -05:00
Steve Harris
2c0ff851ca 12.6.1-9 baseline 
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
 2012-07-10 07:53:49 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline 
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
 2012-07-10 07:53:49 -05:00
Max Schenkelberg
aa709bc1ce Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function 
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 3bff06cf92 [formerly 7d13c7d339] [formerly 9bbb68a547] [formerly 3bff06cf92 [formerly 7d13c7d339] [formerly 9bbb68a547] [formerly 98c2ec7dc5 [formerly 9bbb68a547 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 58abd127b7 [formerly c6d324aaeb] [formerly 16ed73fb714995ccf7fe67f7b63b429bcc378657 [formerly 7286b4e962]]
Former-commit-id: 6353460f49cb2fb59cc8a8385f88fe8159290a8a [formerly d876190d68]
Former-commit-id: 3325ed5deb
 2012-07-06 16:01:47 -05:00
Max Schenkelberg
9bbb68a547 Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function 
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050
 2012-07-06 16:01:47 -05:00
Bryan Kowal
e05b247e3b Merge branch 'ss_sync' (OB12.6.1-10) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d]
Former-commit-id: 2e5a850d28
 2012-06-27 17:21:48 -05:00
Bryan Kowal
a33740e915 Merge branch 'ss_sync' (OB12.6.1-10) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: af5a90e383c1c115b363a33d9e72f957ada697a4
 2012-06-27 17:21:48 -05:00
Max Schenkelberg
ac8314da2c Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it. 
Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5

Former-commit-id: c1b95ef2c9 [formerly a691f425ea] [formerly d0b06374e9] [formerly c1b95ef2c9 [formerly a691f425ea] [formerly d0b06374e9] [formerly 130692aefd [formerly d0b06374e9 [formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]]]
Former-commit-id: 130692aefd
Former-commit-id: 3caff8171f [formerly e8e159bed0] [formerly a277ad161643ccdccd8ce94496000eaa48028c29 [formerly 859e041e10]]
Former-commit-id: 45d916b2a8cce170d0a492d44295737178bab844 [formerly 34cb1fc585]
Former-commit-id: ecc5316b44
 2012-06-21 16:07:20 -05:00
Max Schenkelberg
d0b06374e9 Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it. 
Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5

Former-commit-id: 75fb17528d393b767df8d8a34abd5e41f007b771
 2012-06-21 16:07:20 -05:00
Steve Harris
c7356570ae Revert "12.6.1-10 baseline" 
This reverts commit 8d09188a88 [formerly 95e7f4fc0c] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]] [formerly 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]] [formerly a2c0893d1a] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]].


Former-commit-id: 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 584f7eddf8 [formerly 62cf6a9f92] [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 944e3148d4 [formerly 333fd9c64e] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5]]
Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418]
Former-commit-id: e77a15c047
 2012-06-21 08:51:08 -05:00
Steve Harris
b4b1f6975f Revert "12.6.1-10 baseline" 
This reverts commit ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1].


Former-commit-id: 8cdb21fda317373a0dc95e5048716d0e31412ab4
 2012-06-21 08:51:08 -05:00
Steve Harris
8d09188a88 12.6.1-10 baseline 
Former-commit-id: 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 530dfc0563 [formerly f8497470fc] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf]]
Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474]
Former-commit-id: 95e7f4fc0c
 2012-06-21 08:38:48 -05:00
Steve Harris
ddde63eee0 12.6.1-10 baseline 
Former-commit-id: 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1
 2012-06-21 08:38:48 -05:00
Steve Harris
ec9204fa94 Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration 
Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
	cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java

Former-commit-id: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f]
Former-commit-id: 70a928d039
 2012-06-12 14:37:12 -05:00
Steve Harris
2f20a86a30 Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration 
Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
	cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java

Former-commit-id: 9e83341a16b6e68f9bfe579dff60271553c3db82
 2012-06-12 14:37:12 -05:00