kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add ability to have an empty outline for hatching

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3970 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2015-05-13 12:48:31 +00:00
parent 933cb94a3c
commit 633abaa7bf
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/editor/graphicspart/customelementgraphicpart.cpp
View File

@@ -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);

2
sources/editor/graphicspart/customelementgraphicpart.h
View File

@@ -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:

1
sources/editor/styleeditor.cpp
View File

@@ -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);

3
sources/editor/styleeditor.h
View File

@@ -43,9 +43,6 @@ class StyleEditor : public ElementItemEditor
QList <CustomElementGraphicPart *> m_part_list;
QList <CustomElementPart *> 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;

7
sources/qetgraphicsitem/customelement.cpp
View File

@@ -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);
}
}
}