SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Graphic now index-safe

Browse Source
This commit is contained in:
Пелипенко Иван
2024-01-19 14:50:21 +03:00
parent 33f4394243
commit 4c7b9444b6
2 changed files with 124 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
libs/graphic/graphic.h
View File

@@ -174,34 +174,34 @@ public:
QString caption() const;
QString labelX() const { return label_x; }
QString labelY() const { return label_y; }
QString graphicName() const { return graphics[curGraphic].name; }
QString graphicName(int index) const { return graphics[index].name; }
QString graphicName() const { return graphicName(curGraphic); }
QString graphicName(int index) const;
QColor backgroundColor() const { return back_color; }
QColor textColor() const { return text_color; }
QColor graphicColor() const { return graphics[curGraphic].pen.color(); }
QColor graphicColor(int index) const { return graphics[index].pen.color(); }
QColor graphicColor() const { return graphicColor(curGraphic); }
QColor graphicColor(int index) const;
QColor gridColor() const { return grid_pen.color(); }
QColor selectionColor() const { return selpen.color(); }
Qt::PenStyle graphicStyle() const { return graphics[curGraphic].pen.style(); }
Qt::PenStyle graphicStyle(int index) const { return graphics[index].pen.style(); }
Qt::PenStyle graphicStyle() const { return graphicStyle(curGraphic); }
Qt::PenStyle graphicStyle(int index) const;
Qt::PenStyle gridStyle() const { return grid_pen.style(); }
Qt::PenStyle selectionStyle() const { return selpen.style(); }
double graphicLineWidth() const { return graphics[curGraphic].pen.widthF(); }
double graphicLineWidth(int index) const { return graphics[index].pen.widthF(); }
double graphicPointWidth() const { return graphics[curGraphic].pointWidth; }
double graphicPointWidth(int index) const { return graphics[index].pointWidth; }
QColor graphicFillColor() const { return graphics[curGraphic].fill_color; }
QColor graphicFillColor(int index) const { return graphics[index].fill_color; }
bool graphicVisible() const { return graphics[curGraphic].visible; }
bool graphicVisible(int index) const { return graphics[index].visible; }
bool graphicLinesEnabled() const { return graphics[curGraphic].lines; }
bool graphicLinesEnabled(int index) const { return graphics[index].lines; }
bool graphicPointsEnabled() const { return graphics[curGraphic].points; }
bool graphicPointsEnabled(int index) const { return graphics[index].points; }
bool graphicFillEnabled() const { return graphics[curGraphic].fill; }
bool graphicFillEnabled(int index) const { return graphics[index].fill; }
QPen graphicPen() const { return graphics[curGraphic].pen; }
QPen graphicPen(int index) const { return graphics[index].pen; }
double graphicLineWidth() const { return graphicLineWidth(curGraphic); }
double graphicLineWidth(int index) const;
double graphicPointWidth() const { return graphicPointWidth(curGraphic); }
double graphicPointWidth(int index) const;
QColor graphicFillColor() const { return graphicFillColor(curGraphic); }
QColor graphicFillColor(int index) const;
bool graphicVisible() const { return graphicVisible(curGraphic); }
bool graphicVisible(int index) const;
bool graphicLinesEnabled() const { return graphicLinesEnabled(curGraphic); }
bool graphicLinesEnabled(int index) const;
bool graphicPointsEnabled() const { return graphicPointsEnabled(curGraphic); }
bool graphicPointsEnabled(int index) const;
bool graphicFillEnabled() const { return graphicFillEnabled(curGraphic); }
bool graphicFillEnabled(int index) const;
QPen graphicPen() const { return graphicPen(curGraphic); }
QPen graphicPen(int index) const;
QPen gridPen() const { return grid_pen; }
QPen selectionPen() const { return selpen; }
QBrush selectionBrush() const { return selbrush; }
@@ -239,8 +239,8 @@ public:
double graduationStepY() const { return gridy; }
AxisType axisType() const { return axis_type_x; }
FloatingAxisType floatingAxisType() const { return floating_axis_type; }
QVector<QPointF> graphicData() const { return graphics[curGraphic].polyline; }
QVector<QPointF> graphicData(int index) const { return graphics[index].polyline; }
QVector<QPointF> graphicData() const { return graphicData(curGraphic); }
QVector<QPointF> graphicData(int index) const;
GraphicsData graphicsData() const;
QByteArray graphicsDataRaw() const;
QWidget * viewport() const { return canvas; }
@@ -433,6 +433,7 @@ protected:
QPair<QString, QString> gridMark(double v) const;
void fillDateFormats();
void askForExport(bool view_only);
bool checkGraphicIndex(int index) const;
Ui::Graphic * ui;
UGLWidget * canvas_gl;