Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 714 → Rev 715

/QMK-Groundstation/trunk/QMK-Communicator/Dialogs/dlg_Main.cpp
28,6 → 28,7
{
setupUi(this);
 
s_Buffer = "";
o_Settings = new cSettings();
 
o_Input = new Input();
752,7 → 753,7
connect(o_Input, SIGNAL(sig_NewData(QString)), this, SLOT(slot_Input_Data(QString)));
 
o_Input->send_Data(HandlerIP::make_Frame(ID_COMMUNICATOR, 101, QA_NAME + " " + QA_VERSION));
// o_Input->send_Data(HandlerMK::make_Frame('v', 0, c_Data, 0).toLatin1().data(), DATA_VERSION);
o_Input->send_Data(HandlerMK::make_Frame('v', 0, c_Data, 0).toLatin1().data(), DATA_VERSION);
btn_Connect->setText(tr("Trennen"));
}
 
853,14 → 854,16
ID = ID;
 
// QString t_Data = QString(TCP_Socket->readLine(TCP_Socket->bytesAvailable())).remove(QChar('\n'));
QString t_Data = QString(Socket->readAll());
QString t_Data = s_Buffer + QString(Socket->readAll());
s_Buffer = "";
 
QStringList l_Data = t_Data.split('\r');
QStringList l_Data = t_Data.split('\n');
 
for (int z = 0; z < l_Data.count(); z++)
{
if ((l_Data[z].length() > 3))
if ((l_Data[z][l_Data[z].length() - 1] == '\r'))
{
l_Data[z].remove(QChar('\r'));
if (l_Data[z][0] == '$')
{
parse_TCP_Server_Data(l_Data[z], ID);
875,6 → 878,12
}
}
}
else
{
qDebug("Ohne Ende");
s_Buffer = s_Buffer + l_Data[z];
}
 
}
 
/*