From f91b3dc95576929f8e3eeb2bdc0deb0073c991ae Mon Sep 17 00:00:00 2001 From: Ronan Le Tiec Date: Sun, 16 Oct 2016 19:23:40 +0200 Subject: [PATCH] 10 new colors added for the lines #577 --HG-- branch : feature --- src/libs/ifc/ifcdef.cpp | 24 +- src/libs/ifc/ifcdef.h | 11 + src/libs/ifc/schema.qrc | 1 + src/libs/ifc/schema/pattern/v0.3.7.xsd | 592 ++++++++++++++++++++++++ src/libs/ifc/xml/vpatternconverter.cpp | 6 +- src/libs/ifc/xml/vpatternconverter.h | 4 +- src/libs/vtools/tools/vabstracttool.cpp | 39 +- 7 files changed, 663 insertions(+), 14 deletions(-) create mode 100644 src/libs/ifc/schema/pattern/v0.3.7.xsd diff --git a/src/libs/ifc/ifcdef.cpp b/src/libs/ifc/ifcdef.cpp index d581ea542..450dede6e 100644 --- a/src/libs/ifc/ifcdef.cpp +++ b/src/libs/ifc/ifcdef.cpp @@ -144,13 +144,23 @@ const QString TypeLineDotLine = QStringLiteral("dotLine"); const QString TypeLineDashDotLine = QStringLiteral("dashDotLine"); const QString TypeLineDashDotDotLine = QStringLiteral("dashDotDotLine"); -const QString ColorBlack = QStringLiteral("black"); -const QString ColorGreen = QStringLiteral("green"); -const QString ColorBlue = QStringLiteral("blue"); -const QString ColorDarkRed = QStringLiteral("darkRed"); -const QString ColorDarkGreen = QStringLiteral("darkGreen"); -const QString ColorDarkBlue = QStringLiteral("darkBlue"); -const QString ColorYellow = QStringLiteral("yellow"); +const QString ColorBlack = QStringLiteral("black"); +const QString ColorGreen = QStringLiteral("green"); +const QString ColorBlue = QStringLiteral("blue"); +const QString ColorDarkRed = QStringLiteral("darkRed"); +const QString ColorDarkGreen = QStringLiteral("darkGreen"); +const QString ColorDarkBlue = QStringLiteral("darkBlue"); +const QString ColorYellow = QStringLiteral("yellow"); +const QString ColorLightSalmon = QStringLiteral("lightsalmon"); +const QString ColorGoldenRod = QStringLiteral("goldenrod"); +const QString ColorOrange = QStringLiteral("orange"); +const QString ColorDeepPink = QStringLiteral("deeppink"); +const QString ColorViolet = QStringLiteral("violet"); +const QString ColorDarkViolet = QStringLiteral("darkviolet"); +const QString ColorMediumSeaGreen = QStringLiteral("mediumseagreen"); +const QString ColorLime = QStringLiteral("lime"); +const QString ColorDeepSkyBlue = QStringLiteral("deepskyblue"); +const QString ColorCornFlowerBlue = QStringLiteral("cornflowerblue"); //variables const QString line_ = QStringLiteral("Line_"); diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h index 0d376157d..d3594f201 100644 --- a/src/libs/ifc/ifcdef.h +++ b/src/libs/ifc/ifcdef.h @@ -152,6 +152,17 @@ extern const QString ColorDarkRed; extern const QString ColorDarkGreen; extern const QString ColorDarkBlue; extern const QString ColorYellow; +extern const QString ColorLightSalmon; +extern const QString ColorGoldenRod; +extern const QString ColorOrange; +extern const QString ColorDeepPink; +extern const QString ColorViolet; +extern const QString ColorDarkViolet; +extern const QString ColorMediumSeaGreen; +extern const QString ColorLime; +extern const QString ColorDeepSkyBlue; +extern const QString ColorCornFlowerBlue; + // variables name // Hacks for avoiding the linker error "undefined reference to" diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc index 6a0edbcae..dc334d62a 100644 --- a/src/libs/ifc/schema.qrc +++ b/src/libs/ifc/schema.qrc @@ -29,5 +29,6 @@ schema/individual_measurements/v0.3.1.xsd schema/individual_measurements/v0.3.2.xsd schema/individual_measurements/v0.3.3.xsd + schema/pattern/v0.3.7.xsd diff --git a/src/libs/ifc/schema/pattern/v0.3.7.xsd b/src/libs/ifc/schema/pattern/v0.3.7.xsd new file mode 100644 index 000000000..7979e681b --- /dev/null +++ b/src/libs/ifc/schema/pattern/v0.3.7.xsd @@ -0,0 +1,592 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 6f9788537..90e6c91b3 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -58,8 +58,8 @@ class QDomElement; */ const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.0"); -const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.3.6"); -const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.3.6.xsd"); +const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.3.7"); +const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.3.7.xsd"); //VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! //VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! @@ -171,6 +171,8 @@ QString VPatternConverter::XSDSchema(int ver) const case (0x000305): return QStringLiteral("://schema/pattern/v0.3.5.xsd"); case (0x000306): + return QStringLiteral("://schema/pattern/v0.3.6.xsd"); + case (0x000307): return CurrentSchema; default: InvalidVersion(ver); diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 87cd058d2..bea5e5cd2 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -55,10 +55,10 @@ public: // GCC 4.6 doesn't allow constexpr and const together #if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) <= 406 static Q_DECL_CONSTEXPR int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); - static Q_DECL_CONSTEXPR int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 6); + static Q_DECL_CONSTEXPR int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 7); #else static Q_DECL_CONSTEXPR const int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); - static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 6); + static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 7); #endif protected: diff --git a/src/libs/vtools/tools/vabstracttool.cpp b/src/libs/vtools/tools/vabstracttool.cpp index 3fd582eef..98c06914a 100644 --- a/src/libs/vtools/tools/vabstracttool.cpp +++ b/src/libs/vtools/tools/vabstracttool.cpp @@ -223,9 +223,12 @@ QMap VAbstractTool::LineStylesPics() //--------------------------------------------------------------------------------------------------------------------- const QStringList VAbstractTool::Colors() { - const QStringList colors = QStringList() << ColorBlack << ColorGreen << ColorBlue - << ColorDarkRed << ColorDarkGreen - << ColorDarkBlue << ColorYellow; + const QStringList colors = QStringList() << ColorBlack << ColorGreen << ColorBlue + << ColorDarkRed << ColorDarkGreen << ColorDarkBlue + << ColorYellow << ColorLightSalmon << ColorGoldenRod + << ColorOrange << ColorDeepPink << ColorViolet + << ColorDarkViolet << ColorMediumSeaGreen << ColorLime + << ColorDeepSkyBlue << ColorCornFlowerBlue; return colors; } @@ -261,6 +264,36 @@ QMap VAbstractTool::ColorsList() case 6: // ColorYellow name = tr("yellow"); break; + case 7: // ColorLightSalmon + name = tr("light salmon"); + break; + case 8: // ColorGoldenRod + name = tr("golden rod"); + break; + case 9: // ColorOrange + name = tr("orange"); + break; + case 10: // ColorDeepPink + name = tr("deep pink"); + break; + case 11: // ColorViolet + name = tr("violet"); + break; + case 12: // ColorDarkViolet + name = tr("dark violet"); + break; + case 13: // ColorMediumSeaGreen + name = tr("medium sea green"); + break; + case 14: // ColorLime + name = tr("lime"); + break; + case 15: // ColorDeepSkyBlue + name = tr("deep sky blue"); + break; + case 16: // ColorCornFlowerBlue + name = tr("corn flower blue"); + break; default: name = tr("black"); break;