mirror of
https://github.com/wh201906/Proxmark3GUI.git
synced 2025-02-16 22:21:30 +08:00
Add MF_ReadAll function
This commit is contained in:
parent
1d8d931752
commit
c25e2f9e4a
233
mainwindow.cpp
233
mainwindow.cpp
@ -6,10 +6,10 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
, ui(new Ui::MainWindow)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
pm3=new PM3Process;
|
||||
mifare=new Mifare;
|
||||
connect(pm3,&PM3Process::readyRead,this,&MainWindow::refresh);
|
||||
connect(ui->Raw_CMDEdit,&QLineEdit::editingFinished,this,&MainWindow::sendMSG);
|
||||
pm3 = new PM3Process;
|
||||
mifare = new Mifare;
|
||||
connect(pm3, &PM3Process::readyRead, this, &MainWindow::refresh);
|
||||
connect(ui->Raw_CMDEdit, &QLineEdit::editingFinished, this, &MainWindow::sendMSG);
|
||||
uiInit();
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ void MainWindow::on_PM3_refreshPortButton_clicked()
|
||||
{
|
||||
ui->PM3_portBox->clear();
|
||||
ui->PM3_portBox->addItem("");
|
||||
foreach(QString port,pm3->findPort())
|
||||
foreach(QString port, pm3->findPort())
|
||||
{
|
||||
ui->PM3_portBox->addItem(port);
|
||||
}
|
||||
@ -32,21 +32,21 @@ void MainWindow::on_PM3_refreshPortButton_clicked()
|
||||
|
||||
void MainWindow::on_PM3_connectButton_clicked()
|
||||
{
|
||||
QString port=ui->PM3_portBox->currentText();
|
||||
if(port=="")
|
||||
QString port = ui->PM3_portBox->currentText();
|
||||
if(port == "")
|
||||
QMessageBox::information(NULL, "Info", "Plz choose a port first", QMessageBox::Ok);
|
||||
else
|
||||
{
|
||||
pm3->setRequiringOutput(true);
|
||||
qDebug()<<pm3->start(ui->PM3_pathEdit->text(),port);
|
||||
qDebug() << pm3->start(ui->PM3_pathEdit->text(), port);
|
||||
while(pm3->waitForReadyRead())
|
||||
;
|
||||
QString result=pm3->getRequiredOutput();
|
||||
QString result = pm3->getRequiredOutput();
|
||||
pm3->setRequiringOutput(false);
|
||||
result=result.mid(result.indexOf("os: "));
|
||||
result=result.left(result.indexOf("\r\n"));
|
||||
result=result.mid(3,result.lastIndexOf(" ")-3);
|
||||
setStatusBar(PM3VersionBar,result);
|
||||
result = result.mid(result.indexOf("os: "));
|
||||
result = result.left(result.indexOf("\r\n"));
|
||||
result = result.mid(3, result.lastIndexOf(" ") - 3);
|
||||
setStatusBar(PM3VersionBar, result);
|
||||
}
|
||||
}
|
||||
|
||||
@ -61,10 +61,10 @@ void MainWindow::on_PM3_disconnectButton_clicked()
|
||||
|
||||
void MainWindow::on_Raw_sendCMDButton_clicked()
|
||||
{
|
||||
if(ui->Raw_CMDHistoryWidget->count()==0 || ui->Raw_CMDHistoryWidget->item(ui->Raw_CMDHistoryWidget->count()-1)->text()!=ui->Raw_CMDEdit->text())
|
||||
if(ui->Raw_CMDHistoryWidget->count() == 0 || ui->Raw_CMDHistoryWidget->item(ui->Raw_CMDHistoryWidget->count() - 1)->text() != ui->Raw_CMDEdit->text())
|
||||
ui->Raw_CMDHistoryWidget->addItem(ui->Raw_CMDEdit->text());
|
||||
qDebug()<<(ui->Raw_CMDEdit->text().toLocal8Bit());
|
||||
pm3->write((ui->Raw_CMDEdit->text()+"\r\n").toLocal8Bit());
|
||||
qDebug() << (ui->Raw_CMDEdit->text().toLocal8Bit());
|
||||
pm3->write((ui->Raw_CMDEdit->text() + "\r\n").toLocal8Bit());
|
||||
pm3->waitForBytesWritten(3000);
|
||||
}
|
||||
|
||||
@ -110,58 +110,99 @@ void MainWindow::on_Raw_CMDHistoryWidget_itemDoubleClicked(QListWidgetItem *item
|
||||
|
||||
void MainWindow::on_MF_Attack_chkButton_clicked()
|
||||
{
|
||||
pm3->setRequiringOutput(true);
|
||||
execCMD("hf mf chk *1 ?",false);
|
||||
on_Raw_sendCMDButton_clicked();
|
||||
while(pm3->waitForReadyRead())
|
||||
;
|
||||
QString result=pm3->getRequiredOutput();
|
||||
pm3->setRequiringOutput(false);
|
||||
result=result.mid(result.indexOf("|---|----------------|----------------|"));
|
||||
QStringList keys=result.split("\r\n");
|
||||
for(int i=0;i<16;i++)
|
||||
QString result = execCMDWithOutput("hf mf chk *1 ?");
|
||||
result = result.mid(result.indexOf("|---|----------------|----------------|"));
|
||||
QStringList keys = result.split("\r\n");
|
||||
for(int i = 0; i < 16; i++)
|
||||
{
|
||||
ui->MF_keyWidget->setItem(i,1,new QTableWidgetItem(keys[i+3].mid(7,12).trimmed().toUpper()));
|
||||
ui->MF_keyWidget->setItem(i,2,new QTableWidgetItem(keys[i+3].mid(24,12).trimmed().toUpper()));
|
||||
ui->MF_keyWidget->setItem(i, 1, new QTableWidgetItem(keys[i + 3].mid(7, 12).trimmed().toUpper()));
|
||||
ui->MF_keyWidget->setItem(i, 2, new QTableWidgetItem(keys[i + 3].mid(24, 12).trimmed().toUpper()));
|
||||
}
|
||||
qDebug()<<"***********\n"<<keys<<"***********\n";
|
||||
qDebug() << "***********\n" << keys << "***********\n";
|
||||
}
|
||||
|
||||
void MainWindow::on_MF_Attack_nestedButton_clicked()
|
||||
{
|
||||
pm3->setRequiringOutput(true);
|
||||
execCMD("hf mf nested 1 *",false);
|
||||
while(pm3->waitForReadyRead())
|
||||
;
|
||||
QString result=pm3->getRequiredOutput();
|
||||
pm3->setRequiringOutput(false);
|
||||
result=result.mid(result.indexOf("|---|----------------|---|----------------|---|"));
|
||||
QStringList keys=result.split("\r\n");
|
||||
for(int i=0;i<16;i++)
|
||||
QString result = execCMDWithOutput("hf mf nested 1 *");
|
||||
result = result.mid(result.indexOf("|---|----------------|---|----------------|---|"));
|
||||
QStringList keys = result.split("\r\n");
|
||||
for(int i = 0; i < 16; i++)
|
||||
{
|
||||
if(keys[i+3].at(23)=='1')
|
||||
ui->MF_keyWidget->setItem(i,1,new QTableWidgetItem(keys[i+3].mid(7,12).trimmed().toUpper()));
|
||||
if(keys[i+3].at(44)=='1')
|
||||
ui->MF_keyWidget->setItem(i,2,new QTableWidgetItem(keys[i+3].mid(28,12).trimmed().toUpper()));
|
||||
if(keys[i + 3].at(23) == '1')
|
||||
ui->MF_keyWidget->setItem(i, 1, new QTableWidgetItem(keys[i + 3].mid(7, 12).trimmed().toUpper()));
|
||||
if(keys[i + 3].at(44) == '1')
|
||||
ui->MF_keyWidget->setItem(i, 2, new QTableWidgetItem(keys[i + 3].mid(28, 12).trimmed().toUpper()));
|
||||
}
|
||||
qDebug()<<"***********\n"<<keys<<"***********\n";
|
||||
qDebug() << "***********\n" << keys << "***********\n";
|
||||
}
|
||||
|
||||
void MainWindow::on_MF_Attack_hardnestedButton_clicked()
|
||||
{
|
||||
MF_Attack_hardnestedDialog dialog;
|
||||
connect(&dialog,&MF_Attack_hardnestedDialog::sendCMD,this,&MainWindow::execCMD);
|
||||
connect(&dialog, &MF_Attack_hardnestedDialog::sendCMD, this, &MainWindow::execCMD);
|
||||
dialog.exec();
|
||||
}
|
||||
|
||||
void MainWindow::on_MF_Attack_sniffButton_clicked()
|
||||
{
|
||||
execCMD("hf mf sniff",true);
|
||||
execCMD("hf mf sniff", true);
|
||||
}
|
||||
|
||||
void MainWindow::on_MF_Attack_listButton_clicked()
|
||||
{
|
||||
execCMD("hf list mf",true);
|
||||
execCMD("hf list mf", true);
|
||||
}
|
||||
|
||||
void MainWindow::on_MF_RW_readAllButton_clicked()
|
||||
{
|
||||
QString result;
|
||||
int validkey;
|
||||
const int waitTime=500;
|
||||
for(int i = 0; i < 16; i++)
|
||||
{
|
||||
QApplication::processEvents();
|
||||
result = "";
|
||||
validkey = -1;
|
||||
if(MF_isKeyValid(ui->MF_keyWidget->item(i, 1)->text()))
|
||||
{
|
||||
result = execCMDWithOutput("hf mf rdbl "
|
||||
+ QString::number(4 * i)
|
||||
+ " A "
|
||||
+ ui->MF_keyWidget->item(i, 1)->text(),waitTime);
|
||||
if(result.indexOf("isOk:01") != -1)
|
||||
{
|
||||
validkey = 1;
|
||||
ui->MF_dataWidget->setItem(4 * i, 2,new QTableWidgetItem(result.mid(result.indexOf("isOk:01")+13, 47).toUpper()));
|
||||
}
|
||||
}
|
||||
if(validkey == -1 && MF_isKeyValid(ui->MF_keyWidget->item(i, 2)->text()))
|
||||
{
|
||||
result = execCMDWithOutput("hf mf rdbl "
|
||||
+ QString::number(4 * i)
|
||||
+ " B "
|
||||
+ ui->MF_keyWidget->item(i, 2)->text(),waitTime);
|
||||
if(result.indexOf("isOk:01") != -1)
|
||||
{
|
||||
validkey = 2;
|
||||
ui->MF_dataWidget->setItem(4 * i, 2,new QTableWidgetItem(result.mid(result.indexOf("isOk:01")+13, 47).toUpper()));
|
||||
}
|
||||
}
|
||||
if(validkey!=-1)
|
||||
{
|
||||
for(int j = 1; j < 4; j++)
|
||||
{
|
||||
QApplication::processEvents();
|
||||
result = execCMDWithOutput("hf mf rdbl "
|
||||
+ QString::number(4 * i + j)
|
||||
+ " "
|
||||
+ (validkey==1?"A":"B")
|
||||
+ " "
|
||||
+ ui->MF_keyWidget->item(i, validkey)->text(),waitTime);
|
||||
ui->MF_dataWidget->setItem(4 * i + j, 2,new QTableWidgetItem(result.mid(result.indexOf("isOk:01")+13, 47).toUpper()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// ************************************************
|
||||
@ -171,12 +212,12 @@ void MainWindow::on_MF_Attack_listButton_clicked()
|
||||
|
||||
void MainWindow::refresh()
|
||||
{
|
||||
QString btay=pm3->readLine();
|
||||
while(btay!="")
|
||||
QString btay = pm3->readLine();
|
||||
while(btay != "")
|
||||
{
|
||||
qDebug()<<btay;
|
||||
qDebug() << btay;
|
||||
ui->Raw_outputEdit->insertPlainText(btay);
|
||||
btay=pm3->readLine();
|
||||
btay = pm3->readLine();
|
||||
}
|
||||
ui->Raw_outputEdit->moveCursor(QTextCursor::End);
|
||||
}
|
||||
@ -189,61 +230,83 @@ void MainWindow::sendMSG()
|
||||
|
||||
void MainWindow::uiInit()
|
||||
{
|
||||
connectStatusBar=new QLabel(this);
|
||||
programStatusBar=new QLabel(this);
|
||||
PM3VersionBar=new QLabel(this);
|
||||
setStatusBar(connectStatusBar,"Not Connected");
|
||||
setStatusBar(programStatusBar,"Idle");
|
||||
setStatusBar(PM3VersionBar,"");
|
||||
ui->statusbar->addPermanentWidget(PM3VersionBar,1);
|
||||
ui->statusbar->addPermanentWidget(connectStatusBar,1);
|
||||
ui->statusbar->addPermanentWidget(programStatusBar,1);
|
||||
connectStatusBar = new QLabel(this);
|
||||
programStatusBar = new QLabel(this);
|
||||
PM3VersionBar = new QLabel(this);
|
||||
setStatusBar(connectStatusBar, "Not Connected");
|
||||
setStatusBar(programStatusBar, "Idle");
|
||||
setStatusBar(PM3VersionBar, "");
|
||||
ui->statusbar->addPermanentWidget(PM3VersionBar, 1);
|
||||
ui->statusbar->addPermanentWidget(connectStatusBar, 1);
|
||||
ui->statusbar->addPermanentWidget(programStatusBar, 1);
|
||||
|
||||
ui->MF_dataWidget->setColumnCount(3);
|
||||
ui->MF_dataWidget->setRowCount(64);
|
||||
ui->MF_dataWidget->setHorizontalHeaderItem(0,new QTableWidgetItem("Sector"));
|
||||
ui->MF_dataWidget->setHorizontalHeaderItem(1,new QTableWidgetItem("Block"));
|
||||
ui->MF_dataWidget->setHorizontalHeaderItem(2,new QTableWidgetItem("Data"));
|
||||
for(int i=0;i<64;i++)
|
||||
ui->MF_dataWidget->setItem(i,1,new QTableWidgetItem(QString::number(i)));
|
||||
for(int i=0;i<16;i++)
|
||||
ui->MF_dataWidget->setItem(i*4,0,new QTableWidgetItem(QString::number(i)));
|
||||
ui->MF_dataWidget->setHorizontalHeaderItem(0, new QTableWidgetItem("Sector"));
|
||||
ui->MF_dataWidget->setHorizontalHeaderItem(1, new QTableWidgetItem("Block"));
|
||||
ui->MF_dataWidget->setHorizontalHeaderItem(2, new QTableWidgetItem("Data"));
|
||||
for(int i = 0; i < 64; i++)
|
||||
ui->MF_dataWidget->setItem(i, 1, new QTableWidgetItem(QString::number(i)));
|
||||
for(int i = 0; i < 16; i++)
|
||||
ui->MF_dataWidget->setItem(i * 4, 0, new QTableWidgetItem(QString::number(i)));
|
||||
ui->MF_dataWidget->verticalHeader()->setVisible(false);
|
||||
ui->MF_dataWidget->setColumnWidth(0,50);
|
||||
ui->MF_dataWidget->setColumnWidth(1,40);
|
||||
ui->MF_dataWidget->setColumnWidth(2,400);
|
||||
ui->MF_dataWidget->setColumnWidth(0, 50);
|
||||
ui->MF_dataWidget->setColumnWidth(1, 40);
|
||||
ui->MF_dataWidget->setColumnWidth(2, 400);
|
||||
|
||||
ui->MF_keyWidget->setColumnCount(3);
|
||||
ui->MF_keyWidget->setRowCount(16);
|
||||
ui->MF_keyWidget->setHorizontalHeaderItem(0,new QTableWidgetItem("Sector"));
|
||||
ui->MF_keyWidget->setHorizontalHeaderItem(1,new QTableWidgetItem("KeyA"));
|
||||
ui->MF_keyWidget->setHorizontalHeaderItem(2,new QTableWidgetItem("KeyB"));
|
||||
for(int i=0;i<16;i++)
|
||||
ui->MF_keyWidget->setItem(i,0,new QTableWidgetItem(QString::number(i)));
|
||||
ui->MF_keyWidget->setHorizontalHeaderItem(0, new QTableWidgetItem("Sector"));
|
||||
ui->MF_keyWidget->setHorizontalHeaderItem(1, new QTableWidgetItem("KeyA"));
|
||||
ui->MF_keyWidget->setHorizontalHeaderItem(2, new QTableWidgetItem("KeyB"));
|
||||
for(int i = 0; i < 16; i++)
|
||||
ui->MF_keyWidget->setItem(i, 0, new QTableWidgetItem(QString::number(i)));
|
||||
ui->MF_keyWidget->verticalHeader()->setVisible(false);
|
||||
ui->MF_keyWidget->setColumnWidth(0,50);
|
||||
ui->MF_keyWidget->setColumnWidth(1,200);
|
||||
ui->MF_keyWidget->setColumnWidth(2,200);
|
||||
ui->MF_keyWidget->setColumnWidth(0, 50);
|
||||
ui->MF_keyWidget->setColumnWidth(1, 200);
|
||||
ui->MF_keyWidget->setColumnWidth(2, 200);
|
||||
|
||||
on_Raw_moreFuncCheckBox_stateChanged(0);
|
||||
on_PM3_refreshPortButton_clicked();
|
||||
}
|
||||
|
||||
void MainWindow::setStatusBar(QLabel* target,const QString & text)
|
||||
void MainWindow::setStatusBar(QLabel* target, const QString & text)
|
||||
{
|
||||
if(target==PM3VersionBar)
|
||||
target->setText("Version:"+text);
|
||||
else if(target==connectStatusBar)
|
||||
target->setText("Connecton State:"+text);
|
||||
else if(target==programStatusBar)
|
||||
target->setText("Program State:"+text);
|
||||
if(target == PM3VersionBar)
|
||||
target->setText("Version:" + text);
|
||||
else if(target == connectStatusBar)
|
||||
target->setText("Connecton State:" + text);
|
||||
else if(target == programStatusBar)
|
||||
target->setText("Program State:" + text);
|
||||
}
|
||||
|
||||
void MainWindow::execCMD(QString cmd,bool gotoRawTab)
|
||||
void MainWindow::execCMD(QString cmd, bool gotoRawTab)
|
||||
{
|
||||
ui->Raw_CMDEdit->setText(cmd);
|
||||
on_Raw_sendCMDButton_clicked();
|
||||
if(gotoRawTab)
|
||||
ui->funcTab->setCurrentIndex(1);
|
||||
}
|
||||
|
||||
QString MainWindow::execCMDWithOutput(QString cmd, int msec)
|
||||
{
|
||||
pm3->setRequiringOutput(true);
|
||||
execCMD(cmd, false);
|
||||
while(pm3->waitForReadyRead(msec))
|
||||
;
|
||||
pm3->setRequiringOutput(false);
|
||||
return pm3->getRequiredOutput();
|
||||
}
|
||||
|
||||
bool MainWindow::MF_isKeyValid(const QString key)
|
||||
{
|
||||
if(key.length() != 12)
|
||||
return false;
|
||||
for(int i = 0; i < 12; i++)
|
||||
{
|
||||
if(!((key[i] >= '0' && key[i] <= '9') || (key[i] >= 'A' && key[i] <= 'F')))
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
// ***********************************************
|
||||
|
@ -22,6 +22,8 @@ public:
|
||||
MainWindow(QWidget *parent = nullptr);
|
||||
~MainWindow();
|
||||
|
||||
bool MF_isKeyValid(const QString key);
|
||||
QString execCMDWithOutput(QString cmd, int msec=2000);
|
||||
public slots:
|
||||
void refresh();
|
||||
void setStatusBar(QLabel* target,const QString & text);
|
||||
@ -55,6 +57,8 @@ private slots:
|
||||
|
||||
void on_MF_Attack_listButton_clicked();
|
||||
|
||||
void on_MF_RW_readAllButton_clicked();
|
||||
|
||||
private:
|
||||
Ui::MainWindow *ui;
|
||||
PM3Process* pm3;
|
||||
|
@ -161,7 +161,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -180,7 +180,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -199,7 +199,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -218,7 +218,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -237,7 +237,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -293,7 +293,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -312,7 +312,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -337,7 +337,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -362,7 +362,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -499,7 +499,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -518,7 +518,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -543,7 +543,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -568,7 +568,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -678,7 +678,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -697,7 +697,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -716,7 +716,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
@ -735,7 +735,7 @@
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>40</height>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
|
@ -53,3 +53,4 @@ bool PM3Process::waitForReadyRead(int msecs)
|
||||
{
|
||||
return QProcess::waitForReadyRead(msecs);
|
||||
}
|
||||
|
||||
|
@ -17,7 +17,7 @@ public:
|
||||
QByteArray readLine(qint64 maxlen = 0);
|
||||
void setRequiringOutput(bool st);
|
||||
QString getRequiredOutput();
|
||||
bool waitForReadyRead(int msecs = 3000);
|
||||
bool waitForReadyRead(int msecs = 2000);
|
||||
private:
|
||||
bool isRequiringOutput;
|
||||
QString* requiredOutput;
|
||||
|
Loading…
x
Reference in New Issue
Block a user