Revert "bug fix"

Remove commits that are in separate PRs
This reverts commit d4a2ae4ba42a701ebe49865d2addf212c54f7bd7.

Author: hdavid16

README.md

@@ -196,7 +196,6 @@ gplot(h)
 + `arrowangleoffset` Angular width in radians for the arrows. Default: `π/9 (20 degrees)`
 + `linetype` Type of line used for edges (:straight, :curve). Default: :straight
 + `outangle` Angular width in radians for the edges (only used if `linetype = "curve`). Default: `π/5 (36 degrees)`
-+ `backgroundc` Color for the plot background. Default: `nothing`
 
 # Reporting Bugs
 

src/plot.jl

@@ -41,11 +41,16 @@ Distances for the node labels from center of nodes. Default: `0.0`
 `nodelabelangleoffset`
 Angle offset for the node labels (only used when `nodelabeldist` is not zero). Default: `π/4.0`
 
+<<<<<<< HEAD
 `max_nodelabelsize`
 Largest fontsize for the vertex labels. Default: `4.0`
+=======
+`NODELABELSIZE`
+Largest fontsize for the vertice labels. Default: `4.0`
+>>>>>>> parent of 14d62b4 (Fix #172. set background color (`backgroundc` kwarg):)
 
 `nodelabelsize`
-Relative fontsize for the vertex labels, can be a Vector. Default: `1.0`
+Relative fontsize for the vertice labels, can be a Vector. Default: `1.0`
 
 `nodefillc`
 Color to fill the nodes with, can be a Vector. Default: `colorant"turquoise"`
@@ -94,9 +99,6 @@ Type of line used for edges (:straight, :curve). Default: :straight
 Angular width in radians for the edges (only used if `linetype = "curve`). 
 Default: `π/5 (36 degrees)`
 
-`backgroundc`
-Color for the plot background. Default: `nothing`
-
 """
 function gplot(g::AbstractGraph{T},
     locs_x_in::Vector{R1}, locs_y_in::Vector{R2};
@@ -122,9 +124,14 @@ function gplot(g::AbstractGraph{T},
     nodestrokelw = 0.0,
     arrowlengthfrac = is_directed(g) ? 0.1 : 0.0,
     arrowangleoffset = π / 9,
+<<<<<<< HEAD
     linetype = :straight,
     outangle = π / 5,
     backgroundc = nothing) where {T <:Integer, R1 <: Real, R2 <: Real}
+=======
+    linetype = "straight",
+    outangle = π / 5) where {T <:Integer, R1 <: Real, R2 <: Real}
+>>>>>>> parent of 14d62b4 (Fix #172. set background color (`backgroundc` kwarg):)
 
     @assert length(locs_x_in) == length(locs_y_in) == nv(g) "Position vectors must be of the same length as the number of nodes"
     @assert isnothing(nodelabel) || length(nodelabel) == nv(g) "`nodelabel` must either be `nothing` or a vector of the same length as the number of nodes"
@@ -157,12 +164,25 @@ function gplot(g::AbstractGraph{T},
     end
 
     # Create nodes
+<<<<<<< HEAD
     nodecircle = fill(0.4Compose.w, nv(g)) .* nodesize
+=======
+    nodecircle = fill(0.4Compose.w, length(locs_x))
+    if isa(nodesize, Real)
+        	    for i = 1:length(locs_x)
+            	    	nodecircle[i] *= nodesize
+        	    end
+    	else
+        		for i = 1:length(locs_x)
+            	    	nodecircle[i] *= nodesize[i]
+        	    end
+    	end
+>>>>>>> parent of 14d62b4 (Fix #172. set background color (`backgroundc` kwarg):)
     nodes = circle(locs_x, locs_y, nodecircle)
 
     # Create node labels if provided
     texts = nothing
-    if !isnothing(nodelabel)
+    if nodelabel != nothing
         text_locs_x = deepcopy(locs_x)
         text_locs_y = deepcopy(locs_y)
         texts = text(text_locs_x .+ nodesize .* (nodelabeldist * cos(nodelabelangleoffset)),
@@ -207,10 +227,15 @@ function gplot(g::AbstractGraph{T},
         end
     end
 
+<<<<<<< HEAD
     #build plot
     compose(context(units=UnitBox(-1.2, -1.2, +2.4, +2.4)),
             compose(context(), rectangle(-1.2, -1.2, +2.4, +2.4), fill(backgroundc)),
             compose(context(), texts, fill(nodelabelc), fontsize(nodelabelsize)),
+=======
+    compose(context(units=UnitBox(-1.2, -1.2, +2.4, +2.4)),
+            compose(context(), texts, fill(nodelabelc), stroke(nothing), fontsize(nodelabelsize)),
+>>>>>>> parent of 14d62b4 (Fix #172. set background color (`backgroundc` kwarg):)
             compose(context(), nodes, fill(nodefillc), stroke(nodestrokec), linewidth(nodestrokelw)),
             compose(context(), edgetexts, fill(edgelabelc), fontsize(edgelabelsize)),
             compose(context(), arrows, stroke(edgestrokec), linewidth(edgelinewidth)),