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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2017-06-14 20:21:56 +00:00
parent 2ff23db796
commit 395c65142a
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
qad/graphic/graphic.cpp
View File

@@ -1356,6 +1356,7 @@ void Graphic::updateLegend() {
for (int i = 0; i < graphics.size(); i++) { for (int i = 0; i < graphics.size(); i++) {
while (!graphics[i].pb->actions().isEmpty()) graphics[i].pb->removeAction(graphics[i].pb->actions()[0]); while (!graphics[i].pb->actions().isEmpty()) graphics[i].pb->removeAction(graphics[i].pb->actions()[0]);
delete graphics[i].pb; delete graphics[i].pb;
//qDebug() << "new legend item" << graphics[i].name;
QPixmap pix(60, 22); QPixmap pix(60, 22);
pix.fill(back_color); pix.fill(back_color);
QPainter p(&pix); QPainter p(&pix);
@@ -1394,6 +1395,16 @@ void Graphic::updateLegend() {
} }
void Graphic::updateLegendChecks() {
for (int i = 0; i < graphics.size(); i++) {
if (!graphics[i].pb) continue;
bool pbs = graphics[i].pb->blockSignals(true);
graphics[i].pb->setChecked(graphics[i].visible);
graphics[i].pb->blockSignals(pbs);
}
}
void Graphic::graphicVisibleChange(bool checked) { void Graphic::graphicVisibleChange(bool checked) {
if (visible_update) return; if (visible_update) return;
QCheckBox * cb = qobject_cast<QCheckBox*>(sender()); QCheckBox * cb = qobject_cast<QCheckBox*>(sender());

3
qad/graphic/graphic.h
View File

@@ -247,7 +247,7 @@ public slots:
void setGraphicStyle(const Qt::PenStyle & style) {graphics[curGraphic].pen.setStyle(style); updateLegend(); if (aupdate) update();} void setGraphicStyle(const Qt::PenStyle & style) {graphics[curGraphic].pen.setStyle(style); updateLegend(); if (aupdate) update();}
void setGridStyle(const Qt::PenStyle & style) {grid_pen.setStyle(style); if (aupdate) update();} void setGridStyle(const Qt::PenStyle & style) {grid_pen.setStyle(style); if (aupdate) update();}
void setSelectionStyle(const Qt::PenStyle & style) {selpen.setStyle(style);} void setSelectionStyle(const Qt::PenStyle & style) {selpen.setStyle(style);}
void setGraphicVisible(bool visible, int index) {graphics[index].visible = visible; updateLegend(); if (aupdate) update();} void setGraphicVisible(bool visible, int index) {graphics[index].visible = visible; updateLegendChecks(); if (aupdate) update();}
void setGraphicVisible(bool visible) {setGraphicVisible(visible, curGraphic);} void setGraphicVisible(bool visible) {setGraphicVisible(visible, curGraphic);}
void setGraphicLineWidth(double w, int index) {if (qRound(w) == w) graphics[index].pen.setWidth(qRound(w)); else graphics[index].pen.setWidthF(w); updateLegend(); if (aupdate) update();} void setGraphicLineWidth(double w, int index) {if (qRound(w) == w) graphics[index].pen.setWidth(qRound(w)); else graphics[index].pen.setWidthF(w); updateLegend(); if (aupdate) update();}
void setGraphicLineWidth(double w) {setGraphicLineWidth(w, curGraphic);} void setGraphicLineWidth(double w) {setGraphicLineWidth(w, curGraphic);}
@@ -349,6 +349,7 @@ protected:
void drawPause(); void drawPause();
void drawAction(); void drawAction();
void updateLegend(); void updateLegend();
void updateLegendChecks();
void setCanvasCursor(QCursor cursor); void setCanvasCursor(QCursor cursor);
void swapToBuffer(); void swapToBuffer();
void swapToNormal() {bufferActive = false;} void swapToNormal() {bufferActive = false;}