mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-18 05:00:33 +01:00
Amelioration du rendu dans l'editeur d'element lorsque le zoom est inferieur a 1:1.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@597 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
@@ -48,11 +48,14 @@ PartArc::~PartArc() {
|
|||||||
@param options Options pour affiner le rendu
|
@param options Options pour affiner le rendu
|
||||||
@param widget Widget sur lequel le rendu est effectue
|
@param widget Widget sur lequel le rendu est effectue
|
||||||
*/
|
*/
|
||||||
void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) {
|
void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *) {
|
||||||
applyStylesToQPainter(*painter);
|
applyStylesToQPainter(*painter);
|
||||||
// enleve systematiquement la couleur de fond
|
// enleve systematiquement la couleur de fond
|
||||||
painter -> setBrush(Qt::NoBrush);
|
painter -> setBrush(Qt::NoBrush);
|
||||||
QPen t = painter -> pen();
|
QPen t = painter -> pen();
|
||||||
|
t.setCosmetic(options && options -> levelOfDetail < 1.0);
|
||||||
|
painter -> setPen(t);
|
||||||
|
|
||||||
if (isSelected()) {
|
if (isSelected()) {
|
||||||
// dessine l'ellipse en noir
|
// dessine l'ellipse en noir
|
||||||
painter -> drawEllipse(rect());
|
painter -> drawEllipse(rect());
|
||||||
@@ -61,6 +64,7 @@ void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget
|
|||||||
t.setColor(Qt::red);
|
t.setColor(Qt::red);
|
||||||
painter -> setPen(t);
|
painter -> setPen(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
painter -> drawArc(rect(), start_angle * 16, _angle * 16);
|
painter -> drawArc(rect(), start_angle * 16, _angle * 16);
|
||||||
if (isSelected()) {
|
if (isSelected()) {
|
||||||
// dessine la croix au centre de l'ellipse
|
// dessine la croix au centre de l'ellipse
|
||||||
|
|||||||
@@ -43,13 +43,14 @@ PartCircle::~PartCircle() {
|
|||||||
@param options Options pour affiner le rendu
|
@param options Options pour affiner le rendu
|
||||||
@param widget Widget sur lequel le rendu est effectue
|
@param widget Widget sur lequel le rendu est effectue
|
||||||
*/
|
*/
|
||||||
void PartCircle::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) {
|
void PartCircle::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *) {
|
||||||
applyStylesToQPainter(*painter);
|
applyStylesToQPainter(*painter);
|
||||||
QPen t = painter -> pen();
|
QPen t = painter -> pen();
|
||||||
|
t.setCosmetic(options && options -> levelOfDetail < 1.0);
|
||||||
if (isSelected()) {
|
if (isSelected()) {
|
||||||
t.setColor(Qt::red);
|
t.setColor(Qt::red);
|
||||||
painter -> setPen(t);
|
|
||||||
}
|
}
|
||||||
|
painter -> setPen(t);
|
||||||
painter -> drawEllipse(rect());
|
painter -> drawEllipse(rect());
|
||||||
if (isSelected()) {
|
if (isSelected()) {
|
||||||
painter -> setRenderHint(QPainter::Antialiasing, false);
|
painter -> setRenderHint(QPainter::Antialiasing, false);
|
||||||
|
|||||||
@@ -43,13 +43,14 @@ PartEllipse::~PartEllipse() {
|
|||||||
@param options Options pour affiner le rendu
|
@param options Options pour affiner le rendu
|
||||||
@param widget Widget sur lequel le rendu est effectue
|
@param widget Widget sur lequel le rendu est effectue
|
||||||
*/
|
*/
|
||||||
void PartEllipse::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) {
|
void PartEllipse::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *) {
|
||||||
applyStylesToQPainter(*painter);
|
applyStylesToQPainter(*painter);
|
||||||
QPen t = painter -> pen();
|
QPen t = painter -> pen();
|
||||||
|
t.setCosmetic(options && options -> levelOfDetail < 1.0);
|
||||||
if (isSelected()) {
|
if (isSelected()) {
|
||||||
t.setColor(Qt::red);
|
t.setColor(Qt::red);
|
||||||
painter -> setPen(t);
|
|
||||||
}
|
}
|
||||||
|
painter -> setPen(t);
|
||||||
painter -> drawEllipse(rect());
|
painter -> drawEllipse(rect());
|
||||||
if (isSelected()) {
|
if (isSelected()) {
|
||||||
painter -> setRenderHint(QPainter::Antialiasing, false);
|
painter -> setRenderHint(QPainter::Antialiasing, false);
|
||||||
|
|||||||
@@ -65,12 +65,13 @@ uint PartLine::requiredLengthForEndType(const QET::EndType &end_type) {
|
|||||||
@param options Options pour affiner le rendu
|
@param options Options pour affiner le rendu
|
||||||
@param widget Widget sur lequel le rendu est effectue
|
@param widget Widget sur lequel le rendu est effectue
|
||||||
*/
|
*/
|
||||||
void PartLine::paint(QPainter *painter, const QStyleOptionGraphicsItem */*q*/, QWidget */*w*/) {
|
void PartLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget */*w*/) {
|
||||||
// inutile de dessiner une ligne nulle
|
// inutile de dessiner une ligne nulle
|
||||||
if (line().p1() == line().p2()) return;
|
if (line().p1() == line().p2()) return;
|
||||||
applyStylesToQPainter(*painter);
|
applyStylesToQPainter(*painter);
|
||||||
QPen t = painter -> pen();
|
QPen t = painter -> pen();
|
||||||
t.setJoinStyle(Qt::MiterJoin);
|
t.setJoinStyle(Qt::MiterJoin);
|
||||||
|
t.setCosmetic(options && options -> levelOfDetail < 1.0);
|
||||||
if (isSelected()) {
|
if (isSelected()) {
|
||||||
t.setColor(Qt::red);
|
t.setColor(Qt::red);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,13 +94,12 @@ const QDomElement PartPolygon::toXml(QDomDocument &xml_document) const {
|
|||||||
@param options Options pour affiner le rendu
|
@param options Options pour affiner le rendu
|
||||||
@param widget Widget sur lequel le rendu est effectue
|
@param widget Widget sur lequel le rendu est effectue
|
||||||
*/
|
*/
|
||||||
void PartPolygon::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) {
|
void PartPolygon::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *) {
|
||||||
applyStylesToQPainter(*painter);
|
applyStylesToQPainter(*painter);
|
||||||
QPen t = painter -> pen();
|
QPen t = painter -> pen();
|
||||||
if (isSelected()) {
|
t.setCosmetic(options && options -> levelOfDetail < 1.0);
|
||||||
t.setColor(Qt::red);
|
if (isSelected()) t.setColor(Qt::red);
|
||||||
painter -> setPen(t);
|
painter -> setPen(t);
|
||||||
}
|
|
||||||
if (closed) painter -> drawPolygon(polygon());
|
if (closed) painter -> drawPolygon(polygon());
|
||||||
else painter -> drawPolyline(polygon());
|
else painter -> drawPolyline(polygon());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,9 +43,10 @@ PartRectangle::~PartRectangle() {
|
|||||||
@param options Options pour affiner le rendu
|
@param options Options pour affiner le rendu
|
||||||
@param widget Widget sur lequel le rendu est effectue
|
@param widget Widget sur lequel le rendu est effectue
|
||||||
*/
|
*/
|
||||||
void PartRectangle::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) {
|
void PartRectangle::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *) {
|
||||||
applyStylesToQPainter(*painter);
|
applyStylesToQPainter(*painter);
|
||||||
QPen t = painter -> pen();
|
QPen t = painter -> pen();
|
||||||
|
t.setCosmetic(options && options -> levelOfDetail < 1.0);
|
||||||
if (isSelected()) {
|
if (isSelected()) {
|
||||||
t.setColor(Qt::red);
|
t.setColor(Qt::red);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ QWidget *PartTerminal::elementInformations() {
|
|||||||
@param options Options pour affiner le rendu
|
@param options Options pour affiner le rendu
|
||||||
@param widget Widget sur lequel le rendu est effectue
|
@param widget Widget sur lequel le rendu est effectue
|
||||||
*/
|
*/
|
||||||
void PartTerminal::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *) {
|
void PartTerminal::paint(QPainter *p, const QStyleOptionGraphicsItem *options, QWidget *) {
|
||||||
p -> save();
|
p -> save();
|
||||||
|
|
||||||
// annulation des renderhints
|
// annulation des renderhints
|
||||||
@@ -100,6 +100,7 @@ void PartTerminal::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget
|
|||||||
|
|
||||||
QPen t;
|
QPen t;
|
||||||
t.setWidthF(1.0);
|
t.setWidthF(1.0);
|
||||||
|
t.setCosmetic(options && options -> levelOfDetail < 1.0);
|
||||||
|
|
||||||
// dessin de la borne en rouge
|
// dessin de la borne en rouge
|
||||||
t.setColor(isSelected() ? Terminal::couleur_neutre : Qt::red);
|
t.setColor(isSelected() ? Terminal::couleur_neutre : Qt::red);
|
||||||
|
|||||||
Reference in New Issue
Block a user