From af1d5daef8b736e1454d58d6560efe3ef5896e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Mon, 24 Sep 2018 09:24:40 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@427 a8b55f48-bf90-11e4-a774-851b48703e85 --- CMakeLists.txt | 3 +++ qad/graphic/graphic.cpp | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfcab2a..f26b2f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,9 @@ include(SDKMacros.cmake) set(LIBPROJECT 1) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/") include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip) +if(APPLE) + include_directories(/usr/local/include) +endif() if(MINGW) find_package(MinGW REQUIRED) endif() diff --git a/qad/graphic/graphic.cpp b/qad/graphic/graphic.cpp index beec644..535e783 100644 --- a/qad/graphic/graphic.cpp +++ b/qad/graphic/graphic.cpp @@ -1459,7 +1459,10 @@ void Graphic::updateLegend(bool es) { QPixmap pix(60, 22); pix.fill(back_color); QPainter p(&pix); - p.setPen(graphics[i].pen); + QPen pen = graphics[i].pen; + if (qRound(pen.widthF()) == pen.widthF()) pen.setWidth(pen.width()*thick); + else pen.setWidthF(pen.widthF()*thick); + p.setPen(pen); p.drawLine(0, pix.height() / 2, pix.width(), pix.height() / 2); p.end(); graphics[i].icon = QIcon(pix);