Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 448 → Rev 449

/QMK-Groundstation/branches/libMK/Forms/mktool.cpp
61,6 → 61,7
 
// Tab mit Debug-Elementen verbergen
tab_Main->removeTab(6);
 
// Develop - Nicht gebrauchte sachen abschalten.
pb_SettingsReset->hide();
pb_Flash->hide();
201,7 → 202,7
data = new KopterData();
 
//new QT-Communication object
com = new QTCommunication();
com = new QTSerialCommunication();
 
//create handler that handles incomming data
handler = new Handler(com, data);
419,13 → 420,13
 
void MKTool::slot_Test()
{
sRxData RX;
// sRxData RX;
 
RX.str = IN->text().toLatin1().data();
// RX.str = IN->text().toLatin1().data();
 
RX.input = (char *)RX.str.c_str();
// RX.input = (char *)RX.str.c_str();
 
slot_newData(RX);
// slot_newData(RX);
}
 
// KML-Datei nach Wegpunkt parsen
770,8 → 771,6
 
void MKTool::slot_MAP_SetWayPoints(QList<sWayPoint> l_WayPoints)
{
//FIXME: Put this in libMK/Handler.cpp or libMK/NaviCtrl.cpp
 
double Longitude, Latitude;
 
// delete waypoint-list
1337,6 → 1336,8
}
}
 
//FIXME: HERE!
/*
void MKTool::new_NaviData(sRxData RX)
{
// qDebug("Navi-Data");
1423,12 → 1424,13
QMK_Server->NewPosition(naviData);
}
}
 
*/
// Kopter-Kommunikations-Bereich, Befehle senden und Daten empfangen
////////////////////////////////////////////////////////////////////
 
// Neues Datenpacket empfangen -> Verarbeiten
void MKTool::slot_newData(sRxData RX) // DONE 0.71g
//FIXME: HERE!
/*void MKTool::slot_newData(sRxData RX) // DONE 0.71g
{
//handler->receiveData(RX)
 
1440,7 → 1442,7
 
slot_showTerminal(1, QString(RX.str.c_str()));
}
 
*/
void MKTool::slot_showTerminal(int Typ, QString Text)
{
switch(Typ)