master #62

Merged
andrey merged 3 commits from master into release 2020-08-13 18:09:22 +03:00
3 changed files with 3 additions and 4 deletions

2
pip

Submodule pip updated: 31a347250f...e76a07a3f3

View File

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

View File

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