Skip to content

Commit

Permalink
Rely on Images for dependencies (#203)
Browse files Browse the repository at this point in the history
Closes #199
Closes #200
Closes #201
  • Loading branch information
timholy authored Dec 30, 2019
1 parent a559b84 commit 440267a
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 22 deletions.
10 changes: 1 addition & 9 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
name = "ImageView"
uuid = "86fae568-95e7-573e-a6b2-d8a6b900c9ef"
version = "0.10.2"
version = "0.10.3"

[deps]
AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
ColorVectorSpace = "c3611d14-8923-5661-9e6a-0046d554d3a4"
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
Graphics = "a2bd30eb-e257-5431-a919-1863eab51364"
Gtk = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
GtkReactive = "27996c0f-39cd-5cc1-a27a-05f136f946b6"
Expand All @@ -20,10 +16,6 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
[compat]
AxisArrays = "0.3"
Cairo = "0.6, 0.7, 0.8, 1"
ColorVectorSpace = "0.6, 0.7, 0.8"
Colors = "0.9"
FileIO = "1"
FixedPointNumbers = "0.6.1"
Graphics = "0.2, 0.3, 0.4, 1"
Gtk = "0.16, 0.17, 0.18, 1"
GtkReactive = "0.5.1, 0.6, 0.7, 1"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ to see some of the options. We can use these extra arguments to couple
the zoom and slice regions between two images. Let's make a "fake" image encoding the segmentation of an image:

```julia
using ImageView, GtkReactive, TestImages, Colors
using ImageView, GtkReactive, TestImages, Images

# Prepare the data
mri = testimage("mri")
Expand Down Expand Up @@ -214,7 +214,7 @@ like `50μm`.
The remaining examples are for fixed annotations. Here is a demonstration:

```julia
using Images, Colors, ImageView
using Images, ImageView
z = ones(10,50);
y = 8; x = 2;
z[y,x] = 0
Expand Down
4 changes: 2 additions & 2 deletions src/ImageView.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module ImageView

using FixedPointNumbers, Colors, ColorVectorSpace, Images, StatsBase
using Images, StatsBase
using MappedArrays, RoundingIntegers
using Gtk.ShortNames, GtkReactive, Graphics
using Gtk.ShortNames, GtkReactive, Graphics, Cairo
using Gtk.GConstants.GtkAlign: GTK_ALIGN_START, GTK_ALIGN_END, GTK_ALIGN_FILL
import AxisArrays
using AxisArrays: Axis, axisnames, axisvalues
Expand Down
2 changes: 0 additions & 2 deletions src/annotations.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# Once this stabilizes, migrate to a Graphics layer? Only if that supports text, which seems unlikely.
using Colors
using Graphics, Cairo

function annotate!(guidict::Dict, ann; anchored::Bool=true)
c, zr = guidict["gui"]["canvas"], guidict["roi"]["zoomregion"]
Expand Down
2 changes: 1 addition & 1 deletion test/annotations.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Images, Colors, ImageView, TestImages
using Images, ImageView, TestImages

z = ones(10,50);
y = 8; x = 2;
Expand Down
4 changes: 2 additions & 2 deletions test/cone.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

module ConeModule

using FixedPointNumbers, Colors, ImageCore, Cairo, Reactive, ImageView
using ImageCore, Cairo, Reactive, ImageView
using Base: tail

export Cone
Expand Down Expand Up @@ -74,7 +74,7 @@ filtervec(::Tuple{}, ::Tuple{}) = ()

end

using Colors, FixedPointNumbers, GtkReactive, ImageView
using ImageCore, GtkReactive, ImageView

## Create an object and visualize it
c = ConeModule.Cone((201, 301, 31), rand(RGB{N0f8}, 60))
Expand Down
2 changes: 1 addition & 1 deletion test/contrast.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using ImageView, FixedPointNumbers, Reactive, Colors
using ImageView, ImageCore, Reactive
using Test

@testset "contrast GUI" begin
Expand Down
2 changes: 1 addition & 1 deletion test/newtests.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using ImageView, TestImages, Colors, FixedPointNumbers, ImageCore, Reactive,
using ImageView, TestImages, ImageCore, Reactive,
GtkReactive, Gtk, IntervalSets
using Test
import AxisArrays
Expand Down
1 change: 0 additions & 1 deletion test/test4d.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Images, AxisArrays
using AxisArrays: Axis
using Colors

# Create a cone in 3d that changes color over time
sz = [201, 301, 31]
Expand Down
2 changes: 1 addition & 1 deletion test/tile.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ImageView
using Colors, Gtk.ShortNames
using Images, Gtk.ShortNames
using TestImages

grid, frames, c = ImageView.canvasgrid((2,2))
Expand Down

2 comments on commit 440267a

@timholy
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/7338

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v0.10.3 -m "<description of version>" 440267a8aa5f0adf8e435cebab3b1a20e4ce7fea
git push origin v0.10.3

Please sign in to comment.