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

Elliptical arc is an independent scene object.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-12-20 17:05:34 +02:00
parent f613a3a28f
commit 2f46634eff
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
View File

@ -229,7 +229,10 @@ void DialogCurveIntersectAxis::ChosenObject(quint32 id, const SceneObject &type)
switch (number)
{
case (0):
if (type == SceneObject::Spline || type == SceneObject::Arc || type == SceneObject::SplinePath)
if (type == SceneObject::Spline
|| type == SceneObject::Arc
|| type == SceneObject::ElArc
|| type == SceneObject::SplinePath)
{
if (SetObject(id, ui->comboBoxCurve, tr("Select axis point")))
{

5
src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp
View File

@ -166,7 +166,10 @@ void DialogPointOfIntersectionCurves::ChosenObject(quint32 id, const SceneObject
{
if (prepare == false)// After first choose we ignore all objects
{
if (type == SceneObject::Spline || type == SceneObject::Arc || type == SceneObject::SplinePath)
if (type == SceneObject::Spline
|| type == SceneObject::Arc
|| type == SceneObject::ElArc
|| type == SceneObject::SplinePath)
{
auto point = qobject_cast<VisToolPointOfIntersectionCurves *>(vis);
SCASSERT(point != nullptr);

10
src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp
View File

@ -585,7 +585,6 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default")
break;
}
case GOType::Arc:
case GOType::EllipticalArc:
{
VSimpleCurve *curve = InitCurve(object.id, &(VAbstractTool::data), obj->getType());
connect(curve, &VSimpleCurve::Choosed, [this](quint32 id)
@ -594,6 +593,15 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default")
});
break;
}
case GOType::EllipticalArc:
{
VSimpleCurve *curve = InitCurve(object.id, &(VAbstractTool::data), obj->getType());
connect(curve, &VSimpleCurve::Choosed, [this](quint32 id)
{
emit ChoosedTool(id, SceneObject::ElArc);
});
break;
}
case GOType::Spline:
case GOType::CubicBezier:
{

2
src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
View File

@ -74,7 +74,7 @@ VToolEllipticalArc::VToolEllipticalArc(VAbstractPattern *doc, VContainer *data,
QGraphicsItem *parent)
:VAbstractSpline(doc, data, id, parent)
{
sceneType = SceneObject::Arc;
sceneType = SceneObject::ElArc;
this->setPath(ToolPath());
this->setPen(QPen(Qt::black, qApp->toPixel(WidthHairLine(*VAbstractTool::data.GetPatternUnit()))/factor));