kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-05-10 11:09:59 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cross ref item:reduce table and redrawing symbolic by joshua

Browse Source 
Basic shapes: workaround,pen set with 1px only in Win OS


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2944 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2014-03-21 02:28:47 +00:00
parent 5760403f11
commit 0570862e41
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
sources/qetgraphicsitem/crossrefitem.cpp
View File

@@ -20,6 +20,9 @@
#include "qetapp.h" #include "qetapp.h"
#include "diagramposition.h" #include "diagramposition.h"
//define the height of the header.
#define header 5
/** /**
* @brief CrossRefItem::CrossRefItem * @brief CrossRefItem::CrossRefItem
* Default constructor * Default constructor
@@ -54,36 +57,35 @@ void CrossRefItem::updateLabel() {
QPainter qp(&drawing_); QPainter qp(&drawing_);
QPen pen_; QPen pen_;
pen_.setWidthF(0.2); pen_.setWidthF(0.2);
pen_.setCosmetic(true);
qp.setPen(pen_); qp.setPen(pen_);
//calcul the size //calcul the size
setUpBoundingRect(); setUpBoundingRect();
//draw the cross //draw the cross
qp.drawLine(30, 0, 30, boundingRect().height()); //vertical line qp.drawLine(boundingRect().width()/2, 0, boundingRect().width()/2, boundingRect().height()); //vertical line
qp.drawLine(0, 5, boundingRect().width(), 5); //horizontal line qp.drawLine(0, header, boundingRect().width(), header); //horizontal line
//draw the symbolic NO //draw the symbolic NO
qp.drawLine(11, 2, 14, 2); qp.drawLine(5, 3, 10, 3);
static const QPointF p1[3] = { static const QPointF p1[3] = {
QPointF(14, 1), QPointF(10, 0),
QPointF(16, 2), QPointF(15, 3),
QPointF(18, 2), QPointF(20, 3),
}; };
qp.drawPolyline(p1,3); qp.drawPolyline(p1,3);
//draw the symbolic NC //draw the symbolic NC
static const QPointF p2[3] = { static const QPointF p2[3] = {
QPointF(36, 2), QPointF(30, 3),
QPointF(39, 2), QPointF(35, 3),
QPointF(39, 0), QPointF(35, 0),
}; };
qp.drawPolyline(p2,3); qp.drawPolyline(p2,3);
static const QPointF p3[3] = { static const QPointF p3[3] = {
QPointF(38, 0), QPointF(34, 0),
QPointF(41, 2), QPointF(40, 3),
QPointF(43, 2), QPointF(45, 3),
}; };
qp.drawPolyline(p3,3); qp.drawPolyline(p3,3);
@@ -155,8 +157,8 @@ void CrossRefItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
t.setCosmetic(true); t.setCosmetic(true);
painter -> setPen(t); painter -> setPen(t);
painter -> setRenderHint(QPainter::Antialiasing, false); painter -> setRenderHint(QPainter::Antialiasing, false);
painter->drawRect(boundingRect()); painter -> drawRect(boundingRect());
painter->restore(); painter -> restore();
} }
drawing_.play(painter); drawing_.play(painter);
} }
@@ -189,7 +191,7 @@ void CrossRefItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) {
*/ */
void CrossRefItem::setUpBoundingRect() { void CrossRefItem::setUpBoundingRect() {
//this is the default size of cross ref item //this is the default size of cross ref item
QRectF default_bounding(0, 0, 60, 50); QRectF default_bounding(0, 0, 50, 40);
//No need to calcul if nothing is linked //No need to calcul if nothing is linked
if (!element_->isFree()) { if (!element_->isFree()) {
@@ -211,7 +213,7 @@ void CrossRefItem::setUpBoundingRect() {
//increase the height of bounding rect, //increase the height of bounding rect,
//according to the number of slave item less 4. //according to the number of slave item less 4.
i-=4; i-=4;
default_bounding.setHeight(default_bounding.height() + (i*9)); default_bounding.setHeight(default_bounding.height() + (i*8));
} }
} }
@@ -236,8 +238,8 @@ void CrossRefItem::fillCrossRef(QPainter *painter) {
else if (state == "NC") NC_list << elmt; else if (state == "NC") NC_list << elmt;
} }
painter -> setFont(QETApp::diagramTextsFont(4)); painter -> setFont(QETApp::diagramTextsFont(5));
painter -> setRenderHint(QPainter::Antialiasing, false); qreal half_cross = boundingRect().width()/2;
//fill the NO //fill the NO
QString contact_str; QString contact_str;
foreach (Element *elmt, NO_list) { foreach (Element *elmt, NO_list) {
@@ -246,8 +248,8 @@ void CrossRefItem::fillCrossRef(QPainter *painter) {
contact_str += elmt->diagram()->convertPosition(elmt -> scenePos()).toString(); contact_str += elmt->diagram()->convertPosition(elmt -> scenePos()).toString();
contact_str += "\n"; contact_str += "\n";
} }
QRectF rect_(0, 10, 26, (boundingRect().height()-10)); QRectF rect_(3, header, half_cross, (boundingRect().height()-header));
painter->drawText(rect_, Qt::AlignHCenter, contact_str); painter->drawText(rect_, Qt::AlignTop | Qt::AlignLeft, contact_str);
//fill the NC //fill the NC
contact_str.clear(); contact_str.clear();
@@ -257,6 +259,6 @@ void CrossRefItem::fillCrossRef(QPainter *painter) {
contact_str += elmt->diagram()->convertPosition(elmt -> scenePos()).toString(); contact_str += elmt->diagram()->convertPosition(elmt -> scenePos()).toString();
contact_str += "\n"; contact_str += "\n";
} }
rect_.setRect(28, 10, 28, (boundingRect().height()-10)); rect_.setRect(half_cross+3 , header, half_cross, (boundingRect().height()-header));
painter->drawText(rect_, Qt::AlignHCenter, contact_str); painter -> drawText(rect_, Qt::AlignTop | Qt::AlignLeft, contact_str);
} }

5
sources/qetgraphicsitem/qetshapeitem.cpp
View File

@@ -104,7 +104,10 @@ void QetShapeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
painter -> setRenderHint(QPainter::Antialiasing, false); painter -> setRenderHint(QPainter::Antialiasing, false);
QRectF rec = boundingRect(); QRectF rec = boundingRect();
QPen pen(Qt::black); QPen pen(Qt::black);
pen.setWidthF(1.0);
#ifdef Q_WS_WIN
pen.setWidthF(1);
#endif
if (isSelected()) if (isSelected())
pen.setColor(Qt::red); pen.setColor(Qt::red);