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

Show selected objects even before selecting origin point.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-05-18 19:13:48 +03:00
parent 19df01be2e
commit fd39c19da0
1 changed files with 64 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/vtools/visualization/line/vistoolrotation.cpp
View File

@ -75,9 +75,11 @@ void VisToolRotation::RefreshGeometry()
return; return;
} }
QSharedPointer<VPointF> origin;
if (object1Id != NULL_ID) if (object1Id != NULL_ID)
{ {
const QSharedPointer<VPointF> origin = Visualization::data->GeometricObject<VPointF>(object1Id); origin = Visualization::data->GeometricObject<VPointF>(object1Id);
DrawPoint(point, *origin, supportColor2); DrawPoint(point, *origin, supportColor2);
QLineF rLine; QLineF rLine;
@ -105,6 +107,7 @@ void VisToolRotation::RefreshGeometry()
Visualization::toolTip = tr("Rotating angle = %1°, <b>Shift</b> - sticking angle, " Visualization::toolTip = tr("Rotating angle = %1°, <b>Shift</b> - sticking angle, "
"<b>Mouse click</b> - finish creation").arg(rLine.angle()); "<b>Mouse click</b> - finish creation").arg(rLine.angle());
}
int iPoint = -1; int iPoint = -1;
int iCurve = -1; int iCurve = -1;
@ -128,7 +131,11 @@ void VisToolRotation::RefreshGeometry()
++iPoint; ++iPoint;
point = GetPoint(iPoint); point = GetPoint(iPoint);
if (object1Id != NULL_ID)
{
DrawPoint(point, p->Rotate(*origin, angle), supportColor); DrawPoint(point, p->Rotate(*origin, angle), supportColor);
}
break; break;
} }
case GOType::Arc: case GOType::Arc:
@ -165,7 +172,6 @@ void VisToolRotation::RefreshGeometry()
break; break;
} }
} }
}
} }
#if defined(Q_CC_GNU) #if defined(Q_CC_GNU)
@ -253,8 +259,11 @@ int VisToolRotation::AddCurve(const QPointF &origin, quint32 id, int i)
++i; ++i;
path = GetCurve(i); path = GetCurve(i);
if (object1Id != NULL_ID)
{
const Item rotated = curve->Rotate(origin, angle); const Item rotated = curve->Rotate(origin, angle);
DrawPath(path, rotated.GetPath(PathDirection::Hide), mainColor, Qt::SolidLine, Qt::RoundCap); DrawPath(path, rotated.GetPath(PathDirection::Hide), mainColor, Qt::SolidLine, Qt::RoundCap);
}
return i; return i;
} }