From eb4a92f90da00da7fc4b374b07372df02e6c5f8a 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: Thu, 6 Jul 2017 18:41:54 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@246 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/graphic/graphic.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/qad/graphic/graphic.cpp b/qad/graphic/graphic.cpp index 5647d54..59cefde 100644 --- a/qad/graphic/graphic.cpp +++ b/qad/graphic/graphic.cpp @@ -1361,9 +1361,19 @@ void Graphic::updateLegend(bool es) { // qDebug() << "updateLegend" << graphics.size(); leg_update = false; int ps = 100; + for (int r = 0; r < ui->layoutLegend->rowCount(); ++r) + for (int c = 0; c < ui->layoutLegend->columnCount(); ++c) { + QLayoutItem * li = ui->layoutLegend->itemAtPosition(r, c); + if (!li) continue; + if (!li->widget()) continue; + while (li->widget()->actions().isEmpty()) + li->widget()->removeAction(li->widget()->actions()[0]); + delete li->widget(); + } + ui->layoutLegend->invalidate(); for (int i = 0; i < graphics.size(); i++) { - while (!graphics[i].pb->actions().isEmpty()) graphics[i].pb->removeAction(graphics[i].pb->actions()[0]); - delete graphics[i].pb; + /*while (!graphics[i].pb->actions().isEmpty()) graphics[i].pb->removeAction(graphics[i].pb->actions()[0]); + graphics[i].pb->deleteLater();*/ // qDebug() << "new legend item" << graphics[i].name; QPixmap pix(60, 22); pix.fill(back_color);