Merge pull request #840 from JuliaRobotics/bugfix/22Q1/graphplot

Update graph plot to GraphsDFG

Author: Affie

Project.toml

@@ -30,6 +30,7 @@ Colors = "0.8, 0.9, 0.10, 0.11, 0.12"
 Distributions = "0.18, 0.19, 0.20, 0.21, 0.22, 0.23, 0.24, 0.25, 1"
 DocStringExtensions = "0.8, 0.9, 0.10, 1"
 Graphs = "1.4"
+GraphPlot = "0.5.0"
 JSON = "0.21"
 JSON2 = "0.3.1"
 LightGraphs = "1.2, 1.3"

src/DFGPlots/DFGPlots.jl

@@ -48,7 +48,7 @@ draw(PDF("/tmp/graph.pdf", 16cm, 16cm), dfgplot(fg))
 
 More information at [GraphPlot.jl](https://github.com/JuliaGraphs/GraphPlot.jl)
 """
-function dfgplot(dfg::LightDFG, p::DFGPlotProps = DFGPlotProps())
+function dfgplot(dfg::GraphsDFG, p::DFGPlotProps = DFGPlotProps())
 
     nodetypes = [haskey(dfg.g.variables, s) for s in dfg.g.labels]
 
@@ -68,16 +68,15 @@ end
 
 function dfgplot(dfg::AbstractDFG, p::DFGPlotProps = DFGPlotProps())
     # TODO implement convert functions
-    ldfg = LightDFG{NoSolverParams}()
+    ldfg = GraphsDFG{NoSolverParams}()
     copyGraph!(ldfg, dfg, listVariables(dfg), listFactors(dfg), copyGraphMetadata=false)
     dfgplot(ldfg, p)
 end
 
-function gplot(dfg::LightDFG; keyargs...)
+function gplot(dfg::GraphsDFG; keyargs...)
     gplot(dfg.g; keyargs...)
 end
 
-
 #TODO decide if we want to overload show for display in juno, It's a bit annoying with development
 # function Base.show(io::IO, ::MIME"application/prs.juno.plotpane+html", dfg::AbstractDFG)
 function dfgplot(io::IO, ::MIME"application/prs.juno.plotpane+html", dfg::AbstractDFG)

test/runtests.jl

@@ -59,11 +59,8 @@ for api in apis
 end
 
 # Test special cases
-@error("Disabled plottingTest.jl")
-if false
-  @testset "Plotting Tests" begin
+ @testset "Plotting Tests" begin
     include("plottingTest.jl")
-  end
 end
 
 @testset "Data Store Tests" begin