SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'master' (#62) from master into release
All checks were successful
SHS Gitea/libs/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: https://git.shs.tools/SHS/libs/pulls/62
This commit was merged in pull request #62.
This commit is contained in:
Бычков Андрей
2020-08-13 18:09:20 +03:00
parent c41e92a9f5 8fbed9f427
commit 12664842c7
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pip

Submodule pip updated: 31a347250f...e76a07a3f3

4
qad/blockview/blockbusitem.cpp
View File

@@ -727,9 +727,7 @@ void BlockBusItem::paint(QPainter * p, const QStyleOptionGraphicsItem * o, QWidg
p->setPen(_pen); p->setPen(_pen);
p->drawLine(pol[segments[i].first], pol[segments[i].second]); p->drawLine(pol[segments[i].first], pol[segments[i].second]);
if (pointSegmentsCount(segments[i].first) > 2) { if (pointSegmentsCount(segments[i].first) > 2) {
_pen.setWidthF(pen_width + 3.); p->drawEllipse(pol[segments[i].first], pen_width*0.7, pen_width*0.7);
p->setPen(_pen);
p->drawPoint(pol[segments[i].first]);
} }
} }
p->setPen(_pen); p->setPen(_pen);

1
qad/widgets/qvariantedit.cpp
View File

@@ -383,6 +383,7 @@ QVariant QVariantEdit::value() const {
ret.file = _path->value(); ret.file = _path->value();
ret.filter = _path->filter; ret.filter = _path->filter;
ret.is_abs = _path->is_abs; ret.is_abs = _path->is_abs;
ret.is_save = _path->is_save;
return QVariant::fromValue<QAD::File>(ret); return QVariant::fromValue<QAD::File>(ret);
} }
} }