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

pip 3.15

Browse Source
This commit is contained in:
Пелипенко Иван
2023-12-08 16:14:31 +03:00
parent dcbb01ae25
commit dd78bb09eb
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/piqt_utils/piqt_connection_edit.cpp
View File

@@ -18,7 +18,7 @@ ConnectionEdit::ConnectionEdit(QWidget * parent): QDialog(parent) {
connect(ui->blockView, SIGNAL(schemeAction(BlockItemBase::Action, QList<QGraphicsItem *>)), this, SLOT(recreateRequest())); connect(ui->blockView, SIGNAL(schemeAction(BlockItemBase::Action, QList<QGraphicsItem *>)), this, SLOT(recreateRequest()));
connect(ui->blockView->scene(), SIGNAL(selectionChanged()), this, SLOT(selectionChanged())); connect(ui->blockView->scene(), SIGNAL(selectionChanged()), this, SLOT(selectionChanged()));
conn = 0; conn = 0;
PICodeInfo::EnumInfo * ei = PICodeInfo::enumsInfo->value("PIIODevice::DeviceMode"); PICodeInfo::EnumInfo * ei = PICODEINFO->enums().value("PIIODevice::DeviceMode");
if (ei) { if (ei) {
piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members)
#if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0) #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
@@ -29,7 +29,7 @@ ConnectionEdit::ConnectionEdit(QWidget * parent): QDialog(parent) {
#endif #endif
} }
ui->comboMode->setCurrentIndex(ui->comboMode->count() - 1); ui->comboMode->setCurrentIndex(ui->comboMode->count() - 1);
ei = PICodeInfo::enumsInfo->value("PIIODevice::DeviceOption"); ei = PICODEINFO->enums().value("PIIODevice::DeviceOption");
if (ei) { if (ei) {
piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) { piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
QCheckBox * cb = new QCheckBox(); QCheckBox * cb = new QCheckBox();
@@ -42,7 +42,7 @@ ConnectionEdit::ConnectionEdit(QWidget * parent): QDialog(parent) {
ui->layoutOptions->addWidget(cb); ui->layoutOptions->addWidget(cb);
} }
} }
ei = PICodeInfo::enumsInfo->value("PIPacketExtractor::SplitMode"); ei = PICODEINFO->enums().value("PIPacketExtractor::SplitMode");
if (ei) { if (ei) {
piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members)
#if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0) #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)

2
libs/piqt_utils/piqt_connection_view.cpp
View File

@@ -83,7 +83,7 @@ FilterItem::FilterItem(): BlockItem() {
void FilterItem::rename() { void FilterItem::rename() {
text_name->setText(name()); text_name->setText(name());
QString ms; QString ms;
PICodeInfo::EnumInfo * ei = PICodeInfo::enumsInfo->value("PIPacketExtractor::SplitMode", 0); PICodeInfo::EnumInfo * ei = PICODEINFO->enums().value("PIPacketExtractor::SplitMode", 0);
if (ei) { if (ei) {
piForeachC(PICodeInfo::EnumeratorInfo & i, ei->members) piForeachC(PICodeInfo::EnumeratorInfo & i, ei->members)
if (i.value == mode()) { if (i.value == mode()) {

4
libs/piqt_utils/piqt_iodevice_edit_dialog.cpp
View File

@@ -11,7 +11,7 @@
IODeviceEditDialog::IODeviceEditDialog(QWidget * parent): QDialog(parent) { IODeviceEditDialog::IODeviceEditDialog(QWidget * parent): QDialog(parent) {
ui = new Ui::IODeviceEditDialog(); ui = new Ui::IODeviceEditDialog();
ui->setupUi(this); ui->setupUi(this);
PICodeInfo::EnumInfo * ei = PICodeInfo::enumsInfo->value("PIIODevice::DeviceMode"); PICodeInfo::EnumInfo * ei = PICODEINFO->enums().value("PIIODevice::DeviceMode");
if (ei) { if (ei) {
piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members)
#if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0) #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
@@ -22,7 +22,7 @@ IODeviceEditDialog::IODeviceEditDialog(QWidget * parent): QDialog(parent) {
#endif #endif
} }
ui->comboMode->setCurrentIndex(ui->comboMode->count() - 1); ui->comboMode->setCurrentIndex(ui->comboMode->count() - 1);
ei = PICodeInfo::enumsInfo->value("PIIODevice::DeviceOption"); ei = PICODEINFO->enums().value("PIIODevice::DeviceOption");
if (ei) { if (ei) {
piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) { piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
QCheckBox * cb = new QCheckBox(); QCheckBox * cb = new QCheckBox();

2
utils/piintrospector/piintrospector.cpp
View File

@@ -27,7 +27,7 @@ QPIIntrospector::QPIIntrospector(QWidget * parent): EMainWindow(parent), peer("_
// CONNECTU(&peer, dataReceivedEvent, this, reqProcPIEvents); // CONNECTU(&peer, dataReceivedEvent, this, reqProcPIEvents);
session.addEntry(this); session.addEntry(this);
session.addEntry(tabWidgetMain); session.addEntry(tabWidgetMain);
PICodeInfo::EnumInfo * ei = PICodeInfo::enumsInfo->value("PIIntrospection::InfoTypes"); PICodeInfo::EnumInfo * ei = PICODEINFO->enums().value("PIIntrospection::InfoTypes");
if (ei) { if (ei) {
piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) { piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
#if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0) #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)

2
utils/piintrospector/threads_view.cpp
View File

@@ -22,7 +22,7 @@ enum ColumnThreads {
ThreadsModel::ThreadsModel() { ThreadsModel::ThreadsModel() {
PICodeInfo::EnumInfo * ei = PICodeInfo::enumsInfo->value("PIIntrospectionThreads::ThreadState"); PICodeInfo::EnumInfo * ei = PICODEINFO->enums().value("PIIntrospectionThreads::ThreadState");
if (ei) { if (ei) {
piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) { piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
#if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0) #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)