@@ -415,7 +415,7 @@ function scatter(D::Vector{<:GMTdataset{Float64,2}}; first=true, kw...)
415415 Dc = mat2ds (gmt_centroid_area (G_API[], D, Int (isgeog (D)), ca= 2 ), geom= wkbPoint, text= labels)
416416 (is_in_dict (d, [:marker , :Marker , :shape ]) === nothing ) && (d[:marker ] = " circ" )
417417 (is_in_dict (d, [:ms :markersize :MarkerSize :size ]) === nothing ) && (d[:ms ] = " 12p" )
418- _common_plot_xyz (" " , Dc, " bubble" , ! first, true , false , d)
418+ common_plot_xyz (" " , Dc, " bubble" , ! first, false , d)
419419end
420420
421421# ------------------------------------------------------------------------------------------------------
@@ -1135,11 +1135,7 @@ function helper_vecBug(d, arg1, first::Bool, haveR::Bool, haveVarFill::Bool, typ
11351135 end
11361136
11371137 function rθ2uv (arg1) # Convert to u,v
1138- if (eltype (arg1) <: Integer )
1139- arg1 = convert (Array{Float64}, arg1)
1140- else
1141- arg1 = deepcopy (arg1) # We don't want to modify the original
1142- end
1138+ arg1 = convert (Array{Float64}, arg1) # We don't want to modify the original and need it Float64 anyway
11431139 for k = 1 : size (arg1,1 )
11441140 s, c = sincosd (arg1[k,3 ])
11451141 arg1[k,3 ] = arg1[k,4 ] * c
@@ -2055,13 +2051,13 @@ function piechart(x::VecOrMat; first::Bool=true, kw...)
20552051 one_not_exploded ? (Dv = ds2ds (mat2ds (data), fill= fill[non_exploded])) : (d[:ms ] = 0 )
20562052
20572053 # ------------ If no lables wanted we just plot the wedges and return
2058- (labelstyle == " none" ) && return _common_plot_xyz (" " , Dv, " plot" , ! first, true , false , d)
2054+ (labelstyle == " none" ) && return common_plot_xyz (" " , Dv, " plot" , ! first, false , d)
20592055
20602056 fs = font (d, [:font ]) # See if we have a font (size & others) specification
20612057 fs = (fs != " " ) ? fs : string (round (ms / (2.54 / 72 ) / 30 , digits= 1 )) # Use a font size that is ~30 smaler than pie diameter
20622058
20632059 do_show = ((val = find_in_dict (d, [:show ])[1 ]) != = nothing && val != 0 )
2064- one_not_exploded ? _common_plot_xyz (" " , Dv, " plot" , ! first, true , false , d) : _common_plot_xyz (" " , [0 0 0 0 ], " plot" , ! first, true , false , d)
2060+ one_not_exploded ? common_plot_xyz (" " , Dv, " plot" , ! first, false , d) : common_plot_xyz (" " , [0 0 0 0 ], " plot" , ! first, false , d)
20652061
20662062 # Compute the h-v scales
20672063 sc_x = (CTRL. limits[2 ]- CTRL. limits[1 ]) / CTRL. figsize[1 ]
@@ -2076,7 +2072,7 @@ function piechart(x::VecOrMat; first::Bool=true, kw...)
20762072 end
20772073 Dv = ds2ds (mat2ds (data_explode), fill= fill[explode])
20782074 d[:marker ], d[:ms ] = " wedge" , ms- explode_off/ 2
2079- _common_plot_xyz (" " , Dv, " plot" , true , true , false , d)
2075+ common_plot_xyz (" " , Dv, " plot" , true , false , d)
20802076 end
20812077
20822078 # Get the text positions
0 commit comments