diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 5ff2d74..8053e94 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -1,11 +1,16 @@ #include "formcheckpoint.h" #include "ui_formcheckpoint.h" +#include "basecommonapi.h" -FormCheckPoint::FormCheckPoint(QWidget *parent) : +FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), ui(new Ui::FormCheckPoint) { ui->setupUi(this); + if(sId!="") + { + + } } FormCheckPoint::~FormCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 5ff2d74..8053e94 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -1,11 +1,16 @@ #include "formcheckpoint.h" #include "ui_formcheckpoint.h" +#include "basecommonapi.h" -FormCheckPoint::FormCheckPoint(QWidget *parent) : +FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), ui(new Ui::FormCheckPoint) { ui->setupUi(this); + if(sId!="") + { + + } } FormCheckPoint::~FormCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h index 5f8ccf0..b54434b 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.h +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -12,7 +12,7 @@ Q_OBJECT public: - explicit FormCheckPoint(QWidget *parent = nullptr); + explicit FormCheckPoint(QWidget *parent = nullptr,QString checkId=""); ~FormCheckPoint(); private: diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 5ff2d74..8053e94 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -1,11 +1,16 @@ #include "formcheckpoint.h" #include "ui_formcheckpoint.h" +#include "basecommonapi.h" -FormCheckPoint::FormCheckPoint(QWidget *parent) : +FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), ui(new Ui::FormCheckPoint) { ui->setupUi(this); + if(sId!="") + { + + } } FormCheckPoint::~FormCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h index 5f8ccf0..b54434b 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.h +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -12,7 +12,7 @@ Q_OBJECT public: - explicit FormCheckPoint(QWidget *parent = nullptr); + explicit FormCheckPoint(QWidget *parent = nullptr,QString checkId=""); ~FormCheckPoint(); private: diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index cfd3b0d..e087ef2 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -87,7 +87,7 @@ void NewCheckMethod::showCheckPoint() { - FormCheckPoint *checkWindow = new FormCheckPoint; + FormCheckPoint *checkWindow = new FormCheckPoint(nullptr,checkId); //checkWindow.setWindowState(Qt::WindowMaximized); checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); @@ -139,11 +139,13 @@ QStringList idList; int rowCount = 0; int row=0; + checkId=""; if(checkIds!="") { idList = checkIds.split(","); for(const QString& id : idList) { + checkId = id; QList result = BaseCommonApi::getTestedCatDevice(id); if(result.length()>0){ rowCount = ui->tableWidget->rowCount(); diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 5ff2d74..8053e94 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -1,11 +1,16 @@ #include "formcheckpoint.h" #include "ui_formcheckpoint.h" +#include "basecommonapi.h" -FormCheckPoint::FormCheckPoint(QWidget *parent) : +FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), ui(new Ui::FormCheckPoint) { ui->setupUi(this); + if(sId!="") + { + + } } FormCheckPoint::~FormCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h index 5f8ccf0..b54434b 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.h +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -12,7 +12,7 @@ Q_OBJECT public: - explicit FormCheckPoint(QWidget *parent = nullptr); + explicit FormCheckPoint(QWidget *parent = nullptr,QString checkId=""); ~FormCheckPoint(); private: diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index cfd3b0d..e087ef2 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -87,7 +87,7 @@ void NewCheckMethod::showCheckPoint() { - FormCheckPoint *checkWindow = new FormCheckPoint; + FormCheckPoint *checkWindow = new FormCheckPoint(nullptr,checkId); //checkWindow.setWindowState(Qt::WindowMaximized); checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); @@ -139,11 +139,13 @@ QStringList idList; int rowCount = 0; int row=0; + checkId=""; if(checkIds!="") { idList = checkIds.split(","); for(const QString& id : idList) { + checkId = id; QList result = BaseCommonApi::getTestedCatDevice(id); if(result.length()>0){ rowCount = ui->tableWidget->rowCount(); diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index b47da6e..41eab56 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -30,6 +30,7 @@ void showEvent(QShowEvent *event); private: QString methodId=""; + QString checkId=""; Ui::NewCheckMethod *ui; VerificationProgramInfo programInfo; };