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

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

Browse Source
This commit is contained in:
Бычков Андрей
2017-05-31 11:26:53 +00:00
parent 61c72b621b
commit 2ff23db796
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
piqt_utils/piqt_connection_edit.cpp
View File

@@ -137,11 +137,15 @@ void ConnectionEdit::setModel(const QByteArray & m) {
case __CV_Device: case __CV_Device:
b = new DeviceItem(); b = new DeviceItem();
s >> ba; b->load(ba); s >> ba; b->load(ba);
if (!b->isPropertyExists("bufferSize"))
((DeviceItem*)b)->setBufferSize(4096);
((DeviceItem*)b)->rename(); ((DeviceItem*)b)->rename();
break; break;
case __CV_Filter: case __CV_Filter:
b = new FilterItem(); b = new FilterItem();
s >> ba; b->load(ba); s >> ba; b->load(ba);
if (!b->isPropertyExists("bufferSize"))
((FilterItem*)b)->setBufferSize(65536);
((FilterItem*)b)->rename(); ((FilterItem*)b)->rename();
break; break;
case __CV_Sender: case __CV_Sender:

3
piqt_utils/piqt_connection_edit.ui
View File

@@ -225,9 +225,6 @@
<property name="suffix"> <property name="suffix">
<string> b</string> <string> b</string>
</property> </property>
<property name="minimum">
<number>4096</number>
</property>
<property name="maximum"> <property name="maximum">
<number>999999999</number> <number>999999999</number>
</property> </property>

6
piqt_utils/piqt_connection_view.cpp
View File

@@ -6,9 +6,9 @@
DeviceItem::DeviceItem(): BlockItem() { DeviceItem::DeviceItem(): BlockItem() {
addProperty(BlockItem::Property("__type", "", __CV_Device)); addProperty(BlockItem::Property("__type", "", __CV_Device));
addProperty(BlockItem::Property("bufferSize", "", 4096));
setSize(200, 80); setSize(200, 80);
setColor(QColor(192, 192, 255)); setColor(QColor(192, 192, 255));
setBufferSize(4096);
text_name = new AlignedTextItem(); text_name = new AlignedTextItem();
text_path = new AlignedTextItem(); text_path = new AlignedTextItem();
QFont fnt(text_name->font()); fnt.setBold(true); QFont fnt(text_name->font()); fnt.setBold(true);
@@ -44,10 +44,10 @@ void DeviceItem::rename() {
FilterItem::FilterItem(): BlockItem() { FilterItem::FilterItem(): BlockItem() {
addProperty(BlockItem::Property("__type", "", __CV_Filter)); addProperty(BlockItem::Property("__type", "", __CV_Filter));
addProperty(BlockItem::Property("bufferSize", "", 65536));
setSize(140, 80); setSize(140, 80);
setPos(200, 0); setPos(200, 0);
setColor(QColor(192, 255, 192)); setColor(QColor(192, 255, 192));
setBufferSize(65536);
text_name = new AlignedTextItem(); text_name = new AlignedTextItem();
text_mode = new AlignedTextItem(); text_mode = new AlignedTextItem();
QFont fnt(text_name->font()); fnt.setBold(true); 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->setPath(PI2QString(dp));
ret->setMode(dm); ret->setMode(dm);
ret->setDisconnectTimeout(3.); ret->setDisconnectTimeout(3.);
ret->setBufferSize(4096);
placeBlock(ret, allDevices()); placeBlock(ret, allDevices());
addItem(ret); addItem(ret);
return ret; return ret;
@@ -143,6 +144,7 @@ DeviceItem * ConnectionView::addDevice(const QString & name, const QString & pat
FilterItem * ConnectionView::addFilter(const QString & name) { FilterItem * ConnectionView::addFilter(const QString & name) {
FilterItem * ret = new FilterItem(); FilterItem * ret = new FilterItem();
ret->setDisconnectTimeout(3.); ret->setDisconnectTimeout(3.);
ret->setBufferSize(65536);
ret->setName(name); ret->setName(name);
placeBlock(ret, allFilters()); placeBlock(ret, allFilters());
addItem(ret); addItem(ret);

6
piqt_utils/piqt_connection_view.h
View File

@@ -24,7 +24,7 @@ public:
QString path() const {return propertyByName("device").value.toString();} QString path() const {return propertyByName("device").value.toString();}
PIIODevice::DeviceMode mode() const {return PIIODevice::DeviceMode(propertyByName("mode").value.toInt());} PIIODevice::DeviceMode mode() const {return PIIODevice::DeviceMode(propertyByName("mode").value.toInt());}
PIIODevice::DeviceOptions options() const {return PIIODevice::DeviceOptions(propertyByName("options").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();} int bufferSize() const {return propertyByName("bufferSize").value.toInt();}
void rename(); void rename();
@@ -54,7 +54,7 @@ public:
QString footer() const {return propertyByName("footer").value.toString();} QString footer() const {return propertyByName("footer").value.toString();}
double timeout() const {return propertyByName("timeout").value.toDouble();} double timeout() const {return propertyByName("timeout").value.toDouble();}
int packetSize() const {return propertyByName("size").value.toInt();} 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();} int bufferSize() const {return propertyByName("bufferSize").value.toInt();}
void rename(); void rename();
@@ -75,7 +75,7 @@ public:
QString name() const {return propertyByName("name").value.toString();} QString name() const {return propertyByName("name").value.toString();}
QString data() const {return propertyByName("data").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(); void rename();