From 7028802380dcf44d8f628f8694bf4cbc036adb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D1=80=D0=BE=D1=81?= =?UTF-8?q?=D0=BA=D1=83=D1=80=D0=BD=D1=91=D0=B2?= Date: Mon, 11 Jan 2021 14:31:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D1=8F=D0=BC=D0=BE=D1=83=D0=B3?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BD=D0=B8=D0=BA=20=D0=B8=20=D1=8D=D0=BB?= =?UTF-8?q?=D0=BB=D0=B8=D0=BF=D1=81=20-=20=D0=BF=D1=80=D0=BE=D1=82=D0=B8?= =?UTF-8?q?=D0=B2=D0=BE=D0=BF=D0=BE=D0=BB=D0=BE=D0=B6=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D1=83=D0=B3=D0=BB=D1=8B.=20=D0=A1=D1=81=D1=8B=D0=BB=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20Qt=20Creator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ qtsgraph.cpp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/README.md b/README.md index ac61fcc..7cbf090 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@ Предназначен для образовательных целей, чтобы упростить обучающимся рисование простых примитивов. Используются простые и понятные названия процедур отрисовки без использования громоздкой структуры Qt5. +Qt Creator можно скачать бесплатно с официального сайта: +https://www.qt.io/download-qt-installer + Описание на Wiki тут: https://github.com/temaps/qtSimpleGraph/wiki diff --git a/qtsgraph.cpp b/qtsgraph.cpp index 83a4ab4..962638a 100644 --- a/qtsgraph.cpp +++ b/qtsgraph.cpp @@ -50,6 +50,8 @@ void QTSGraph::Ellipse(int x1, int y1, int x2, int y2) QPainter painter(&Canvas); painter.setPen(Pen); painter.setBrush(Brush); + if(y1 > y2) std::swap(y1, y2); + if(x1 > x2) std::swap(x1, x2); if(SwapYAxis) painter.drawEllipse(x1, Canvas.height() - y1 - abs(y2 - y1) - 1, abs(x2-x1), abs(y2-y1)); else painter.drawEllipse(x1, y1, abs(x2-x1), abs(y2-y1)); update(); @@ -176,6 +178,8 @@ void QTSGraph::Rectangle(int x1, int y1, int x2, int y2) QPainter painter(&Canvas); painter.setPen(Pen); painter.setBrush(Brush); + if(y1 > y2) std::swap(y1, y2); + if(x1 > x2) std::swap(x1, x2); if(SwapYAxis) painter.drawRect(x1, Canvas.height() - y1 - abs(y2 - y1) - 1, x2 - x1, y2 - y1); else painter.drawRect(x1, y1, x2 - x1, y2 - y1); update();