This repository has been archived by the owner on Sep 28, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 46
Add arrows for TikZ diagrams #117
Open
danslocombe
wants to merge
1
commit into
Daniel-Diaz:master
Choose a base branch
from
danslocombe:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,6 +54,8 @@ type Point = (Double,Double) | |
-- | A figure in the plane. | ||
data Figure = | ||
Line [Point] -- ^ Line along a list of points. | ||
| Arrow [Point] -- ^ Line along a list of points with an arrowhead . | ||
| Curvy [Point] | ||
| Polygon [Point] -- ^ Line along a list of points, but the last point will be joined | ||
-- with the first one. | ||
| PolygonFilled [Point] -- ^ Same as 'Polygon', but the inner side will be filled with color. | ||
|
@@ -79,10 +81,18 @@ castpoint (x,y) = T.pointAtXY x y | |
radiansToDegrees :: Double -> Double | ||
radiansToDegrees x = (180 * x) / pi | ||
|
||
toTPoint :: Point -> T.TPoint | ||
toTPoint = uncurry T.pointAtXY | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is the same as |
||
|
||
-- | Translate a 'Figure' to a 'TikZ' script. | ||
figuretikz :: Figure -> TikZ | ||
figuretikz (Line []) = emptytikz | ||
figuretikz (Line (p:ps)) = T.draw $ foldl (\y x -> y T.->- castpoint x) (T.Start $ castpoint p) ps | ||
figuretikz (Arrow []) = emptytikz | ||
figuretikz (Arrow (p:ps)) = T.path [T.Draw, T.Arrow] $ foldl (\y x -> y T.->- castpoint x) (T.Start $ castpoint p) ps | ||
figuretikz (Curvy []) = emptytikz | ||
--figuretikz (Curvy (p:ps)) = T.path [T.Draw, T.Smooth] $ foldl (\y x -> y T.->- castpoint x) (T.Start $ castpoint p) ps | ||
figuretikz (Curvy (ps)) = T.Curvy (toTPoint <$> ps) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The parenthesis in |
||
figuretikz (Polygon []) = emptytikz | ||
figuretikz (Polygon (p:ps)) = T.draw $ T.Cycle $ foldl (\y x -> y T.->- castpoint x) (T.Start $ castpoint p) ps | ||
figuretikz (PolygonFilled []) = emptytikz | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You explain
Arrow
, but notCurvy
.