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

Preliminary implementation of Measure #55

Merged
merged 42 commits into from
Apr 7, 2014
Merged

Preliminary implementation of Measure #55

merged 42 commits into from
Apr 7, 2014

Conversation

jeffreyrosenbluth
Copy link
Member

Please do NOT merge
In particular no arrows
Companion branches in -lib, -svg


-- | Convert an RTree to a renderable object. The transforms have
-- been accumulated and are in the leaves of the RTree along with the Prims.
renderRTree :: RTree b v a -> Render b v
Copy link
Member

Choose a reason for hiding this comment

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

What's the point of putting renderRTree in the Backend class? It's not actually used by anything as far as I can tell (except being a recommended way to implement renderData).

byorgey and others added 15 commits March 23, 2014 20:44
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!
This lets us properly express vector-space-generic V and Transformable
instances for Measure.
byorgey added a commit that referenced this pull request Apr 7, 2014
Big refactoring!

* Remove `freeze` (and hence `Split` transforms, etc.)
* Add units of `Measure`
* Refactor and simplify `Backend` class
@byorgey byorgey merged commit 5fb419e into master Apr 7, 2014
@byorgey byorgey deleted the units branch April 7, 2014 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants