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

3142 commits

Author SHA1 Message Date
Lee Venable
4978a231eb Merge "Issue #2892 - Fix problems loading saved configs for data browser dialog." into development 
Former-commit-id: 1a3738c8fd [formerly f6601d6bcc] [formerly 1a3738c8fd [formerly f6601d6bcc] [formerly d4a6ce546d [formerly 96361fa3cd86627ef633c5421a2434c930c3b85c]]]
Former-commit-id: d4a6ce546d
Former-commit-id: bf4f3c75ef [formerly caf31402d7]
Former-commit-id: de242e3e91
 2014-04-14 14:09:03 -05:00
Richard Peter
6ef84cf3c4 Merge "Issue #2862 Implements locks on case creation." into development 
Former-commit-id: 22a01edbb7 [formerly 19755418f8] [formerly 22a01edbb7 [formerly 19755418f8] [formerly 181ffee3db [formerly e2c246299716bc2eba90a16c2c69cf1e0a9a6913]]]
Former-commit-id: 181ffee3db
Former-commit-id: c4853e7982 [formerly 0abb97820b]
Former-commit-id: 48c8415382
 2014-04-14 13:28:26 -05:00
Richard Peter
de624d87d3 Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: e4be1f24e7 [formerly dbba727f3d] [formerly e4be1f24e7 [formerly dbba727f3d] [formerly 17196b5dcd [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: 17196b5dcd
Former-commit-id: ff87317bd4 [formerly 8b279966d1]
Former-commit-id: b3fd8e5480
 2014-04-14 13:10:11 -05:00
Nate Jensen
ee8020b667 Merge "Issue #2241 fix tear off menus in practice mode" into development 
Former-commit-id: 2a0c73fb25 [formerly 47eb9ecb0a] [formerly 2a0c73fb25 [formerly 47eb9ecb0a] [formerly 5fe4c08ab6 [formerly 4fedbaacf54b5194afb9548101badc4619347638]]]
Former-commit-id: 5fe4c08ab6
Former-commit-id: 60ee75d3df [formerly f77b99b51c]
Former-commit-id: e115f8581b
 2014-04-14 09:28:34 -05:00
Richard Peter
4ca584c465 Merge "Issue #2947 Minor satellite and derived parameter improvements." into development 
Former-commit-id: 97fb03df02 [formerly 91e941f60a] [formerly 97fb03df02 [formerly 91e941f60a] [formerly 9ef8347f23 [formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]]
Former-commit-id: 9ef8347f23
Former-commit-id: a4eba6e6df [formerly ffd74e6787]
Former-commit-id: c072d0d0ca
 2014-04-11 19:33:31 -05:00
Ben Steffensmeier
25c850b9d8 Issue #2947 Minor satellite and derived parameter improvements. 
Former-commit-id: 2d66e58671 [formerly dd794a3c12] [formerly 2d66e58671 [formerly dd794a3c12] [formerly 428f3a2d8b [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: b120feab6f [formerly 6c92b645f0]
Former-commit-id: 0b6ca56417
 2014-04-11 17:37:59 -05:00
Ben Steffensmeier
43e975b11e Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider. 
Former-commit-id: ca78a04d95 [formerly d5b91d8846] [formerly ca78a04d95 [formerly d5b91d8846] [formerly 1ad8396366 [formerly c5c0dcaab8e495970438f134625ac2847f9bcf9f]]]
Former-commit-id: 1ad8396366
Former-commit-id: b707e3b6db [formerly fb85857ff5]
Former-commit-id: 7ca12d26a9
 2014-04-11 17:34:38 -05:00
Richard Peter
a22345ea6b Merge branch 'omaha_14.2.2' (14.2.2-3) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
 2014-04-11 16:23:09 -05:00
Roger Ferrel
6f127a05e0 Issue #2862 Implements locks on case creation. 
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b

Former-commit-id: 16fab01b8b [formerly 5570261d74] [formerly 16fab01b8b [formerly 5570261d74] [formerly cfea0489d7 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]]
Former-commit-id: cfea0489d7
Former-commit-id: c5de39c162 [formerly d66a346c65]
Former-commit-id: ac1946609e
 2014-04-11 16:07:58 -05:00
brian.dyke
f299a28f9b Merge branch 'master_14.2.2' into asm_14.2.2 
Former-commit-id: 6a9ccba393 [formerly 6575f77fe3] [formerly 6a9ccba393 [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]
Former-commit-id: a8d6d58f31
Former-commit-id: 88ddd667b6 [formerly ad63114f16]
Former-commit-id: 1c4e02168c
 2014-04-11 10:58:48 -04:00
Richard Peter
b6c8960328 Merge "Issue #2864 - Change how saved subset files are stored." into development 
Former-commit-id: 69c6217ae9 [formerly 8a682a5e23] [formerly 69c6217ae9 [formerly 8a682a5e23] [formerly 695878c6aa [formerly 05fed9ffbd4c61601d6a42b2ef3dadefde7e1a3c]]]
Former-commit-id: 695878c6aa
Former-commit-id: b4cc44faa0 [formerly 0fa4180959]
Former-commit-id: e858f14a8c
 2014-04-11 09:41:31 -05:00
Mike Duff
8b46df102d Issue #2864 - Change how saved subset files are stored. 
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

Former-commit-id: a58f279b54 [formerly 82cf444d6f] [formerly a58f279b54 [formerly 82cf444d6f] [formerly 890faf2d73 [formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]]
Former-commit-id: 890faf2d73
Former-commit-id: dc2a5b0c6f [formerly 6d8bead4a7]
Former-commit-id: 583a4b1cea
 2014-04-11 08:27:42 -05:00
Nate Jensen
0bac0fa185 Merge "Issue #2937 Connect to the venue after the feed view is available." into development 
Former-commit-id: c7593d61c4 [formerly 5fc6942fab] [formerly c7593d61c4 [formerly 5fc6942fab] [formerly b3b9dbff67 [formerly 11985e2127b29ee4e67288579c273d1ac75cc902]]]
Former-commit-id: b3b9dbff67
Former-commit-id: 7f32159599 [formerly 4a395ff2bc]
Former-commit-id: ff5519566f
 2014-04-10 16:59:17 -05:00
Everett Kladstrup
9327eebf87 Issue #2725 Moving derivparam plugins to the lowest applicable features 
Former-commit-id: 7fd3d7ce3d [formerly b074c88957] [formerly 7fd3d7ce3d [formerly b074c88957] [formerly ed0c157e33 [formerly 4397d0c6018858ab967110884cfdb7771c08e199]]]
Former-commit-id: ed0c157e33
Former-commit-id: 70a383f68d [formerly b9f67d3bae]
Former-commit-id: 5f280b7352
 2014-04-10 16:00:22 -05:00
Matt Nash
6fc553f812 Issue #2241 fix tear off menus in practice mode 
Change-Id: I52a2e9be64bff8a044b148666b7ad77670a6f64e

Former-commit-id: f5e333c154 [formerly 81c4976c96] [formerly f5e333c154 [formerly 81c4976c96] [formerly 0eed368ac4 [formerly 391655cd6a84c6cbf31e711ec5e1aa92833db896]]]
Former-commit-id: 0eed368ac4
Former-commit-id: d91e77641b [formerly 46df69447b]
Former-commit-id: 17f43a6114
 2014-04-10 14:50:06 -05:00
Everett Kladstrup
1467f1a316 Issue #2725 Put derivparam plugins in viz and edex separately 
Former-commit-id: 90244ad7ec [formerly d76aaed2f0] [formerly 90244ad7ec [formerly d76aaed2f0] [formerly 1a8a05cd0e [formerly b349f878ffe5fb8fd231cc9286cce6542f0ed88e]]]
Former-commit-id: 1a8a05cd0e
Former-commit-id: fa9ee97662 [formerly db413dc65f]
Former-commit-id: 1a68ea889a
 2014-04-10 14:08:42 -05:00
Brad Gonzales
91d546d015 Issue #2937 Connect to the venue after the feed view is available. 
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: 5fcec27765 [formerly cc0fd1e9af] [formerly 5fcec27765 [formerly cc0fd1e9af] [formerly ea03096031 [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]
Former-commit-id: ea03096031
Former-commit-id: e41f9defa4 [formerly 3b25edad9a]
Former-commit-id: 8f72707b3a
 2014-04-10 14:01:53 -05:00
Nate Jensen
7cae36a45e Merge "Issue #1803 fix redbook sharing in collaboration" into development 
Former-commit-id: 74a7189143 [formerly e88519c5e3] [formerly 74a7189143 [formerly e88519c5e3] [formerly 666b271528 [formerly 296b4dee5e8907296c45b8372b5dffe28a2b9f4c]]]
Former-commit-id: 666b271528
Former-commit-id: 5d17f07d25 [formerly 573981b0d5]
Former-commit-id: 4cffa91903
 2014-04-10 13:50:55 -05:00
Mike Duff
b432d6a4f6 Issue #2892 - Fix problems loading saved configs for data browser dialog. 
Change-Id: I73b98714642f5852f7209fd8533d49aa473412f9

Former-commit-id: 635684bb4e [formerly 33a2259cf4] [formerly 635684bb4e [formerly 33a2259cf4] [formerly da65756e3b [formerly 323badf58cf12a35b3a4d93ff0188b638e60969b]]]
Former-commit-id: da65756e3b
Former-commit-id: a23608ec59 [formerly 67ff4371b3]
Former-commit-id: bc82bf8f86
 2014-04-10 13:31:42 -05:00
Brian.Dyke
fbefee3e1d Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 73be1016c0 [formerly 8c2f601b59] [formerly 73be1016c0 [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: afc1da9015 [formerly ff51498036]
Former-commit-id: f051b95a7a
 2014-04-10 13:26:42 -04:00
David Gillingham
2ab21ac335 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin. 
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 1c7e650e6a [formerly c8a6dc8769] [formerly 1c7e650e6a [formerly c8a6dc8769] [formerly da31ab2042 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]
Former-commit-id: da31ab2042
Former-commit-id: 0385a4395e [formerly 72229cfb94]
Former-commit-id: 89046665f6
 2014-04-10 11:24:40 -05:00
Nate Jensen
71e01e0264 Issue #1803 fix redbook sharing in collaboration 
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e

Former-commit-id: 4cccdac37e [formerly 1efb9a2a4d] [formerly 4cccdac37e [formerly 1efb9a2a4d] [formerly 4a826332e9 [formerly fdf384ea4cedebbf06c5e4861a5a7cdcc72533b4]]]
Former-commit-id: 4a826332e9
Former-commit-id: 2750a173dc [formerly a191b473e2]
Former-commit-id: a3fef22e8b
 2014-04-10 10:50:33 -05:00
Nate Jensen
c2f1f5542a Merge "Issue #2725 Add new project to alertviz feature" into development 
Former-commit-id: 56b820ab97 [formerly ec40cb3dfc] [formerly 56b820ab97 [formerly ec40cb3dfc] [formerly eaf1382178 [formerly 9cacee78da76f5da13b0a78a3e0a347a647050cf]]]
Former-commit-id: eaf1382178
Former-commit-id: a0e2342126 [formerly 952586230a]
Former-commit-id: 8c6704e442
 2014-04-09 16:07:25 -05:00
Everett Kladstrup
de0f935f69 Issue #2725 Add new project to alertviz feature 
Former-commit-id: 963ce8716e [formerly e4633811fc] [formerly 963ce8716e [formerly e4633811fc] [formerly 02b47e4d5a [formerly 804dae43dd8f5cfc90fb7f17c7549b5151f63c7e]]]
Former-commit-id: 02b47e4d5a
Former-commit-id: c2a96ba985 [formerly 55638c0916]
Former-commit-id: a00b1dd9f6
 2014-04-09 16:01:57 -05:00
Richard Peter
421b2716a4 Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: 5676090443 [formerly 95eba8dcf6] [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: f1b85f6964 [formerly 73aab15d85]
Former-commit-id: b667e0509f
 2014-04-09 16:00:54 -05:00
Nate Jensen
560bdaf4c8 Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development 
Former-commit-id: ad961bb84d [formerly 0dd55f63ba] [formerly ad961bb84d [formerly 0dd55f63ba] [formerly 88d0e400fb [formerly 4d91a4fedbba2164f1e11a2fbaea8e0b1dbe6340]]]
Former-commit-id: 88d0e400fb
Former-commit-id: dfac2a42c2 [formerly a2c4c63852]
Former-commit-id: 5a2f9a2e04
 2014-04-09 14:07:09 -05:00
Everett Kladstrup
136af85d0c Issue #2725 Remove datacube plugin from viz.core feature 
Former-commit-id: b670fa67f6 [formerly 50346d5aec] [formerly b670fa67f6 [formerly 50346d5aec] [formerly ef21ea5c1f [formerly 1c72a291c9623f3930ca71da67e87ef884c81a94]]]
Former-commit-id: ef21ea5c1f
Former-commit-id: fd9bd8282a [formerly 9faba2afbf]
Former-commit-id: 21c7199512
 2014-04-09 13:59:11 -05:00
Everett Kladstrup
619ccff21b Issue #2725 Add new plugin to uf.viz.base feature 
Former-commit-id: 91673b18b0 [formerly 8d918404d5] [formerly 91673b18b0 [formerly 8d918404d5] [formerly 28364c8618 [formerly 828a32f1753a40613bb0351281458bee1d45cba6]]]
Former-commit-id: 28364c8618
Former-commit-id: d968a60023 [formerly 378193b61f]
Former-commit-id: 64dad45a1c
 2014-04-09 13:43:09 -05:00
Ben Steffensmeier
28f06f5bfc Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps. 
Former-commit-id: 9c5eb936d3 [formerly 5328415054] [formerly 9c5eb936d3 [formerly 5328415054] [formerly daff2b9d9d [formerly 67302674101992ae5416f342f92acab9233a113d]]]
Former-commit-id: daff2b9d9d
Former-commit-id: 88f5dbe81d [formerly f5271a94d6]
Former-commit-id: cf81a60e7c
 2014-04-09 13:19:21 -05:00
Nate Jensen
edc55ee2ca Merge "Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist" into development 
Former-commit-id: 187a895056 [formerly b58bb8500c] [formerly 187a895056 [formerly b58bb8500c] [formerly 2c2e324401 [formerly c66a85a125bb590abad607eb751b0baf9c07a3ba]]]
Former-commit-id: 2c2e324401
Former-commit-id: f574c535f5 [formerly 8999051f04]
Former-commit-id: 4af6b91229
 2014-04-09 11:22:07 -05:00
Nate Jensen
801f6f7a5c Merge "Issue #2950 Add option to interpolate image colors." into development 
Former-commit-id: 0da28c9c7a [formerly 1f2809ced0] [formerly 0da28c9c7a [formerly 1f2809ced0] [formerly d729cc70af [formerly 1db00446a00b6cd268b169871eadd1bef407e268]]]
Former-commit-id: d729cc70af
Former-commit-id: 6f36916c31 [formerly c460736793]
Former-commit-id: 91ef6f7b9c
 2014-04-09 11:20:59 -05:00
Nate Jensen
4fe2e3a01b Merge "Issue #2950 Support dynamic color counts for color map editing." into development 
Former-commit-id: 6989999e95 [formerly 5129002e91] [formerly 6989999e95 [formerly 5129002e91] [formerly 5bad21f3e6 [formerly b196bf0463ea59d55dec4e70373ca731152123f9]]]
Former-commit-id: 5bad21f3e6
Former-commit-id: 58516f3a9f [formerly 92f0182d3f]
Former-commit-id: a08e3a4f1a
 2014-04-09 11:20:04 -05:00
Brian.Dyke
8ef50f023b Merged 1354 -7 and -8 into 1412 
Former-commit-id: e4136f79dd [formerly 947194c998] [formerly e4136f79dd [formerly 947194c998] [formerly 929b736038 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]
Former-commit-id: 929b736038
Former-commit-id: d76d3a26cb [formerly 5163a31a66]
Former-commit-id: 462952ce65
 2014-04-09 11:39:07 -04:00
Mike Duff
494c577a1b Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist 
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133

Former-commit-id: 5e39f5a61c [formerly 23474c5ead] [formerly 5e39f5a61c [formerly 23474c5ead] [formerly eafa177f4b [formerly a1f94a19ba7f0bff7bbf76fa24ff6ace9019d0f1]]]
Former-commit-id: eafa177f4b
Former-commit-id: 1363155c34 [formerly ee80debc36]
Former-commit-id: 6e6ac425af
 2014-04-09 10:17:22 -05:00
Richard Peter
17f405cbaa Merge "Issue #2725 Move derived parameters logic to common" into development 
Former-commit-id: 16e1018dd9 [formerly ea4d09c674] [formerly 16e1018dd9 [formerly ea4d09c674] [formerly ed25b71ff1 [formerly d97da3eb67c00a8d5bf1af0fae453fa9c96aacc4]]]
Former-commit-id: ed25b71ff1
Former-commit-id: a32e066d95 [formerly ce7e0f9a31]
Former-commit-id: 5fd6492386
 2014-04-09 09:33:56 -05:00
Nate Jensen
a396472116 Merge "Issue #2920 Fix serialization of DrawStringEvent." into development 
Former-commit-id: 6aa42816ec [formerly abee6815ad] [formerly 6aa42816ec [formerly abee6815ad] [formerly 143c3e1801 [formerly 663db14c5fa57c1d9ccd9c3d6ef82862d330a4b4]]]
Former-commit-id: 143c3e1801
Former-commit-id: 9899b9ecab [formerly 0ea487feec]
Former-commit-id: 030857c8a9
 2014-04-09 09:32:39 -05:00
Everett Kladstrup
7b2683532a Issue #2725 Move derived parameters logic to common 
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: 8b19b3601a [formerly 06d6961c0f] [formerly 8b19b3601a [formerly 06d6961c0f] [formerly 0699041518 [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]
Former-commit-id: 0699041518
Former-commit-id: 86bf2b5ea0 [formerly 260d0beddc]
Former-commit-id: d96b56c91a
 2014-04-09 09:31:12 -05:00
Ben Steffensmeier
b81d14f2ea Issue #2920 Fix serialization of DrawStringEvent. 
Former-commit-id: d09b87736a [formerly 0abf71f719] [formerly d09b87736a [formerly 0abf71f719] [formerly d43e5abf29 [formerly d88bdcccb805896e32766373bc07185364741d4e]]]
Former-commit-id: d43e5abf29
Former-commit-id: 41e508b0da [formerly 6327c3a673]
Former-commit-id: 4e33194b36
 2014-04-09 09:21:45 -05:00
Nate Jensen
83917ecb21 Merge "Issue #2785 - Change connection order of events Fixed classpath Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb" into development 
Former-commit-id: 44f93acd4d [formerly 847481950c] [formerly 44f93acd4d [formerly 847481950c] [formerly ea3a8e29c3 [formerly 2f4d6ca7b78e40d11a3dbfd66969681ddd2135fd]]]
Former-commit-id: ea3a8e29c3
Former-commit-id: 7a9f211997 [formerly e99ad67ada]
Former-commit-id: f487346af7
 2014-04-09 08:50:45 -05:00
Ben Steffensmeier
80476e1f60 Issue #2950 Support dynamic color counts for color map editing. 
Former-commit-id: 9d7504e2c3 [formerly c5a48642eb] [formerly 9d7504e2c3 [formerly c5a48642eb] [formerly c805a5fed7 [formerly 85528bf2bbdbbaacc9631b76ef710e9fd0210110]]]
Former-commit-id: c805a5fed7
Former-commit-id: cf3456c6cd [formerly 16446101a4]
Former-commit-id: e0ff68736e
 2014-04-08 15:27:57 -05:00
Ben Steffensmeier
ac3489121d Issue #2950 Add option to interpolate image colors. 
Former-commit-id: c2e028f178 [formerly bd3ad2a477] [formerly c2e028f178 [formerly bd3ad2a477] [formerly 525cf4053f [formerly 5bb0c1e3cc65fc86b48565603f2f78a4ad1e1be7]]]
Former-commit-id: 525cf4053f
Former-commit-id: de4386e102 [formerly 9481062a43]
Former-commit-id: 96ad01ec91
 2014-04-08 15:19:00 -05:00
Nate Jensen
7d8ea4b1cb Merge "Issue #2920 Allow strings to use mulitple styles." into development 
Former-commit-id: b793ce20bc [formerly 811364eb73] [formerly b793ce20bc [formerly 811364eb73] [formerly 3fff4e77d4 [formerly 1b07e87178947df4d579dbc32057e883b61a7de2]]]
Former-commit-id: 3fff4e77d4
Former-commit-id: 41a7098166 [formerly 2fdac5fec2]
Former-commit-id: a87b131d94
 2014-04-08 14:28:44 -05:00
Mike Duff
2b520fe31e Issue #2785 - Change connection order of events 
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb

Former-commit-id: bdde561f8a [formerly efefe62e0f] [formerly bdde561f8a [formerly efefe62e0f] [formerly 7da1547c22 [formerly a2d595f4232e86606f7e2338ece59961649080a3]]]
Former-commit-id: 7da1547c22
Former-commit-id: 2b67272b60 [formerly 7145820d62]
Former-commit-id: 3c6c0824ce
 2014-04-08 14:14:20 -05:00
Nate Jensen
65e26b4418 Issue #2968 improve efficiency by only compressing/serializing persisted 
objects once

Change-Id: Iba90717d049571b801254852a7fd5a73202701f2

Former-commit-id: 579584c346 [formerly e3df98635a] [formerly 579584c346 [formerly e3df98635a] [formerly aaf2d3c8a4 [formerly a35a103be0818ec80c7e2d98a74782b8278b4383]]]
Former-commit-id: aaf2d3c8a4
Former-commit-id: 45ccb7d7fe [formerly 8cb284d2c2]
Former-commit-id: 773dad337d
 2014-04-08 12:59:16 -05:00
Brian.Dyke
c99b4f3027 Merge branch 'master_14.2.1' into master_14.2.2 
Former-commit-id: 529059851a [formerly 20fef0f15b] [formerly 529059851a [formerly 20fef0f15b] [formerly 79c7ec7ae9 [formerly 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35]]]
Former-commit-id: 79c7ec7ae9
Former-commit-id: 20c27a479d [formerly 538b02e42b]
Former-commit-id: c58835a7e3
 2014-04-08 13:05:12 -04:00
Nate Jensen
00a0ffd1b1 Merge "Issue #2968 fix buffer thread safety issues" into development 
Former-commit-id: ccb6c8fc2c [formerly e3e5a25484] [formerly ccb6c8fc2c [formerly e3e5a25484] [formerly a03ca229e7 [formerly 30eee9a48d797c2e6cd509fd878b1b2ee759c105]]]
Former-commit-id: a03ca229e7
Former-commit-id: f16f51aa12 [formerly ac7f0b69a4]
Former-commit-id: 46f7341c14
 2014-04-08 09:46:11 -05:00
Nate Jensen
a2d09fd948 Issue #2968 fix buffer thread safety issues 
Change-Id: I8c8cbf69ea9821ce82fc72b98cf17b0b5f1a93c2

Former-commit-id: 5c775618e3 [formerly e11a5c4559] [formerly 5c775618e3 [formerly e11a5c4559] [formerly f2b18b76f2 [formerly edc629d4b63f2a873752a232ee8f6530ec314595]]]
Former-commit-id: f2b18b76f2
Former-commit-id: f5d594bddc [formerly ae9c53fd05]
Former-commit-id: e936e5cac3
 2014-04-07 17:30:27 -05:00
Mike Duff
43bd945f3f Issue #2860 - Implement the redbook upper air model graphics and cpc charts for NDM 
Change-Id: If01865b85f7ed18edea63757426cb76e44587b0e

Former-commit-id: 09802cfde2 [formerly 692d8841d1] [formerly 09802cfde2 [formerly 692d8841d1] [formerly 418c80640e [formerly 4ae763f1f1865d7c16eefb8d3647e3f94c5c1c22]]]
Former-commit-id: 418c80640e
Former-commit-id: 7bb7f3c4eb [formerly 80bb9e41f5]
Former-commit-id: cd81b821b3
 2014-04-07 16:17:28 -05:00
Nate Jensen
d30cf9f381 Issue #2959 fix watches/warnings handling of color change 
Change-Id: Ic8d510e6cce1949d784cd480e58cf4347527b79e

Former-commit-id: 300c26820f [formerly 5a1877d8a3] [formerly 300c26820f [formerly 5a1877d8a3] [formerly e4c52e83e2 [formerly fd9234aa70a7712101de73c892fd92f329e533e7]]]
Former-commit-id: e4c52e83e2
Former-commit-id: 3167c3bd96 [formerly 5cb4f195f9]
Former-commit-id: 224b711195
 2014-04-07 13:31:58 -05:00
Ben Steffensmeier
0ab850c00f Issue #2920 Allow strings to use mulitple styles. 
Former-commit-id: ddc97933b8 [formerly 32016d5401] [formerly ddc97933b8 [formerly 32016d5401] [formerly bb205cdef9 [formerly ba3638effd48445bd00b8ef5e3771f05910c2af1]]]
Former-commit-id: bb205cdef9
Former-commit-id: 963901f6b1 [formerly 5b55eb6e39]
Former-commit-id: 5b23b2f5b0
 2014-04-04 16:16:06 -05:00