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

new PIP

Browse Source
This commit is contained in:
Пелипенко Иван
2022-04-30 11:22:22 +03:00
parent 96a4ea0a2d
commit d34a7cc38f
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/piqt/qpiconnection.h
View File

@@ -37,7 +37,7 @@ public:
bool loadFromCMFile(const QString & file); bool loadFromCMFile(const QString & file);
protected: protected:
void propertyChanged(const PIString & ) {setObjectName(PI2QString(name()));} void propertyChanged(const char *) {setObjectName(PI2QString(name()));}
EVENT_HANDLER2(void, piDataRec, const PIString &, from, const PIByteArray &, data); EVENT_HANDLER2(void, piDataRec, const PIString &, from, const PIByteArray &, data);
EVENT_HANDLER2(void, piPacketRec, const PIString &, from, const PIByteArray &, data); EVENT_HANDLER2(void, piPacketRec, const PIString &, from, const PIByteArray &, data);

11
libs/piqt_widgets/piqt_iodevice_edit_dialog.cpp
View File

@@ -59,14 +59,11 @@ void IODeviceEditDialog::setOptions(int o) {
void IODeviceEditDialog::on_comboType_currentIndexChanged(int index) { void IODeviceEditDialog::on_comboType_currentIndexChanged(int index) {
PIString prefix = Q2PIString(ui->comboType->currentText()); PIString prefix = Q2PIString(ui->comboType->currentText());
PIVector<const PIObject * > rd(PICollection::groupElements("__PIIODevices__")); auto * d = PIIODevice::createFromFullPath(prefix + "://");
piForeachC (PIObject * d, rd) { if (d) {
const PIIODevice * dev = ((const PIIODevice * )d); ps = PI2QPropertyStorage(d->constructVariant().get());
if (prefix != dev->fullPathPrefix())
continue;
ps = PI2QPropertyStorage(dev->constructVariant().get());
ui->widgetProperties->setStorage(&ps); ui->widgetProperties->setStorage(&ps);
return; delete d;
} }
} }