18,6 → 18,7 |
***************************************************************************/ |
|
#include <QMessageBox> |
#include <QCryptographicHash> |
|
#include "dlg_Main.h" |
|
197,6 → 198,7 |
qwt_Plotter->replot(); |
} |
|
// IP-Input-Daten verarbeiten. |
void dlg_Main::parse_IP_Data(QString t_Data) |
{ |
QStringList Data; |
208,10 → 210,33 |
|
switch(CMD) |
{ |
case 501 : |
case 101 : |
{ |
o_Input->send_Data(HandlerIP::make_Frame(ID_SCOPE, 105, le_Password->text())); |
o_Input->send_Data(HandlerIP::make_Frame(ID_SCOPE, 101, QA_NAME + " " + QA_VERSION)); |
} |
case 502 : |
{ |
switch (Data[3].toInt()) |
{ |
case 105 : |
{ |
QString s_MD5PW; |
QByteArray a_MD5PW; |
|
a_MD5PW = QCryptographicHash::hash(le_Password->text().toAscii(),QCryptographicHash::Md5); |
|
s_MD5PW = QString(a_MD5PW.toHex().data()); |
|
o_Input->send_Data(HandlerIP::make_Frame(ID_SCOPE, 105, s_MD5PW)); |
} |
break; |
case 106 : |
{ |
o_Input->send_Data(HandlerIP::make_Frame(ID_SCOPE, 106, DataFields)); |
} |
break; |
} |
} |
break; |
case 505 : |
{ |
228,7 → 253,7 |
} |
} |
|
// Eingangsdaten verarbeiten |
// MK-Eingangsdaten verarbeiten |
void dlg_Main::parse_MK_Data(QString t_Data) |
{ |
unsigned char OutData[150]; |
457,6 → 482,7 |
cb_Server->setEnabled(false); |
le_Password->setEnabled(false); |
|
// Connect über Device |
if (cb_Server->currentText().startsWith('/')) |
{ |
o_Input = new Input_TTY(); |
479,7 → 505,7 |
} |
|
} |
else |
else // Connect über TCPIP |
{ |
o_Input = new Input_TCP(); |
o_Input->Init(); |
525,10 → 551,10 |
} |
else |
{ |
// qDebug(QString("CRC-Error - " + t_Data).toLatin1().data()); |
qDebug(QString("CRC-Error - " + t_Data).toLatin1().data()); |
} |
} |
else if (o_Input->Mode() == TCP) |
else if ((o_Input->Mode() == TCP) && (t_Data[0] == '$')) |
{ |
parse_IP_Data(t_Data); |
} |
539,13 → 565,10 |
cb_Server->setEnabled(true); |
le_Password->setEnabled(true); |
|
// qDebug("Close"); |
disconnect(o_Input, SIGNAL(sig_NewData(QString)), 0, 0); |
if (o_Input->Mode() == TCP) |
{ |
disconnect(o_Input, SIGNAL(sig_Disconnected(int)), 0, 0); |
disconnect(o_Input, SIGNAL(sig_Connected()), 0, 0); |
} |
disconnect(o_Input, SIGNAL(sig_Disconnected(int)), 0, 0); |
disconnect(o_Input, SIGNAL(sig_Connected()), 0, 0); |
|
ac_Connect->setChecked(false); |
ac_Connect->setText(tr("Verbinden")); |
|
582,7 → 605,7 |
{ |
connect(o_Input, SIGNAL(sig_NewData(QString)), this, SLOT(slot_Input_Data(QString))); |
|
o_Input->send_Data(HandlerIP::make_Frame(ID_SCOPE, 101, QA_NAME + " " + QA_VERSION)); |
// o_Input->send_Data(HandlerIP::make_Frame(ID_SCOPE, 101, QA_NAME + " " + QA_VERSION)); |
o_Input->send_Data(HandlerMK::make_Frame('v', 0, c_Data, 0).toLatin1().data(), DATA_VERSION); |
ac_Connect->setText(tr("Trennen")); |
} |