diff --git a/piqt_utils/piqt_connection_edit.cpp b/piqt_utils/piqt_connection_edit.cpp index 23975bf..4977e15 100644 --- a/piqt_utils/piqt_connection_edit.cpp +++ b/piqt_utils/piqt_connection_edit.cpp @@ -137,11 +137,15 @@ void ConnectionEdit::setModel(const QByteArray & m) { case __CV_Device: b = new DeviceItem(); s >> ba; b->load(ba); + if (!b->isPropertyExists("bufferSize")) + ((DeviceItem*)b)->setBufferSize(4096); ((DeviceItem*)b)->rename(); break; case __CV_Filter: b = new FilterItem(); s >> ba; b->load(ba); + if (!b->isPropertyExists("bufferSize")) + ((FilterItem*)b)->setBufferSize(65536); ((FilterItem*)b)->rename(); break; case __CV_Sender: diff --git a/piqt_utils/piqt_connection_edit.ui b/piqt_utils/piqt_connection_edit.ui index edcb9d0..eb99380 100644 --- a/piqt_utils/piqt_connection_edit.ui +++ b/piqt_utils/piqt_connection_edit.ui @@ -225,9 +225,6 @@ b - - 4096 - 999999999 diff --git a/piqt_utils/piqt_connection_view.cpp b/piqt_utils/piqt_connection_view.cpp index 5862b80..3f5437c 100644 --- a/piqt_utils/piqt_connection_view.cpp +++ b/piqt_utils/piqt_connection_view.cpp @@ -6,9 +6,9 @@ DeviceItem::DeviceItem(): BlockItem() { addProperty(BlockItem::Property("__type", "", __CV_Device)); + addProperty(BlockItem::Property("bufferSize", "", 4096)); setSize(200, 80); setColor(QColor(192, 192, 255)); - setBufferSize(4096); text_name = new AlignedTextItem(); text_path = new AlignedTextItem(); QFont fnt(text_name->font()); fnt.setBold(true); @@ -44,10 +44,10 @@ void DeviceItem::rename() { FilterItem::FilterItem(): BlockItem() { addProperty(BlockItem::Property("__type", "", __CV_Filter)); + addProperty(BlockItem::Property("bufferSize", "", 65536)); setSize(140, 80); setPos(200, 0); setColor(QColor(192, 255, 192)); - setBufferSize(65536); text_name = new AlignedTextItem(); text_mode = new AlignedTextItem(); QFont fnt(text_name->font()); fnt.setBold(true); @@ -134,6 +134,7 @@ DeviceItem * ConnectionView::addDevice(const QString & name, const QString & pat ret->setPath(PI2QString(dp)); ret->setMode(dm); ret->setDisconnectTimeout(3.); + ret->setBufferSize(4096); placeBlock(ret, allDevices()); addItem(ret); return ret; @@ -143,6 +144,7 @@ DeviceItem * ConnectionView::addDevice(const QString & name, const QString & pat FilterItem * ConnectionView::addFilter(const QString & name) { FilterItem * ret = new FilterItem(); ret->setDisconnectTimeout(3.); + ret->setBufferSize(65536); ret->setName(name); placeBlock(ret, allFilters()); addItem(ret); diff --git a/piqt_utils/piqt_connection_view.h b/piqt_utils/piqt_connection_view.h index 4c5ead8..09a5fce 100644 --- a/piqt_utils/piqt_connection_view.h +++ b/piqt_utils/piqt_connection_view.h @@ -24,7 +24,7 @@ public: QString path() const {return propertyByName("device").value.toString();} PIIODevice::DeviceMode mode() const {return PIIODevice::DeviceMode(propertyByName("mode").value.toInt());} PIIODevice::DeviceOptions options() const {return PIIODevice::DeviceOptions(propertyByName("options").value.toInt());} - double disconnectTimeout() const {return PIIODevice::DeviceMode(propertyByName("disconnectTimeout").value.toDouble());} + double disconnectTimeout() const {return propertyByName("disconnectTimeout").value.toDouble();} int bufferSize() const {return propertyByName("bufferSize").value.toInt();} void rename(); @@ -54,7 +54,7 @@ public: QString footer() const {return propertyByName("footer").value.toString();} double timeout() const {return propertyByName("timeout").value.toDouble();} int packetSize() const {return propertyByName("size").value.toInt();} - double disconnectTimeout() const {return PIIODevice::DeviceMode(propertyByName("disconnectTimeout").value.toDouble());} + double disconnectTimeout() const {return propertyByName("disconnectTimeout").value.toDouble();} int bufferSize() const {return propertyByName("bufferSize").value.toInt();} void rename(); @@ -75,7 +75,7 @@ public: QString name() const {return propertyByName("name").value.toString();} QString data() const {return propertyByName("data").value.toString();} - double frequency() const {return PIIODevice::DeviceMode(propertyByName("frequency").value.toDouble());} + double frequency() const {return propertyByName("frequency").value.toDouble();} void rename();