Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed Javis Live Viewer from Core Javis #298

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ version = "0.3.3"
Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"
Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
FFMPEG = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
Gtk = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
GtkReactive = "27996c0f-39cd-5cc1-a27a-05f136f946b6"
Hungarian = "e91730f6-4275-51fb-a7a0-7064cfbd3b39"
Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
Expand All @@ -23,8 +21,6 @@ VideoIO = "d6d074c3-1acf-5d4c-9a43-ef38773959a2"
Animations = "0.4"
Cairo = "1"
FFMPEG = "0.3, 0.4"
Gtk = "1.1"
GtkReactive = "1.0.3"
Hungarian = "0.6"
Images = "0.20, 0.21, 0.22, 0.23"
LaTeXStrings = "1.1"
Expand Down
11 changes: 0 additions & 11 deletions src/Javis.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ module Javis
using Animations
import Cairo: CairoImageSurface, image
using FFMPEG
using Gtk
using GtkReactive
using Hungarian
using Images
using LaTeXStrings
Expand Down Expand Up @@ -96,7 +94,6 @@ include("backgrounds.jl")
include("svg2luxor.jl")
include("morphs.jl")
include("action_animations.jl")
include("javis_viewer.jl")
include("latex.jl")
include("object_values.jl")

Expand Down Expand Up @@ -163,7 +160,6 @@ end
framerate=30,
pathname="javis_GIBBERISH.gif",
tempdirectory="",
liveview=false,
ffmpeg_loglevel="panic"
)

Expand All @@ -178,7 +174,6 @@ Renders all previously defined [`Object`](@ref) drawings to the user-defined `Vi
- **Default:** The animation is rendered as a gif with the `javis_` prefix and some gibberish afterwards
- `tempdirectory::String`: The folder where each frame is stored
Defaults to a temporary directory when not set
- `liveview::Bool`: Causes a live image viewer to appear to assist with animation development
- `ffmpeg_loglevel::String`:
- Can be used if there are errors with ffmpeg. Defaults to panic:
All other options are described here: https://ffmpeg.org/ffmpeg.html
Expand All @@ -187,18 +182,12 @@ function render(
video::Video;
framerate = 30,
pathname = "javis_$(randstring(7)).gif",
liveview = false,
tempdirectory = "",
ffmpeg_loglevel = "panic",
)
objects = video.objects
frames = preprocess_frames!(objects)

if liveview == true
_javis_viewer(video, length(frames), objects)
return "Live preview started."
end

path, ext = "", ""
if !isempty(pathname)
path, ext = splitext(pathname)
Expand Down
2 changes: 0 additions & 2 deletions test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[deps]
Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"
Gtk = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
GtkReactive = "27996c0f-39cd-5cc1-a27a-05f136f946b6"
ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
Expand Down
5 changes: 0 additions & 5 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Animations
using GtkReactive
using Gtk: get_gtk_property, visible
using Images
using Javis
import Latexify: latexify
Expand Down Expand Up @@ -44,6 +42,3 @@ end
@testset "Morphing" begin
include("morphing.jl")
end
@testset "Javis Viewer" begin
include("viewer.jl")
end