Fix secondary color (#518)

* Fix secondary color

* remove placeholder

Author: CMGreenspon

README.md

@@ -277,7 +277,7 @@ end
 
 errorline(1:10, y[:,:,1], errorstyle=:ribbon, label="Ribbon")
 errorline!(1:10, y[:,:,2], errorstyle=:stick, label="Stick", secondarycolor=:matched)
-errorline!(1:10, y[:,:,3], errorstyle=:spaghetti, label="Spaghetti")
+errorline!(1:10, y[:,:,3], errorstyle=:plume, label="Plume")
 ```
 
 <img width="575" alt="ErrorLine Styles" src="https://user-images.githubusercontent.com/24966610/186655231-2b7b9e37-0beb-4796-ad08-cbb84020ffd8.svg">

src/errorline.jl

@@ -117,21 +117,26 @@ end
         end
     end
 
+    # Determine if a color palette is being used so it can be passed to secondary lines
+    if :color_palette ∉ keys(plotattributes)
+        color_palette = :default
+    else
+        color_palette = plotattributes[:color_palette]
+    end
+
     # Parse different color type
     if groupcolor isa Symbol || groupcolor isa RGB{Float64} || groupcolor isa RGBA{Float64}
         groupcolor = [groupcolor]
     end
+
     # Check groupcolor format
     if (groupcolor !== nothing && ndims(y) > 2) && length(groupcolor) == 1
         groupcolor = repeat(groupcolor, size(y,3)) # Use the same color for all groups
     elseif (groupcolor !== nothing && ndims(y) > 2) && length(groupcolor) < size(y,3)
         error("$(length(groupcolor)) colors given for a matrix with $(size(y,3)) groups")
-    end
-    # Determine if a color palette is being used so it can be passed to secondary lines
-    if :color_palette ∉ keys(plotattributes)
-        color_palette = :default
-    else
-        color_palette = plotattributes[:color_palette]
+    elseif groupcolor === nothing
+        group_series_index = length(plotattributes[:plot_object]) + 1
+        groupcolor = palette(color_palette)[group_series_index:group_series_index+size(y,3)]
     end
 
     if errorstyle == :plume && numsecondarylines > size(y,2) # Override numsecondarylines
@@ -141,17 +146,16 @@ end
     for g = axes(y,3) # Iterate through 3rd dimension
         # Compute center and distribution for each value of x
         y_central, y_error = compute_error(y[:,:,g], centertype, errortype, percentiles)
+
         if errorstyle == :ribbon
             seriestype := :path
             @series begin
                 x := x
                 y := y_central
                 ribbon := y_error
                 fillalpha --> .1
-                if groupcolor !== nothing
-                    linecolor := groupcolor[g]
-                    fillcolor := groupcolor[g]
-                end
+                linecolor := groupcolor[g]
+                fillcolor := groupcolor[g]
                 () # Supress implicit return
             end
 
@@ -172,11 +176,7 @@ end
                     if secondarycolor === nothing
                         linecolor := :gray60
                     elseif secondarycolor == :matched
-                        if groupcolor !== nothing
-                            linecolor := groupcolor[g]
-                        else
-                            linecolor := palette(color_palette)[plotattributes[:plot_object][1][end][:series_index]+1]
-                        end
+                        linecolor := groupcolor[g]
                     else
                         linecolor := secondarycolor
                     end
@@ -191,9 +191,7 @@ end
                 primary := true
                 x := x
                 y := y_central
-                if groupcolor !== nothing
-                    linecolor := groupcolor[g]
-                end
+                linecolor := groupcolor[g]
                 ()
             end
 
@@ -213,9 +211,7 @@ end
                     x := x
                     y := y_sub_sample[:,i]
                     # Set the stick color
-                    if groupcolor === nothing && (secondarycolor === nothing || secondarycolor == :matched)
-                        linecolor := palette(color_palette)[plotattributes[:plot_object][1][end][:series_index]+1]
-                    elseif groupcolor !== nothing && (secondarycolor == :matched ||  secondarycolor === nothing)
+                    if secondarycolor === nothing || secondarycolor == :matched
                         linecolor := groupcolor[g]
                     else
                         linecolor := secondarycolor
@@ -227,14 +223,12 @@ end
             end
 
             # Base line
-            seriestype := :line
+            seriestype := :path
             @series begin
                 primary := true
                 x := x
                 y := y_central
-                if groupcolor !== nothing
-                    linecolor := groupcolor[g]
-                end
+                linecolor := groupcolor[g]
                 linewidth --> 3 # Make it stand out against the plume better
                 ()
             end