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.

Sign up for GitHub

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

Added shapes 'cross' and 'plus' #43

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added shapes 'cross' and 'plus' #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2aed38d
Added shapes 'cross' and 'plus'
SMietzner Sep 25, 2017
429c710
SMietzner Sep 25, 2017
0745b80
SMietzner Sep 25, 2017
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
Binary file added ggplotd-test-default
View file
Open in desktop
Binary file not shown.
83 changes: 61 additions & 22 deletions source/ggplotd/geom.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,30 @@ private template geomShape( string shape, AES )
} else {
context.scale( width, height );
}
static if (shape=="triangle")

static if (shape=="triangle")
{
context.moveTo( -0.5, -0.5 );
context.lineTo( 0.5, -0.5 );
context.lineTo( 0, 0.5 );
} else static if (shape=="diamond") {
} else static if (shape=="diamond")
{
context.moveTo( 0, -0.5 );
context.lineTo( 0.5, 0 );
context.lineTo( 0, 0.5 );
context.lineTo( -0.5, 0 );
} else static if (shape=="cross" )
{
context.moveTo( -0.5, -0.5 );
context.lineTo( 0.5, 0.5 );
context.moveTo( 0.5, -0.5 );
context.lineTo( -0.5, 0.5 );
} else static if (shape=="plus" )
{
context.moveTo( -0.5, 0.0 );
context.lineTo( 0.5, 0.0 );
context.moveTo( 0.0, -0.5 );
context.lineTo( 0.0, 0.5 );
} else {
context.moveTo( -0.5, -0.5 );
context.lineTo( -0.5, 0.5 );
Expand Down Expand Up @@ -330,6 +344,28 @@ auto geomDiamond(AES)(AES aes)
return geomShape!("diamond", AES)(aes);
}

/**
Draw cross centered at given x,y location

Aside from x and y also width and height are required.
If the type of width is of type Pixel (see aes.d) then dimensions are assumed to be in Pixel (not user coordinates).
*/
auto geomCross(AES)(AES aes)
{
return geomShape!("cross", AES)(aes);
}

/**
Draw plus centered at given x,y location

Aside from x and y also width and height are required.
If the type of width is of type Pixel (see aes.d) then dimensions are assumed to be in Pixel (not user coordinates).
*/
auto geomPlus(AES)(AES aes)
{
return geomShape!("plus", AES)(aes);
}

/// Create points from the data
auto geomPoint(AES)(AES aesRange)
{
Expand Down Expand Up @@ -541,8 +577,6 @@ auto geomAxis(AES)(AES aesRaw, double tickLength, string label)
import std.range : chain, empty, repeat;
import std.math : sqrt, pow;

import ggplotd.range : mergeRange;

double[] xs;
double[] ys;

Expand All @@ -551,25 +585,29 @@ auto geomAxis(AES)(AES aesRaw, double tickLength, string label)
double[] langles;
string[] lbls;

auto merged = DefaultValues.mergeRange(aesRaw);
Copy link
Owner

Choose a reason for hiding this comment

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

Did you test whether this is a big performance improvement? mergeRange should be mostly compile time, and not really cause a slow down (I'd have thought)


immutable toDir =
merged.find!("a.x != b.x || a.y != b.y")(merged.front).front;
auto direction = [toDir.x - merged.front.x, toDir.y - merged.front.y];
aesRaw.find!("a.x != b.x || a.y != b.y")(aesRaw.front).front;
auto direction = [toDir.x - aesRaw.front.x, toDir.y - aesRaw.front.y];
immutable dirLength = sqrt(pow(direction[0], 2) + pow(direction[1], 2));
direction[0] *= tickLength / dirLength;
direction[1] *= tickLength / dirLength;

while (!merged.empty)
import ggplotd.aes : hasAesField;
static if (hasAesField!(AES, "size"))
auto size = aesRaw.front.size;
else
auto size = DefaultValues.size;

while (!aesRaw.empty)
{
auto tick = merged.front;
auto tick = aesRaw.front;
xs ~= tick.x;
ys ~= tick.y;

merged.popFront;
aesRaw.popFront;

// Draw ticks perpendicular to main axis;
if (xs.length > 1 && !merged.empty)
if (xs.length > 1 && !aesRaw.empty)
{
xs ~= [tick.x + direction[1], tick.x];
ys ~= [tick.y + direction[0], tick.y];
Expand All @@ -590,16 +628,17 @@ auto geomAxis(AES)(AES aesRaw, double tickLength, string label)

import std.algorithm : map;
import std.range : zip;
return xs.zip(ys).map!((a) => aes!("x", "y", "mask", "scale")
(a[0], a[1], false, false)).geomLine()
.chain(
lxs.zip(lys, lbls, langles)
.map!((a) =>
aes!("x", "y", "label", "angle", "mask", "size", "scale")
(a[0], a[1], a[2], a[3], false, aesRaw.front.size, false ))
.geomLabel
)
.chain( geomLabel(aesM) );
return xs.zip(ys)
.map!((a) => aes!("x", "y", "mask", "scale",) (a[0], a[1], false, false))
.geomLine
.chain(
lxs.zip(lys, lbls, langles)
.map!((a) =>
aes!("x", "y", "label", "angle", "mask", "size", "scale")
(a[0], a[1], a[2], a[3], false, size, false ))
.geomLabel,
aesM.geomLabel
);
}

/**
Expand Down