Skip to content

Commit ac95318

Browse files
committed
Update graph plot to GraphsDFG
1 parent 229913c commit ac95318

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/DFGPlots/DFGPlots.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ draw(PDF("/tmp/graph.pdf", 16cm, 16cm), dfgplot(fg))
4848
4949
More information at [GraphPlot.jl](https://github.com/JuliaGraphs/GraphPlot.jl)
5050
"""
51-
function dfgplot(dfg::LightDFG, p::DFGPlotProps = DFGPlotProps())
51+
function dfgplot(dfg::GraphsDFG, p::DFGPlotProps = DFGPlotProps())
5252

5353
nodetypes = [haskey(dfg.g.variables, s) for s in dfg.g.labels]
5454

@@ -68,16 +68,15 @@ end
6868

6969
function dfgplot(dfg::AbstractDFG, p::DFGPlotProps = DFGPlotProps())
7070
# TODO implement convert functions
71-
ldfg = LightDFG{NoSolverParams}()
71+
ldfg = GraphsDFG{NoSolverParams}()
7272
copyGraph!(ldfg, dfg, listVariables(dfg), listFactors(dfg), copyGraphMetadata=false)
7373
dfgplot(ldfg, p)
7474
end
7575

76-
function gplot(dfg::LightDFG; keyargs...)
76+
function gplot(dfg::GraphsDFG; keyargs...)
7777
gplot(dfg.g; keyargs...)
7878
end
7979

80-
8180
#TODO decide if we want to overload show for display in juno, It's a bit annoying with development
8281
# function Base.show(io::IO, ::MIME"application/prs.juno.plotpane+html", dfg::AbstractDFG)
8382
function dfgplot(io::IO, ::MIME"application/prs.juno.plotpane+html", dfg::AbstractDFG)

test/runtests.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,8 @@ for api in apis
5959
end
6060

6161
# Test special cases
62-
@error("Disabled plottingTest.jl")
63-
if false
64-
@testset "Plotting Tests" begin
62+
@testset "Plotting Tests" begin
6563
include("plottingTest.jl")
66-
end
6764
end
6865

6966
@testset "Data Store Tests" begin

0 commit comments

Comments
 (0)