From 33589e4da49967f3e036c5e88b8b17f8b4a443f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 25 Feb 2019 10:16:55 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@495 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/graphic/graphic.cpp | 2 +- qad/graphic/graphic.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qad/graphic/graphic.cpp b/qad/graphic/graphic.cpp index c53be95..59c6c42 100644 --- a/qad/graphic/graphic.cpp +++ b/qad/graphic/graphic.cpp @@ -480,7 +480,7 @@ void Graphic::clear() { graphics[i].max_x = 0.; graphics[i].cvrect = QRectF(); } - on_buttonAutofit_clicked(); + if (isFit) on_buttonAutofit_clicked(); } diff --git a/qad/graphic/graphic.h b/qad/graphic/graphic.h index 55bf1aa..6bff77c 100644 --- a/qad/graphic/graphic.h +++ b/qad/graphic/graphic.h @@ -291,8 +291,8 @@ public slots: void addPoint(const QPointF & p, bool update = true) {addPoint(p, curGraphic, update);} void addPoint(double x, double y, int graphic, bool update = true) {addPoint(QPointF(x, y), graphic, update);} void addPoint(double x, double y, bool update = true) {addPoint(QPointF(x, y), update);} - void addPoint(double y, int graphic, bool update = true) {addPoint(QPointF(graphics.at(graphic).max_x + inc_x, y), graphic, update);} - void addPoint(double y, bool update = true) {addPoint(QPointF(graphics[curGraphic].max_x + inc_x, y), update);} + void addPoint(double y, int graphic, bool update = true) {if (graphics[graphic].polyline.isEmpty()) addPoint(QPointF(0.0, y), graphic, update); else addPoint(QPointF(graphics[graphic].max_x + inc_x, y), graphic, update);} + void addPoint(double y, bool update = true) {if (graphics[curGraphic].polyline.isEmpty()) addPoint(QPointF(0.0, y), update); else addPoint(QPointF(graphics[curGraphic].max_x + inc_x, y), update);} void setGraphicData(const QVector & g, int graphic, bool update_ = true); void setGraphicData(const QVector & g) {setGraphicData(g, curGraphic);} void setGraphicProperties(const QString & name, const QColor & color = Qt::darkRed, Qt::PenStyle style = Qt::SolidLine, double width = 0., bool visible = true) {setGraphicProperties(curGraphic, name, color, style, width, visible);}