diff --git a/make_android.bat b/make_android.bat index 9e67e1d..809c5c7 100644 --- a/make_android.bat +++ b/make_android.bat @@ -1,4 +1,4 @@ -set Qt5_ROOT=d:\Qt\5.10.0\android_armv7\lib\cmake\ +set Qt5_ROOT=d:\Qt\5.11.0\android_armv7\lib\cmake\ set Qt5_DIR=%Qt5_ROOT%\Qt5 set Qt5LinguistTools_DIR=%Qt5_ROOT%\Qt5LinguistTools set Qt5UiPlugin_DIR=%Qt5_ROOT%\Qt5UiPlugin diff --git a/qad/graphic/graphic.cpp b/qad/graphic/graphic.cpp index 20252e7..d687ac4 100644 --- a/qad/graphic/graphic.cpp +++ b/qad/graphic/graphic.cpp @@ -1050,7 +1050,7 @@ void Graphic::drawGraphics() { if (isHover) ui->status->setText(tr("Cursor: ") + pointCoords(canvas2real(QPointF(curpos)))); QPointF srp = -selrect.topLeft(), cp; - double sclx, scly, wid = canvas->width(), hei = canvas->height() - legy, pw; + double sclx, scly, wid = canvas->width(), hei = canvas->height() - legy; sclx = (wid - gridborder.x() - margins_.left() - margins_.width()) / selrect.width(); scly = (hei - gridborder.y() - margins_.top() - margins_.height()) / selrect.height(); painter->setClipping(true); @@ -1063,14 +1063,17 @@ void Graphic::drawGraphics() { painter->resetTransform(); painter->setWorldMatrixEnabled(false); QPolygonF cpol; + QPen pen; for (int i = 0; i < graphics.size(); ++i) { GraphicType & t(graphics[i]); QPolygonF & rpol(pause_ ? t.polyline_pause : t.polyline); if (t.visible && !rpol.isEmpty()) { - pw = t.pen.widthF(); + pen = t.pen; + if (qRound(pen.widthF()) == pen.widthF()) pen.setWidth(pen.width()*thick); + else pen.setWidthF(pen.widthF()*thick); + pen.setCosmetic(true); if (t.lines) { - t.pen.setCosmetic(true); - painter->setPen(t.pen); + painter->setPen(pen); if (t.fill) { cpol = rpol; painter->setBrush(t.fill_color); @@ -1081,13 +1084,10 @@ void Graphic::drawGraphics() { painter->drawPolyline(mat.map(rpol)); } if (t.points) { - if (qRound(t.pointWidth) == t.pointWidth) t.pen.setWidth(qRound(t.pointWidth)); - else t.pen.setWidthF(t.pointWidth); - t.pen.setCosmetic(true); - painter->setPen(t.pen); + if (qRound(t.pointWidth) == t.pointWidth) pen.setWidth(qRound(t.pointWidth*thick)); + else pen.setWidthF(t.pointWidth*thick); + painter->setPen(pen); painter->drawPoints(mat.map(rpol)); - if (qRound(pw) == pw) t.pen.setWidth(qRound(pw)); - else t.pen.setWidthF(pw); } } }