Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f0b5a8b
removed old draw_grid added coordinate_system
Wikunia Sep 18, 2021
c239c15
docstrings
Wikunia Sep 18, 2021
d750e5f
changelog
Wikunia Sep 18, 2021
3ac7b25
format
Wikunia Sep 19, 2021
baa2c56
Merge branch 'master' into wik-feature-grid
Wikunia Sep 19, 2021
2307738
color grid and zerolines
Wikunia Sep 19, 2021
9620019
Merge branch 'master' into wik-feature-grid
Wikunia Sep 19, 2021
e7ffb67
Merge branch 'wik-feature-grid' of https://github.com/Wikunia/Javis.j…
Wikunia Sep 19, 2021
c185e1b
format
Wikunia Sep 19, 2021
9cbfbc1
disappear function
Wikunia Sep 26, 2021
cbf3948
format...
Wikunia Sep 26, 2021
d4c341e
Merge branch 'master' into wik-feature-grid
Wikunia Sep 28, 2021
90f5934
Merge branch 'master' into wik-feature-grid
Wikunia Sep 28, 2021
2c84699
Merge branch 'master' into wik-feature-grid
Wikunia Sep 29, 2021
5e339f3
scale_linear takes coordinate system as input
Wikunia Sep 29, 2021
5701f0a
reorder includes
Wikunia Sep 29, 2021
3ed8964
begin of: create coordinate system from mapping
Wikunia Sep 29, 2021
230f2f3
draw axis in coordinate system depending on the mapping
Wikunia Sep 29, 2021
e2f877b
using scaling with intervals and point calls standard twice
Wikunia Sep 30, 2021
0b89a38
format...
Wikunia Sep 30, 2021
b369149
avoid copy paste in coordinate_system
Wikunia Sep 30, 2021
88f6d93
test cases for grid
Wikunia Oct 6, 2021
b358f2e
format
Wikunia Oct 6, 2021
36c8d45
one more test case with y axis in center but x axis bottom
Wikunia Oct 6, 2021
17346bf
format
Wikunia Oct 6, 2021
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Javis.jl - Changelog

## Unreleased
- `coordinate_system` to draw a cartesian coordinate system

## v0.7.1 (28th of September 2021)
- added `scale_linear` function to easily scale values or points
- added `@scale_layer` to transform a layer based on a given linear scale
Expand Down
31 changes: 18 additions & 13 deletions src/Javis.jl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ include("structs/GFrames.jl")
include("structs/Frames.jl")
include("structs/Scale.jl")

# shorthands declarations
include("shorthands/JLine.jl")
include("shorthands/JCircle.jl")
include("shorthands/JRect.jl")
include("shorthands/JBox.jl")
include("shorthands/JEllipse.jl")
include("shorthands/JStar.jl")
include("shorthands/JPoly.jl")
include("shorthands/JShape.jl")

"""
Transformation

Expand All @@ -52,13 +62,16 @@ Transformation(p, a) = Transformation(p, a, 1.0)
Transformation(p, a, s::Float64) = Transformation(p, a, (s, s))
Transformation(p, a, s::Tuple{Float64,Float64}) = Transformation(p, a, Scale(s...))

include("structs/Interval.jl")
include("structs/ObjectSetting.jl")
include("structs/Object.jl")
include("structs/Transitions.jl")
include("structs/Action.jl")
include("structs/LayerSetting.jl")
include("structs/LayerCache.jl")
include("structs/Layer.jl")
include("structs/LinearScale.jl")
include("structs/objects/CoordinateSystem.jl")

"""
Line
Expand Down Expand Up @@ -96,16 +109,17 @@ end

include("layers.jl")
include("util.jl")
include("objects/CoordinateSystem.jl")
include("scales.jl")
include("luxor_overrides.jl")
include("backgrounds.jl")
include("svg2luxor.jl")
include("morphs.jl")
include("action_animations.jl")
include("javis_viewer.jl")
include("latex.jl")
include("object_values.jl")


"""
projection(p::Point, l::Line)

Expand Down Expand Up @@ -715,16 +729,6 @@ for func in names(Luxor; imported = true)
end
end

# shorthands declarations
include("shorthands/JLine.jl")
include("shorthands/JCircle.jl")
include("shorthands/JRect.jl")
include("shorthands/JBox.jl")
include("shorthands/JEllipse.jl")
include("shorthands/JStar.jl")
include("shorthands/JPoly.jl")
include("shorthands/JShape.jl")

export render, latex
export Video, Object, Background, Action, RFrames, GFrames
export @JLayer, background
Expand All @@ -744,7 +748,8 @@ export JBox, JCircle, JEllipse, JLine, JPoly, JRect, JStar, @JShape
export setline, setopacity, fontsize, get_fontsize, scale, text
export setup_stream, cancel_stream

# scales
export scale_linear, @scale_layer
# scales and coordinate system
export coordinate_system, scale_linear, @scale_layer


end
166 changes: 0 additions & 166 deletions src/backgrounds.jl

This file was deleted.

Loading