Rework units #59
Merged
Rework units #59
Conversation
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
Hyperlinks
Avg scale
[ci-skip]
Conflicts: src/Diagrams/Core.hs src/Diagrams/Core/Compile.hs Conflicts had to do with changes to include Annotations.
* Merge master branch into this one * Move 'toOutput' into diagrams-core, implemented generically * Wait to convert to output units until after conversion to RTree. I know this means DelayedLeaves will be broken; still thinking about how to tackle that.
* Add "generic" attributes * Finish toRTree reimplementation * Remove Options argument from renderData
* switch from syb to Data.Data.Lens * fix the type of 'convert': `Measure (Scalar v)`, not `Measure v` !
The diagram has *already* had the global -> output transformation applied, so don't multiply by that scaling factor again!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Move
toOutputetc. into -core, using a generic approach. All the units work.This was done at the expense of delayed leaves, and hence of arrows. (However, the way we were handling delayed leaves before wasn't really working anyway.) So we could merge this back into
unitsbut we still need to figure out what we are doing with those.Sorry for the mess below; it was necessary to merge
masterinto this branch to access the newly-moved-to-core version ofavgScale, so most of the commits listed below are actually from that. The last 6 commits or so (beginning with "some experiments-in-progress...") are the important ones to look at.