From 644d7460023fcf20d81a7d561e66b32f8949834a 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: Wed, 6 Dec 2017 08:20:14 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@339 a8b55f48-bf90-11e4-a774-851b48703e85 --- piqt_utils/qpiconnection.cpp | 1 + qad/blockview/blockitem.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/piqt_utils/qpiconnection.cpp b/piqt_utils/qpiconnection.cpp index e5df01d..2a6c3a5 100644 --- a/piqt_utils/qpiconnection.cpp +++ b/piqt_utils/qpiconnection.cpp @@ -19,6 +19,7 @@ bool QPIConnection::loadFromCMFile(const QString & file) { void QPIConnection::piDataRec(const PIString & from, const PIByteArray & data) { + //piCout << from << PICoutManipulators::Hex << data; QMetaObject::invokeMethod(this, "qDataReceivedEvent", Qt::QueuedConnection, Q_ARG(QString, PI2QString(from)), Q_ARG(QByteArray, PI2QByteArray(data))); } diff --git a/qad/blockview/blockitem.cpp b/qad/blockview/blockitem.cpp index efc49f4..fe64601 100644 --- a/qad/blockview/blockitem.cpp +++ b/qad/blockview/blockitem.cpp @@ -266,6 +266,7 @@ QByteArray BlockItem::save() const { ChunkStream cs; QMap > pp; foreach (BlockItemPin * p, pins()) { + //qDebug() << "save pin" << p->text() << "->" << p->properties().size(); pp[p->text()] = p->properties(); } cs << cs.chunk(1, pos()) << cs.chunk(2, rotation()) << cs.chunk(3, props) << cs.chunk(5, pp) << cs.chunk(6, size()); @@ -286,9 +287,12 @@ void BlockItem::load(const QByteArray & data) { case 3: cs.get(props); break; case 5: cs.get(_p); - foreach (BlockItemPin * p, pins()) + //qDebug() << "load pins" << _p.size(); + foreach (BlockItemPin * p, pins()) { + //qDebug() << "load pin" << p->text() << "->" << _p.contains(p->text()); if (_p.contains(p->text())) p->properties() = _p[p->text()]; + } break; case 6: setSize(cs.getData()); break; case 10: setData(2000, cs.getData()); break;