Skip to content

Commit 5ff65a2

Browse files
committed
Remove all refs to AbstractPlotting
1 parent 40e6ff1 commit 5ff65a2

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

docs/src/api/visualize.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ CurrentModule = Flux3D
1212
```julia
1313
julia> using Flux3D, Makie
1414

15-
julia> Makie.AbstractPlotting.set_theme!(show_axis = false, scale=false)
15+
julia> Makie.set_theme!(show_axis = false, scale=false)
1616

1717
julia> m = load_trimesh("teapot.obj")
1818
TriMesh{Float32, UInt32, Array} Structure:

docs/src/tutorials/dgcnn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ using Flux: onehotbatch, onecold, onehot, crossentropy
1212
using Statistics: mean
1313
using Base.Iterators: partition
1414

15-
Makie.AbstractPlotting.inline!(false)
16-
Makie.AbstractPlotting.set_theme!(show_axis = false)
15+
Makie.inline!(false)
16+
Makie.set_theme!(show_axis = false)
1717
```
1818

1919
## Defining arguments for use in training.

docs/src/tutorials/fit_mesh.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ and target shape.
2020
using Flux3D, Zygote, Flux, FileIO, Statistics, Plots
2121
using AbstractPlotting, GLMakie
2222

23-
Flux3D.AbstractPlotting.inline!(true)
24-
Flux3D.AbstractPlotting.set_theme!(show_axis = false)
23+
Flux3D.Makie.inline!(true)
24+
Flux3D.Makie.set_theme!(show_axis = false)
2525
```
2626

2727
## Downloading obj file of sphere and dolphin
@@ -65,7 +65,7 @@ We will use `visualize` function for visualizing TriMesh. This function uses
6565
function, which makes this function handy dealing with different 3D format.
6666

6767
```julia
68-
Flux3D.AbstractPlotting.vbox(visualize(src), visualize(tgt))
68+
Flux3D.Makie.vbox(visualize(src), visualize(tgt))
6969
```
7070

7171
```@raw html
@@ -162,7 +162,7 @@ Flux3D provide IO function `save_trimesh` to save TriMesh
162162
```julia
163163
save_trimesh("results/final_mesh.off", final_mesh)
164164
save("results/final_mesh.png", visualize(final_mesh))
165-
Flux3D.AbstractPlotting.vbox(visualize(final_mesh), visualize(dolphin))
165+
Flux3D.Makie.vbox(visualize(final_mesh), visualize(dolphin))
166166
```
167167

168168
```@raw html

docs/src/tutorials/pointnet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ using Flux: onehotbatch, onecold, onehot, crossentropy
1212
using Statistics: mean
1313
using Base.Iterators: partition
1414

15-
Makie.AbstractPlotting.inline!(false)
16-
Makie.AbstractPlotting.set_theme!(show_axis = false)
15+
Makie.inline!(false)
16+
Makie.set_theme!(show_axis = false)
1717
```
1818

1919
## Defining arguments for use in training.

examples/dgcnn_classification.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ using Flux: onehotbatch, onecold, onehot, crossentropy
1111
using Statistics: mean
1212
using Base.Iterators: partition
1313

14-
Makie.AbstractPlotting.inline!(false)
15-
Makie.AbstractPlotting.set_theme!(show_axis = false)
14+
Makie.inline!(false)
15+
Makie.set_theme!(show_axis = false)
1616

1717
# ## Defining arguments for use in training.
1818
# * batch_size - batch size of of training data to be passed while training.

examples/fit_mesh.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
using Flux3D, Zygote, Flux, FileIO, Statistics, Plots
2020
using Makie
2121

22-
Makie.AbstractPlotting.inline!(true)
23-
Makie.AbstractPlotting.set_theme!(show_axis = false)
22+
Makie.inline!(true)
23+
Makie.set_theme!(show_axis = false)
2424

2525
# ## Downloading obj file of sphere and dolphin
2626

@@ -57,7 +57,7 @@ tgt._verts_packed = verts
5757
# **Makie** for plotting. In fact, we can also visualize PointCloud using this
5858
# function, which makes this function handy dealing with different 3D format.
5959

60-
Flux3D.AbstractPlotting.vbox(visualize(src), visualize(tgt))
60+
Flux3D.Makie.vbox(visualize(src), visualize(tgt))
6161

6262
# ```@raw html
6363
# <p align="center">
@@ -140,7 +140,7 @@ final_mesh = Flux3D.scale!(final_mesh, scale)
140140

141141
save_trimesh("results/final_mesh.off", final_mesh)
142142
save("results/final_mesh.png", visualize(final_mesh))
143-
Flux3D.AbstractPlotting.vbox(visualize(final_mesh), visualize(dolphin))
143+
Flux3D.Makie.vbox(visualize(final_mesh), visualize(dolphin))
144144

145145
# ```@raw html
146146
# <p align="center">

examples/pointnet_classification.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
# !!!note
55
# For visualization purpose we will require to install Makie and
66
# compatible backend (GLMakie or WGLMakie). To install it simply run
7-
# `] add AbstractPlotting GLMakie` in the julia prompt.
7+
# `] add Makie GLMakie` in the julia prompt.
88

99
using Flux3D, Flux, Makie, CUDA
1010
using Flux: onehotbatch, onecold, onehot, crossentropy
1111
using Statistics: mean
1212
using Base.Iterators: partition
1313

14-
Makie.AbstractPlotting.inline!(false)
15-
Makie.AbstractPlotting.set_theme!(show_axis = false)
14+
Makie.inline!(false)
15+
Makie.set_theme!(show_axis = false)
1616

1717
# ## Defining arguments for use in training.
1818
# * batch_size - batch size of of training data to be passed while training.

test/conversions.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ end
4343
# to cross check the dimension and figure of different conversion.
4444

4545
# using Makie
46-
# Makie.AbstractPlotting.inline!(true)
47-
# Makie.AbstractPlotting.set_theme!(show_axis = true)
46+
# Makie.inline!(true)
47+
# Makie.set_theme!(show_axis = true)
4848
#
4949
# _voxels = zeros(Float32,32,32,32,2)
5050
# _voxels[1:15,2:10,18:32,:] .= 1

0 commit comments

Comments
 (0)