From 81d21c20845c6634950fd5297f87cc40a7f43717 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: Tue, 4 Apr 2017 15:03:29 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@175 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad_blockview/blockeditor.cpp | 7 +++++++ qad_blockview/blockeditor.h | 1 + qad_blockview/blockitem.cpp | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/qad_blockview/blockeditor.cpp b/qad_blockview/blockeditor.cpp index 737a854..2bd4560 100644 --- a/qad_blockview/blockeditor.cpp +++ b/qad_blockview/blockeditor.cpp @@ -248,6 +248,7 @@ void BlockEditor::on_treePins_itemChanged(QTreeWidgetItem * item, int column) { void BlockEditor::arrangePins() { QVector pins = block.pins(); +// block.clearPins(); QList tli = pin_tli.values(); foreach (QTreeWidgetItem * ti, tli) { for (int i = 0; i < ti->childCount(); ++i) { @@ -338,3 +339,9 @@ void PinBusDelegate::setModelData(QWidget * editor, QAbstractItemModel * model, model->setData(index, ((QSpinBox*)editor)->value()); } + + +//void BlockEditor::on_treePins_itemSelectionChanged() { +// arrangePins(); +// qDebug() << "111111111111111"; +//} diff --git a/qad_blockview/blockeditor.h b/qad_blockview/blockeditor.h index e0a5234..71388b8 100644 --- a/qad_blockview/blockeditor.h +++ b/qad_blockview/blockeditor.h @@ -40,6 +40,7 @@ private slots: void on_buttonPinDelete_clicked(); void on_buttonPinClear_clicked(); void on_treePins_itemChanged(QTreeWidgetItem *item, int column); +// void on_treePins_itemSelectionChanged(); private: bool eventFilter(QObject * o, QEvent * e); diff --git a/qad_blockview/blockitem.cpp b/qad_blockview/blockitem.cpp index 9477674..e5ae0b3 100644 --- a/qad_blockview/blockitem.cpp +++ b/qad_blockview/blockitem.cpp @@ -139,7 +139,7 @@ void BlockItem::_resize(QSizeF s) { BlockItemPin * BlockItem::addPin(BlockItemPin * pin, bool update_) { pin->setParentItem(this); - pins_[pin->alignment()] << pin; + if (!pins_[pin->alignment()].contains(pin)) pins_[pin->alignment()] << pin; pin->parent_ = this; if (update_) arrangePins();