aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for issue #232.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-05-29 11:03:16 +03:00
parent 9a898a7c99
commit 6530b57a8a
3 changed files with 68 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/app/tools/drawTools/vtoolpointofintersectionarcs.cpp
View File

@ -129,21 +129,76 @@ QPointF VToolPointOfIntersectionArcs::FindPoint(const VArc *arc1, const VArc *ar
const int res = VGObject::IntersectionCircles(arc1->GetCenter().toQPointF(), arc1->GetRadius(),
arc2->GetCenter().toQPointF(), arc2->GetRadius(), p1, p2);
QLineF r1Arc1(arc1->GetCenter().toQPointF(), p1);
r1Arc1.setLength(r1Arc1.length()+10);
QLineF r1Arc2(arc2->GetCenter().toQPointF(), p1);
r1Arc2.setLength(r1Arc2.length()+10);
QLineF r2Arc1(arc1->GetCenter().toQPointF(), p2);
r2Arc1.setLength(r2Arc1.length()+10);
QLineF r2Arc2(arc2->GetCenter().toQPointF(), p2);
r2Arc2.setLength(r2Arc2.length()+10);
switch(res)
{
case 2:
if (pType == CrossArcsPoint::FirstPoint)
{
int localRes = 0;
bool flagP1 = false;
if (arc1->IsIntersectLine(r1Arc1) && arc2->IsIntersectLine(r1Arc2))
{
++localRes;
flagP1 = true;
}
if (arc1->IsIntersectLine(r2Arc1) && arc2->IsIntersectLine(r2Arc2))
{
++localRes;
}
switch(localRes)
{
case 2:
if (pType == CrossArcsPoint::FirstPoint)
{
return p1;
}
else
{
return p2;
}
break;
case 1:
if (flagP1)
{
return p1;
}
else
{
return p2;
}
break;
case 0:
default:
return QPointF(0, 0);
break;
}
break;
}
case 1:
if (arc1->IsIntersectLine(r1Arc1) && arc2->IsIntersectLine(r1Arc2))
{
return p1;
}
else
{
return p2;
return QPointF(0, 0);
}
break;
case 1:
return p1;
break;
case 3:
case 0:
default:

7
src/libs/vgeometry/vabstractcurve.cpp
View File

@ -169,6 +169,13 @@ QVector<QPointF> VAbstractCurve::IntersectLine(const QLineF &line) const
return intersections;
}
//---------------------------------------------------------------------------------------------------------------------
bool VAbstractCurve::IsIntersectLine(const QLineF &line) const
{
const QVector<QPointF> points = IntersectLine(line);
return not points.isEmpty();
}
//---------------------------------------------------------------------------------------------------------------------
QPainterPath VAbstractCurve::ShowDirection(const QVector<QPointF> &points) const
{

1
src/libs/vgeometry/vabstractcurve.h
View File

@ -51,6 +51,7 @@ public:
virtual QPainterPath GetPath(PathDirection direction = PathDirection::Hide) const;
virtual qreal GetLength() const =0;
virtual QVector<QPointF> IntersectLine(const QLineF &line) const;
virtual bool IsIntersectLine(const QLineF &line) const;
protected:
QPainterPath ShowDirection(const QVector<QPointF> &points) const;
private: