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

cross ref item: use symbolic contact instead of text NO NC (No need to translate, understand everywhere)

Browse Source 
Element selector widget: add label of element.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2929 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-03-17 17:58:04 +00:00
parent 9b53bbeca0
commit 0d536f9c21
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sources/qetgraphicsitem/crossrefitem.cpp
View File

@@ -63,12 +63,37 @@ void CrossRefItem::updateLabel() {
qp.drawLine(30, 0, 30, boundingRect().height()); //vertical line qp.drawLine(30, 0, 30, boundingRect().height()); //vertical line
qp.drawLine(0, 10, boundingRect().width(), 10); //horizontal line qp.drawLine(0, 10, boundingRect().width(), 10); //horizontal line
//draw the symbolic NO
qp.drawLine(2, 5, 10, 5);
static const QPointF p1[3] = {
QPointF(10, 8),
QPointF(18, 5),
QPointF(26, 5),
};
qp.drawPolyline(p1,3);
//draw the symbolic NC
static const QPointF p2[3] = {
QPointF(34, 5),
QPointF(42, 5),
QPointF(42, 0),
};
qp.drawPolyline(p2,3);
static const QPointF p3[3] = {
QPointF(40, 0),
QPointF(50, 5),
QPointF(58, 5),
};
qp.drawPolyline(p3,3);
///keep this code for possible next feature
///choice to use symbolic or text.
//draw the header //draw the header
qp.setFont(QETApp::diagramTextsFont(7)); /*qp.setFont(QETApp::diagramTextsFont(7));
QRectF header_rect (0,0,30,10); QRectF header_rect (0,0,30,10);
qp.drawText(header_rect, Qt::AlignCenter, "NO"); qp.drawText(header_rect, Qt::AlignCenter, "NO");
header_rect.setRect(30, 0, 30, 10); header_rect.setRect(30, 0, 30, 10);
qp.drawText(header_rect, Qt::AlignCenter, "NC"); qp.drawText(header_rect, Qt::AlignCenter, "NC");*/
//and fill it //and fill it
fillCrossRef(&qp); fillCrossRef(&qp);

6
sources/ui/elementselectorwidget.cpp
View File

@@ -105,6 +105,12 @@ void ElementSelectorWidget::buildInterface() {
foreach (Element *elmt, elements_list) { foreach (Element *elmt, elements_list) {
//label for the button //label for the button
QString button_text; QString button_text;
//if element is master and have label, add label to the string
if (elmt->linkType() & Element::Master) {
QString label = elmt->elementInformations()["label"].toString();
if (!label.isEmpty()) button_text += (label + " ");
}
QString title = elmt->diagram()->title(); QString title = elmt->diagram()->title();
if (title.isEmpty()) title = tr("Sans titre"); if (title.isEmpty()) title = tr("Sans titre");
button_text += QString(tr("Folio\240 %1 (%2), position %3.")).arg(elmt->diagram()->folioIndex() + 1) button_text += QString(tr("Folio\240 %1 (%2), position %3.")).arg(elmt->diagram()->folioIndex() + 1)