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

Rework of units #169

Merged
merged 84 commits into from
Mar 25, 2014
Merged

Rework of units #169

merged 84 commits into from
Mar 25, 2014

Conversation

byorgey
Copy link
Member

@byorgey byorgey commented Mar 25, 2014

See diagrams/diagrams-core#59 .

Things remaining to do:

  • Make arrow head size, etc. use GTAttribute (so far I only changed line width)
  • take duplicated Local transformation code out of specific attributes and make a single Transformable instance for Measure

byorgey and others added 27 commits March 12, 2014 07:03
Added bothSize function, lineHead and lineTail
This reverts commit 34b8929.

In the end 7.8.1 actually supports this derived instance, without the
need for a manual instance due to role restrictions.

Conflicts:
	src/Diagrams/Trail.hs
…ints has no trace

It used to simply draw no arrow if either trace returned Nothing.  A
better default is to simply use the location of the endpoint instead.
This way an arrow is *always* drawn.  It also allows things like drawing
an arrow between a named point (which has no trace) and the boundary of
some object.
Conflicts:
	src/Diagrams/Attributes.hs
	src/Diagrams/TwoD.hs
	src/Diagrams/TwoD/Arrow.hs
	src/Diagrams/TwoD/Combinators.hs
	test/Arrowtest.hs
* move toOutput to generic version in -core
* add some Data instances
* make lineWidth a "generic" attribute
* misc fixes required after merging master
In particular it used 'setAttr' which created a normal Attribute instead
of a GTAttribute!
jeffreyrosenbluth added a commit that referenced this pull request Mar 25, 2014
@jeffreyrosenbluth jeffreyrosenbluth merged commit 2662f88 into units Mar 25, 2014
@jeffreyrosenbluth jeffreyrosenbluth deleted the units2 branch March 25, 2014 21:59
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