diff --git a/sources/editor/graphicspart/customelementgraphicpart.cpp b/sources/editor/graphicspart/customelementgraphicpart.cpp index 494dab100..4e4c720b7 100644 --- a/sources/editor/graphicspart/customelementgraphicpart.cpp +++ b/sources/editor/graphicspart/customelementgraphicpart.cpp @@ -198,6 +198,8 @@ void CustomElementGraphicPart::stylesToXml(QDomElement &qde) const else if (_color == LightgrayColor) css_like_styles += "lightgray"; else if (_color == OrangeColor) css_like_styles += "orange"; else if (_color == PurpleColor) css_like_styles += "purple"; + else if (_color == NoneColor) css_like_styles += "none"; + qde.setAttribute("style", css_like_styles); qde.setAttribute("antialias", _antialiased ? "true" : "false"); @@ -274,6 +276,7 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde) else if (style_value == "lightgray") _color = LightgrayColor; else if (style_value == "orange") _color = OrangeColor; else if (style_value == "purple") _color = PurpleColor; + else if (style_value == "none") _color = NoneColor; } } //Get antialiasing @@ -357,6 +360,7 @@ void CustomElementGraphicPart::applyStylesToQPainter(QPainter &painter) const else if (_color == LightgrayColor) pen.setColor(Qt::lightGray); else if (_color == OrangeColor) pen.setColor(QColor(255, 128, 0)); else if (_color == PurpleColor) pen.setColor(QColor(136, 28, 168)); + else if (_color == NoneColor) pen.setBrush(Qt::transparent); //Apply antialiasing painter.setRenderHint(QPainter::Antialiasing, _antialiased); diff --git a/sources/editor/graphicspart/customelementgraphicpart.h b/sources/editor/graphicspart/customelementgraphicpart.h index e1e8d6127..3eb1eabad 100644 --- a/sources/editor/graphicspart/customelementgraphicpart.h +++ b/sources/editor/graphicspart/customelementgraphicpart.h @@ -59,7 +59,7 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar enum Filling { NoneFilling, BlackFilling, WhiteFilling, GreenFilling, RedFilling, BlueFilling, GrayFilling, BrunFilling, YellowFilling, CyanFilling, MagentaFilling, LightgrayFilling, OrangeFilling, PurpleFilling, HorFilling, VerFilling, BdiagFilling, FdiagFilling}; //Line color - enum Color {BlackColor, WhiteColor, GreenColor, RedColor, BlueColor, GrayColor, BrunColor, YellowColor, CyanColor, MagentaColor, LightgrayColor, OrangeColor, PurpleColor}; + enum Color {BlackColor, WhiteColor, GreenColor, RedColor, BlueColor, GrayColor, BrunColor, YellowColor, CyanColor, MagentaColor, LightgrayColor, OrangeColor, PurpleColor, NoneColor}; // constructors, destructor public: diff --git a/sources/editor/styleeditor.cpp b/sources/editor/styleeditor.cpp index dc3bafd20..51ced350b 100644 --- a/sources/editor/styleeditor.cpp +++ b/sources/editor/styleeditor.cpp @@ -43,6 +43,7 @@ StyleEditor::StyleEditor(QETElementEditor *editor, CustomElementGraphicPart *p, outline_color -> addItem(tr("Gris clair", "element part color"), CustomElementGraphicPart::LightgrayColor); outline_color -> addItem(tr("Orange", "element part color"), CustomElementGraphicPart::OrangeColor); outline_color -> addItem(tr("Violet", "element part color"), CustomElementGraphicPart::PurpleColor); + outline_color -> addItem(tr("Aucun", "element part color"), CustomElementGraphicPart::NoneColor); // style line_style = new QComboBox(this); diff --git a/sources/editor/styleeditor.h b/sources/editor/styleeditor.h index 4fb945f9a..695750638 100644 --- a/sources/editor/styleeditor.h +++ b/sources/editor/styleeditor.h @@ -43,9 +43,6 @@ class StyleEditor : public ElementItemEditor QList m_part_list; QList m_cep_list; QVBoxLayout *main_layout; - QRadioButton *black_color, *white_color, *normal_style, *dashed_style, *dashdotted_style, *dotted_style, *green_color, *red_color, *blue_color, *gray_color, *brun_color, *yellow_color, *cyan_color, *magenta_color, *gris_clair_color, orange_color, *violet_color, *hor_filling, *ver_filling; - QRadioButton *none_weight, *thin_weight, *normal_weight, *no_filling; - QRadioButton *black_filling, *white_filling, *green_filling, *red_filling, *blue_filling, *gray_filling, *brun_filling, *yellow_filling, *cyan_filling, *magenta_filling, *gris_clair_filling, orange_filling, *violet_filling, *hachures1_filling, hachures2_filling; QCheckBox *antialiasing; QComboBox *filling_color, *outline_color, *size_weight, *line_style; diff --git a/sources/qetgraphicsitem/customelement.cpp b/sources/qetgraphicsitem/customelement.cpp index 274016641..d0ae63453 100644 --- a/sources/qetgraphicsitem/customelement.cpp +++ b/sources/qetgraphicsitem/customelement.cpp @@ -843,6 +843,11 @@ bool CustomElement::validOrientationAttribute(const QDomElement &e) { - lightgray : trait gris clair - orange : trait orange - purple : trait violet + - lignes Horizontales + - lignes Verticales + - hachures gauche + - hachures droite + - none : pas de contour Les autres valeurs ne sont pas prises en compte. @param e L'element XML a parser @@ -960,6 +965,8 @@ void CustomElement::setPainterStyle(QDomElement &e, QPainter &qp) { pen.setColor(QColor(255, 128, 0)); }else if (style_value == "purple") { pen.setColor(QColor(136, 28, 168)); + } else if (style_value == "none") { + pen.setBrush(Qt::transparent); } } }