diff options
| author | Oleg Yakovenko <[email protected]> | 2021-03-02 16:45:44 +0200 |
|---|---|---|
| committer | Oleg Yakovenko <[email protected]> | 2021-03-02 16:45:44 +0200 |
| commit | 9c733720e045ed4bb711053277e0ea817e83332b (patch) | |
| tree | 5bd93bd5a9533c0633cd3b3cda95a09226021c6f /lib/axlsx/drawing/scatter_series.rb | |
| parent | 61ad9973af22dab37b86d4f3a55ba4eef42b043e (diff) | |
| download | caxlsx-9c733720e045ed4bb711053277e0ea817e83332b.tar.gz caxlsx-9c733720e045ed4bb711053277e0ea817e83332b.zip | |
feature: respect marker preferences without color specification
Diffstat (limited to 'lib/axlsx/drawing/scatter_series.rb')
| -rw-r--r-- | lib/axlsx/drawing/scatter_series.rb | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/lib/axlsx/drawing/scatter_series.rb b/lib/axlsx/drawing/scatter_series.rb index b62fc006..f60f44fd 100644 --- a/lib/axlsx/drawing/scatter_series.rb +++ b/lib/axlsx/drawing/scatter_series.rb @@ -97,15 +97,12 @@ module Axlsx str << '<a:ln><a:solidFill>' str << ('<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>') str << '</c:spPr>' - - if !@show_marker - str << '<c:marker><c:symbol val="none"/></c:marker>' - elsif @marker_symbol != :default - str << '<c:marker><c:symbol val="' + @marker_symbol.to_s + '"/></c:marker>' - end - + str << marker_xml str << '</c:marker>' + else + str << "<c:marker>#{marker_xml}</c:marker>" end + if ln_width str << '<c:spPr>' str << '<a:ln w="' << ln_width.to_s << '"/>' @@ -117,5 +114,15 @@ module Axlsx end str end + + private + + def marker_xml + if !@show_marker + '<c:symbol val="none"/>' + elsif @marker_symbol != :default + '<c:symbol val="' + @marker_symbol.to_s + '"/>' + end + end end end |
