Skip to content

Commit 4e0814c

Browse files
authored
Merge pull request #5 from SimonDanisch/sd-noabstractplotting
use AbstractPlotting via Requires
2 parents c3fbb3c + e30ddd8 commit 4e0814c

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

Project.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ authors = ["SimonDanisch <[email protected]>"]
44
version = "0.1.0"
55

66
[deps]
7-
AbstractPlotting = "537997a7-5e4e-5d89-9595-2241ea00577e"
87
GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
9-
8+
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
109
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
1110
StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
1211
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
1312

1413
[extras]
15-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1614
Query = "1a8c2f83-1ff3-5112-b086-8aa67b057ba1"
15+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1716

1817
[targets]
1918
test = ["Test", "Query"]

src/GeometryBasics.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module GeometryBasics
22

33
using StaticArrays, Tables, StructArrays
4+
using Requires
45

56
using Base: @propagate_inbounds
67

@@ -10,7 +11,10 @@ using .FixedSizeArrays
1011
include("basic_types.jl")
1112
include("metadata.jl")
1213
include("viewtypes.jl")
13-
include("abstractplotting.jl")
1414

1515

16+
function __init__()
17+
@require AbstractPlotting = "537997a7-5e4e-5d89-9595-2241ea00577e" include("abstractplotting.jl")
18+
end
19+
1620
end # module

src/abstractplotting.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using AbstractPlotting
2-
import GeometryTypes
1+
import AbstractPlotting
2+
import AbstractPlotting.GeometryTypes
33

44
function to_triangle(triangles, tetra)
55
push!(triangles, GeometryTypes.GLTriangle(tetra[1], tetra[2], tetra[3]))

src/metadata.jl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,6 @@ meta(x::T) where T = error("$T has no meta!")
5858
metafree(x::T) where T = x
5959

6060

61-
"""
62-
meta(x::MetaObject; meta_data...)
63-
Attaches metadata to `x`
64-
"""
65-
meta(x::T; kw_args...) where T = error("$T has no meta!")
66-
67-
6861
macro meta_type(name, mainfield, supertype, params...)
6962
MetaName = Symbol("$(name)Meta")
7063
field = QuoteNode(mainfield)

0 commit comments

Comments
 (0)