kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-28 12:19:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Text color and element color now do not change with background color

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2678 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
abhishekm71
2013-12-29 17:51:01 +00:00
parent af6091d8b5
commit 04e5961d17
2 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sources/qetgraphicsitem/customelement.cpp
View File

@@ -148,12 +148,6 @@ bool CustomElement::buildFromXml(const QDomElement &xml_def_elmt, int *state) {
low_zoom_qp.begin(&low_zoom_drawing); low_zoom_qp.begin(&low_zoom_drawing);
QPen tmp; QPen tmp;
tmp.setWidthF(1.0); // ligne vaudou pour prise en compte du setCosmetic - ne pas enlever tmp.setWidthF(1.0); // ligne vaudou pour prise en compte du setCosmetic - ne pas enlever
// make component color reverse of back_ground color for contrast
QColor color(Diagram::background_color);
color.setBlue(255 - color.blue());
color.setGreen(255 - color.green());
color.setRed(255 - color.red());
tmp.setColor(color);
tmp.setCosmetic(true); tmp.setCosmetic(true);
low_zoom_qp.setPen(tmp); low_zoom_qp.setPen(tmp);
@@ -299,12 +293,6 @@ bool CustomElement::parseLine(QDomElement &e, QPainter &qp) {
setPainterStyle(e, qp); setPainterStyle(e, qp);
QPen t = qp.pen(); QPen t = qp.pen();
t.setJoinStyle(Qt::MiterJoin); t.setJoinStyle(Qt::MiterJoin);
// make component color reverse of back_ground color for contrast
QColor color(Diagram::background_color);
color.setBlue(255 - color.blue());
color.setGreen(255 - color.green());
color.setRed(255 - color.red());
t.setColor(color);
qp.setPen(t); qp.setPen(t);
QLineF line(x1, y1, x2, y2); QLineF line(x1, y1, x2, y2);
@@ -409,12 +397,6 @@ bool CustomElement::parseRect(QDomElement &e, QPainter &qp) {
// force le type de jointures pour les rectangles // force le type de jointures pour les rectangles
QPen p = qp.pen(); QPen p = qp.pen();
p.setJoinStyle(Qt::MiterJoin); p.setJoinStyle(Qt::MiterJoin);
// make component color reverse of back_ground color for contrast
QColor color(Diagram::background_color);
color.setBlue(255 - color.blue());
color.setGreen(255 - color.green());
color.setRed(255 - color.red());
p.setColor(color);
qp.setPen(p); qp.setPen(p);
qp.drawRect(QRectF(rect_x, rect_y, rect_w, rect_h)); qp.drawRect(QRectF(rect_x, rect_y, rect_w, rect_h));
@@ -568,13 +550,6 @@ bool CustomElement::parseText(QDomElement &e, QPainter &qp) {
QFontMetrics qfm(used_font); QFontMetrics qfm(used_font);
QColor text_color = (e.attribute("color") != "white"? Qt::black : Qt::white); QColor text_color = (e.attribute("color") != "white"? Qt::black : Qt::white);
// make component color reverse of back_ground color for contrast
QColor color(Diagram::background_color);
color.setBlue(255 - color.blue());
color.setGreen(255 - color.green());
color.setRed(255 - color.red());
text_color = color;
// instancie un QTextDocument (comme la classe QGraphicsTextItem) pour // instancie un QTextDocument (comme la classe QGraphicsTextItem) pour
// generer le rendu graphique du texte // generer le rendu graphique du texte
QTextDocument text_document; QTextDocument text_document;
@@ -767,13 +742,6 @@ void CustomElement::setPainterStyle(QDomElement &e, QPainter &qp) {
// attributs par defaut // attributs par defaut
pen.setJoinStyle(Qt::BevelJoin); pen.setJoinStyle(Qt::BevelJoin);
pen.setCapStyle(Qt::SquareCap); pen.setCapStyle(Qt::SquareCap);
// make component color reverse of back_ground color for contrast
QColor color(Diagram::background_color);
color.setBlue(255 - color.blue());
color.setGreen(255 - color.green());
color.setRed(255 - color.red());
pen.setColor(color);
// recupere la liste des couples style / valeur // recupere la liste des couples style / valeur
QStringList styles = e.attribute("style").split(";", QString::SkipEmptyParts); QStringList styles = e.attribute("style").split(";", QString::SkipEmptyParts);
@@ -828,8 +796,6 @@ void CustomElement::setPainterStyle(QDomElement &e, QPainter &qp) {
pen.setColor(Qt::green); pen.setColor(Qt::green);
} }
} }
// make component color reverse of back_ground color for contrast
pen.setColor(color);
} }
} }

5
sources/qetgraphicsitem/diagramtextitem.cpp
View File

@@ -198,11 +198,6 @@ void DiagramTextItem::setFontSize(int &s) {
*/ */
void DiagramTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { void DiagramTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
painter -> setRenderHint(QPainter::Antialiasing, false); painter -> setRenderHint(QPainter::Antialiasing, false);
QColor color(Diagram::background_color);
color.setBlue(255 - color.blue());
color.setGreen(255 - color.green());
color.setRed(255 - color.red());
setDefaultTextColor(color);
QGraphicsTextItem::paint(painter, option, widget); QGraphicsTextItem::paint(painter, option, widget);
} }