From de1c9d8a779a0ed5c3cfb8bf6e8f2e4db6ae4e60 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 2 Feb 2015 11:29:50 +0200 Subject: [PATCH] List of colors. --HG-- branch : feature --- src/app/tools/vabstracttool.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp index 92fc3de7e..9737f9777 100644 --- a/src/app/tools/vabstracttool.cpp +++ b/src/app/tools/vabstracttool.cpp @@ -70,6 +70,8 @@ const QString VAbstractTool::AttrPSpline = QStringLiteral("pSpline"); const QString VAbstractTool::AttrAxisP1 = QStringLiteral("axisP1"); const QString VAbstractTool::AttrAxisP2 = QStringLiteral("axisP2"); const QString VAbstractTool::AttrCurve = QStringLiteral("curve"); +const QString VAbstractTool::AttrLineColor = QStringLiteral("lineColor"); +const QString VAbstractTool::AttrColor = QStringLiteral("color"); const QString VAbstractTool::TypeLineNone = QStringLiteral("none"); const QString VAbstractTool::TypeLineLine = QStringLiteral("hair"); @@ -78,6 +80,14 @@ const QString VAbstractTool::TypeLineDotLine = QStringLiteral("dotLine"); const QString VAbstractTool::TypeLineDashDotLine = QStringLiteral("dashDotLine"); const QString VAbstractTool::TypeLineDashDotDotLine = QStringLiteral("dashDotDotLine"); +const QString VAbstractTool::ColorBlack = QStringLiteral("black"); +const QString VAbstractTool::ColorGreen = QStringLiteral("green"); +const QString VAbstractTool::ColorBlue = QStringLiteral("blue"); +const QString VAbstractTool::ColorDarkRed = QStringLiteral("darkRed"); +const QString VAbstractTool::ColorDarkGreen = QStringLiteral("darkGreen"); +const QString VAbstractTool::ColorDarkBlue = QStringLiteral("DarkBlue"); +const QString VAbstractTool::ColorYellow = QStringLiteral("Yellow"); + //--------------------------------------------------------------------------------------------------------------------- /** * @brief VAbstractTool container. @@ -214,6 +224,14 @@ QMap VAbstractTool::LineStylesPics() return map; } +//--------------------------------------------------------------------------------------------------------------------- +const QStringList VAbstractTool::Colors() +{ + const QStringList colors = QStringList() << ColorBlack << ColorGreen << ColorBlue << ColorDarkRed << ColorDarkGreen + << ColorDarkBlue << ColorYellow; + return colors; +} + //--------------------------------------------------------------------------------------------------------------------- QString VAbstractTool::getLineType() const { @@ -290,8 +308,8 @@ void VAbstractTool::SaveOption(QSharedPointer &obj) */ const QStringList VAbstractTool::StylesList() { - QStringList styles = QStringList() << TypeLineNone << TypeLineLine << TypeLineDashLine << TypeLineDotLine << - TypeLineDashDotLine << TypeLineDashDotDotLine; + const QStringList styles = QStringList() << TypeLineNone << TypeLineLine << TypeLineDashLine << TypeLineDotLine + << TypeLineDashDotLine << TypeLineDashDotDotLine; return styles; }