wilderjds
/
xournalpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #473 from xournalpp/arrow-rotation

Browse Source 
Arrow rotation
presentation
morrolinux 7 years ago committed by GitHub
parent ce1a138806 64b96e8e5d
commit 659608224f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 87 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 94
      src/control/tools/ArrowHandler.cpp

94
src/control/tools/ArrowHandler.cpp
Unescape View File

@ -26,10 +26,11 @@ void ArrowHandler::drawShape(Point& c, bool shiftDown)
{
stroke->addPoint(c);
}
else
else
{
Point p = stroke->getPoint(0);
//disable this to see such a cool "serrate brush" effect
if (count > 4)
{
// remove previous points
@ -43,15 +44,94 @@ void ArrowHandler::drawShape(Point& c, bool shiftDown)
// so we just have to build the head
// set up the size of the arrowhead to be 1/8 the length of arrow
double dist = sqrt(pow(c.x - p.x, 2.0) + pow(c.y - p.y, 2.0)) / 8.0;
double dist = sqrt(pow(c.x - p.x, 2.0) + pow(c.y - p.y, 2.0));
double arrowDist = dist/8;
double angle = atan2((c.y - p.y), (c.x - p.x));
// an appropriate delta is Pi/3 radians for an arrow shape
double delta = M_PI / 6.0;
stroke->addPoint(c);
stroke->addPoint(Point(c.x - dist * cos(angle + delta), c.y - dist * sin(angle + delta)));
stroke->addPoint(c);
stroke->addPoint(Point(c.x - dist * cos(angle - delta), c.y - dist * sin(angle - delta)));
if (shiftDown)
{
stroke->addPoint(c);
stroke->addPoint(Point(c.x - dist * cos(angle + delta), c.y - dist * sin(angle + delta)));
stroke->addPoint(c);
stroke->addPoint(Point(c.x - dist * cos(angle - delta), c.y - dist * sin(angle - delta)));
}
else
{
double epsilon = 0.1;
if (std::abs(angle) < epsilon)
{
angle = 0;
stroke->addPoint(Point(c.x, p.y));
stroke->addPoint(Point(c.x - arrowDist * cos(angle + delta), p.y - arrowDist * sin(angle + delta)));
stroke->addPoint(Point(c.x, p.y));
stroke->addPoint(Point(c.x - arrowDist * cos(angle - delta), p.y - arrowDist * sin(angle - delta)));
}
else if (std::abs(angle - M_PI / 4.0) < epsilon)
{
angle = M_PI / 4.0;
stroke->addPoint(Point(dist / sqrt(2.0) + p.x, dist / sqrt(2.0) + p.y));
stroke->addPoint(Point(dist / sqrt(2.0) + p.x - arrowDist * cos(angle + delta), dist / sqrt(2.0) + p.y - arrowDist * sin(angle + delta)));
stroke->addPoint(Point(dist / sqrt(2.0) + p.x, dist / sqrt(2.0) + p.y));
stroke->addPoint(Point(dist / sqrt(2.0) + p.x - arrowDist * cos(angle - delta), dist / sqrt(2.0) + p.y - arrowDist * sin(angle - delta)));
}
else if (std::abs(angle - 3.0 * M_PI / 4.0) < epsilon)
{
angle = 3.0 * M_PI / 4.0;
stroke->addPoint(Point(-dist / sqrt(2.0) + p.x, dist / sqrt(2.0) + p.y));
stroke->addPoint(Point(-dist / sqrt(2.0) + p.x - arrowDist * cos(angle + delta), dist / sqrt(2.0) + p.y - arrowDist * sin(angle + delta)));
stroke->addPoint(Point(-dist / sqrt(2.0) + p.x, dist / sqrt(2.0) + p.y));
stroke->addPoint(Point(-dist / sqrt(2.0) + p.x - arrowDist * cos(angle - delta), dist / sqrt(2.0) + p.y - arrowDist * sin(angle - delta)));
}
else if (std::abs(angle + M_PI / 4.0) < epsilon)
{
angle = M_PI / 4.0;
stroke->addPoint(Point(dist / sqrt(2.0) + p.x, -dist / sqrt(2.0) + p.y));
stroke->addPoint(Point(dist / sqrt(2.0) + p.x - arrowDist * cos(angle + delta), -dist / sqrt(2.0) + p.y + arrowDist * sin(angle + delta)));
stroke->addPoint(Point(dist / sqrt(2.0) + p.x, -dist / sqrt(2.0) + p.y));
stroke->addPoint(Point(dist / sqrt(2.0) + p.x - arrowDist * cos(angle - delta), -dist / sqrt(2.0) + p.y + arrowDist * sin(angle - delta)));
}
else if (std::abs(angle + 3.0 * M_PI / 4.0) < epsilon)
{
angle = 3.0 * M_PI / 4.0;
stroke->addPoint(Point(-dist / sqrt(2.0) + p.x, -dist / sqrt(2.0) + p.y));
stroke->addPoint(Point(-dist / sqrt(2.0) + p.x - arrowDist * cos(angle + delta), -dist / sqrt(2.0) + p.y + arrowDist * sin(angle + delta)));
stroke->addPoint(Point(-dist / sqrt(2.0) + p.x, -dist / sqrt(2.0) + p.y));
stroke->addPoint(Point(-dist / sqrt(2.0) + p.x - arrowDist * cos(angle - delta), -dist / sqrt(2.0) + p.y + arrowDist * sin(angle - delta)));
}
else if (std::abs(std::abs(angle) - M_PI) < epsilon)
{
angle = - M_PI;
stroke->addPoint(Point(c.x, p.y));
stroke->addPoint(Point(c.x - arrowDist * cos(angle + delta), p.y - arrowDist * sin(angle + delta)));
stroke->addPoint(Point(c.x, p.y));
stroke->addPoint(Point(c.x - arrowDist * cos(angle - delta), p.y - arrowDist * sin(angle - delta)));
}
else if (std::abs(angle - M_PI / 2.0) < epsilon)
{
angle = M_PI / 2.0;
stroke->addPoint(Point(p.x, c.y));
stroke->addPoint(Point(p.x - arrowDist * cos(angle + delta), c.y - arrowDist * sin(angle + delta)));
stroke->addPoint(Point(p.x, c.y));
stroke->addPoint(Point(p.x - arrowDist * cos(angle - delta), c.y - arrowDist * sin(angle - delta)));
}
else if (std::abs(angle + M_PI / 2.0) < epsilon)
{
angle = - M_PI / 2.0;
stroke->addPoint(Point(p.x, c.y));
stroke->addPoint(Point(p.x - arrowDist * cos(angle + delta), c.y - arrowDist * sin(angle + delta)));
stroke->addPoint(Point(p.x, c.y));
stroke->addPoint(Point(p.x - arrowDist * cos(angle - delta), c.y - arrowDist * sin(angle - delta)));
}
else
{
stroke->addPoint(c);
stroke->addPoint(Point(c.x - arrowDist * cos(angle + delta), c.y - arrowDist * sin(angle + delta)));
stroke->addPoint(c);
stroke->addPoint(Point(c.x - arrowDist * cos(angle - delta), c.y - arrowDist * sin(angle - delta)));
}
}
}
}

Write Preview
Loading…
Cancel
Save