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

This commit is contained in:
2015-10-13 11:39:55 +00:00
parent cf997d59ba
commit df9cfd3720

View File

@@ -192,7 +192,7 @@ void Graphic::canvasPaintEvent(QPaintEvent * ) {
lasth = hei; lasth = hei;
font_sz = fontMetrics().size(0, "0"); font_sz = fontMetrics().size(0, "0");
font_sz.setHeight(font_sz.height() * 1.); font_sz.setHeight(font_sz.height() * 1.);
font_sz.setWidth(font_sz.width() * 7); font_sz.setWidth(font_sz.width() * 8);
thick = qMax<int>(qRound(font_sz.height() / 15.), 1); thick = qMax<int>(qRound(font_sz.height() / 15.), 1);
if (buffer != 0) if (buffer->width() != wid || buffer->height() != hei) {delete buffer; buffer = 0;} if (buffer != 0) if (buffer->width() != wid || buffer->height() != hei) {delete buffer; buffer = 0;}
if (buffer == 0) buffer = new QImage(wid, hei, QImage::Format_RGB32); if (buffer == 0) buffer = new QImage(wid, hei, QImage::Format_RGB32);
@@ -854,7 +854,7 @@ void Graphic::drawGrid() {
cx = gbx - 5; cx = gbx - 5;
grid_pen.setWidth(qMax<int>(qRound(thick / 1.4), 1)); grid_pen.setWidth(qMax<int>(qRound(thick / 1.4), 1));
QFont nf = font(), sf = font(); QFont nf = font(), sf = font();
sf.setPointSizeF(sf.pointSizeF() / 1.6); sf.setPointSizeF(qMax<qreal>(sf.pointSizeF() / 1.6, 7.));
QFontMetrics fm(nf), sfm(sf); QFontMetrics fm(nf), sfm(sf);
if (step > 0.) { if (step > 0.) {
cnt = 1000; cnt = 1000;