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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2017-10-26 21:26:19 +00:00
parent b2b954ccca
commit 0778d092e8
9 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qad/graphic/graphic.cpp
View File

@@ -1,4 +1,5 @@
#include "graphic.h"
#include "qad_types.h"
#include "ui_graphic.h"
#include "ui_graphic_conf.h"
#if QT_VERSION >= 0x050100
@@ -204,7 +205,7 @@ void Graphic::canvasPaintEvent() {
font_sz = fontMetrics().size(0, "0");
font_sz.setHeight(font_sz.height() * 1.);
font_sz.setWidth(font_sz.width() * 8);
thick = qMax<int>(qRound(font_sz.height() / 15.), 1);
thick = lineThickness();
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 (bufferActive) {

3
qad/graphic/graphic_conf.cpp
View File

@@ -1,4 +1,5 @@
#include "graphic_conf.h"
#include "qad_types.h"
#include "ui_graphic_conf.h"
@@ -7,7 +8,7 @@ GraphicConf::GraphicConf(QVector<GraphicType> & graphics_, QWidget * parent): QD
ui->setupUi(this);
QStringList styles;
int fh = qMax<int>(fontMetrics().size(0, "0").height(), 22);
int thick = qMax<int>(qRound(fontMetrics().size(0, "0").height() / 15.), 1);
int thick = lineThickness();
QSize sz(fh * 2.5, fh);
styles << tr("NoPen") << tr("Solid") << tr("Dash")
<< tr("Dot") << tr("Dash-Dot") << tr("Dash-Dot-Dot");