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

git-svn-id: svn://db.shs.com.ru/libs@289 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2017-10-03 14:11:58 +00:00
parent 90d8a5f1a0
commit e91cd3d941
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qad/graphic/graphic.cpp
View File

@@ -870,7 +870,7 @@ void Graphic::drawGrid() {
py = start + step; py = start + step;
cy = 0; cy = 0;
cx = gbx - 5; cx = gbx - 5;
grid_pen.setWidth(qMax<int>(qRound(thick / 1.4), 1)); grid_pen.setWidth(qMax<int>(qMax<int>(qRound(thick / 1.4), 1), grid_pen.width()));
QFont sf = font(); QFont sf = font();
QFont nf = sf; QFont nf = sf;
sf.setPointSizeF(qMax<qreal>(sf.pointSizeF() / 1.6, 7.)); sf.setPointSizeF(qMax<qreal>(sf.pointSizeF() / 1.6, 7.));
@@ -994,7 +994,7 @@ void Graphic::drawGrid() {
painter->drawText(gbx, chei - font_sz.height(), wid, font_sz.height(), Qt::AlignCenter, label_x); painter->drawText(gbx, chei - font_sz.height(), wid, font_sz.height(), Qt::AlignCenter, label_x);
} }
painter->setPen(QPen(grid_pen.color(), thick)); painter->setPen(QPen(grid_pen.color(), qMax<int>(thick, grid_pen.width())));
painter->drawRect(gbx, -1, wid + 6, hei + 6); painter->drawRect(gbx, -1, wid + 6, hei + 6);
} }