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

Mark with different color base objects and rotated objects.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-05-19 15:23:37 +03:00
parent 948d384868
commit 123434f806
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,11 +126,11 @@ void VisToolRotation::RefreshGeometry()
const QSharedPointer<VPointF> p = Visualization::data->GeometricObject<VPointF>(id); const QSharedPointer<VPointF> p = Visualization::data->GeometricObject<VPointF>(id);
++iPoint; ++iPoint;
QGraphicsEllipseItem *point = GetPoint(iPoint); QGraphicsEllipseItem *point = GetPoint(iPoint, supportColor2);
DrawPoint(point, *p, supportColor); DrawPoint(point, *p, supportColor2);
++iPoint; ++iPoint;
point = GetPoint(iPoint); point = GetPoint(iPoint, supportColor);
if (object1Id != NULL_ID) if (object1Id != NULL_ID)
{ {
@ -216,7 +216,7 @@ void VisToolRotation::VisualMode(const quint32 &pointId)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QGraphicsEllipseItem *VisToolRotation::GetPoint(quint32 i) QGraphicsEllipseItem *VisToolRotation::GetPoint(quint32 i, const QColor &color)
{ {
if (not points.isEmpty() && static_cast<quint32>(points.size() - 1) >= i) if (not points.isEmpty() && static_cast<quint32>(points.size() - 1) >= i)
{ {
@ -224,7 +224,7 @@ QGraphicsEllipseItem *VisToolRotation::GetPoint(quint32 i)
} }
else else
{ {
auto point = InitPoint(supportColor, this); auto point = InitPoint(color, this);
points.append(point); points.append(point);
return point; return point;
} }
@ -232,7 +232,7 @@ QGraphicsEllipseItem *VisToolRotation::GetPoint(quint32 i)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QGraphicsPathItem *VisToolRotation::GetCurve(quint32 i) QGraphicsPathItem *VisToolRotation::GetCurve(quint32 i, const QColor &color)
{ {
if (not curves.isEmpty() && static_cast<quint32>(curves.size() - 1) >= i) if (not curves.isEmpty() && static_cast<quint32>(curves.size() - 1) >= i)
{ {
@ -254,15 +254,15 @@ int VisToolRotation::AddCurve(const QPointF &origin, quint32 id, int i)
const QSharedPointer<Item> curve = Visualization::data->GeometricObject<Item>(id); const QSharedPointer<Item> curve = Visualization::data->GeometricObject<Item>(id);
++i; ++i;
QGraphicsPathItem *path = GetCurve(i); QGraphicsPathItem *path = GetCurve(i, supportColor2);
DrawPath(path, curve->GetPath(PathDirection::Hide), mainColor, Qt::SolidLine, Qt::RoundCap); DrawPath(path, curve->GetPath(PathDirection::Hide), supportColor2, Qt::SolidLine, Qt::RoundCap);
++i; ++i;
path = GetCurve(i); path = GetCurve(i, supportColor);
if (object1Id != NULL_ID) 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), supportColor, Qt::SolidLine, Qt::RoundCap);
} }
return i; return i;

4
src/libs/vtools/visualization/line/vistoolrotation.h
View File

@ -62,8 +62,8 @@ private:
QVector<QGraphicsEllipseItem *> points; QVector<QGraphicsEllipseItem *> points;
QVector<QGraphicsPathItem *> curves; QVector<QGraphicsPathItem *> curves;
QGraphicsEllipseItem * GetPoint(quint32 i); QGraphicsEllipseItem * GetPoint(quint32 i, const QColor &color);
QGraphicsPathItem * GetCurve(quint32 i); QGraphicsPathItem * GetCurve(quint32 i, const QColor &color);
template <class Item> template <class Item>
int AddCurve(const QPointF &origin, quint32 id, int i); int AddCurve(const QPointF &origin, quint32 id, int i);