diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 8197120..1494f6d 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -111,25 +111,21 @@ int rowCount=0; int row=0; connectList.clear(); - if(programInfo.tested_device_id!="") + if(selectTaskList.length()>0) { - idList = programInfo.tested_device_id.split(","); - for(const QString& id : idList) + //idList = programInfo.tested_device_id.split(","); + for(const Dept& task : selectTaskList) { ConnectInfo info; - info.id = id; + info.id = task.sample_id; info.type = 0; info.state="未连接"; - QList result = BaseCommonApi::getTestedCatDevice(id); - if(result.length()>0){ - info.deviceName = result[0].equipment_name; - } - result.clear(); - QList addrList = BaseCommonApi::getVerificationProgramConfigInterface(id); + info.deviceName = task.sample_name; + QList addrList = BaseCommonApi::getVerificationProgramConfigInterface(info.id); if(addrList.length()>0){ info.programInterface = addrList[0]; } - info.cmdList = BaseCommonApi::getInstructionLib(id); + info.cmdList = BaseCommonApi::getInstructionLib(info.id); connectList.append(info); addrList.clear(); } @@ -205,13 +201,14 @@ on_deviceButton_clicked(selectTaskList[0],0); ui->horizontalLayout_14->addStretch(); - if(programInfo.tested_device_id!="") + if(selectTaskList.length()>0) { - QStringList idList=programInfo.tested_device_id.split(","); + //QStringList idList=programInfo.tested_device_id.split(","); + QString deviceId = selectTaskList[0].sample_id; //QStringList headlist; headList.clear(); calibrationList.clear(); - calibrationList =BaseCommonApi::Search_CalibrationTable(idList[0],&headList); + calibrationList =BaseCommonApi::Search_CalibrationTable(deviceId,&headList); //tableWidgetItem ui->tableWidget_Point->clearContents(); diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 8197120..1494f6d 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -111,25 +111,21 @@ int rowCount=0; int row=0; connectList.clear(); - if(programInfo.tested_device_id!="") + if(selectTaskList.length()>0) { - idList = programInfo.tested_device_id.split(","); - for(const QString& id : idList) + //idList = programInfo.tested_device_id.split(","); + for(const Dept& task : selectTaskList) { ConnectInfo info; - info.id = id; + info.id = task.sample_id; info.type = 0; info.state="未连接"; - QList result = BaseCommonApi::getTestedCatDevice(id); - if(result.length()>0){ - info.deviceName = result[0].equipment_name; - } - result.clear(); - QList addrList = BaseCommonApi::getVerificationProgramConfigInterface(id); + info.deviceName = task.sample_name; + QList addrList = BaseCommonApi::getVerificationProgramConfigInterface(info.id); if(addrList.length()>0){ info.programInterface = addrList[0]; } - info.cmdList = BaseCommonApi::getInstructionLib(id); + info.cmdList = BaseCommonApi::getInstructionLib(info.id); connectList.append(info); addrList.clear(); } @@ -205,13 +201,14 @@ on_deviceButton_clicked(selectTaskList[0],0); ui->horizontalLayout_14->addStretch(); - if(programInfo.tested_device_id!="") + if(selectTaskList.length()>0) { - QStringList idList=programInfo.tested_device_id.split(","); + //QStringList idList=programInfo.tested_device_id.split(","); + QString deviceId = selectTaskList[0].sample_id; //QStringList headlist; headList.clear(); calibrationList.clear(); - calibrationList =BaseCommonApi::Search_CalibrationTable(idList[0],&headList); + calibrationList =BaseCommonApi::Search_CalibrationTable(deviceId,&headList); //tableWidgetItem ui->tableWidget_Point->clearContents(); diff --git a/softwareDirectory/AutoVerScheme/visacommonengine.cpp b/softwareDirectory/AutoVerScheme/visacommonengine.cpp index 9d2f527..3c277fe 100644 --- a/softwareDirectory/AutoVerScheme/visacommonengine.cpp +++ b/softwareDirectory/AutoVerScheme/visacommonengine.cpp @@ -193,6 +193,7 @@ //strcpy(stringinput, strData.toLatin1().data()); //strcpy(stringinput, "*IDN?\n"); if(commType=="Visa"){ + utf8Bytes = (sCmd+"\n").toUtf8(); ViBuf buffer = reinterpret_cast(utf8Bytes.data()); ViUInt32 bufferSize = static_cast(utf8Bytes.size()); status = viWrite(instr, buffer, bufferSize, &writeCount);