Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 304 → Rev 305

/QMK-Groundstation/trunk/Forms/mktool.cpp
69,7 → 69,6
#ifdef _BETA_
ac_QMKServer->setEnabled(true);
#endif
 
// Settings-Tab hinzufügen.
f_Settings = new wdg_Settings( this );
f_Settings->set_Config(Settings);
204,6 → 203,9
// LCD-Dialog
f_LCD = new dlg_LCD(this);
 
// LCD-Dialog
f_Map = new dlg_Map(this);
 
GE_Server = new cServer();
 
QMK_Server = new cQMK_Server();
239,6 → 241,7
connect(ac_Preferences, SIGNAL(triggered()), this, SLOT(slot_ac_Preferences()));
connect(ac_Motortest, SIGNAL(triggered()), this, SLOT(slot_ac_Motortest()));
connect(ac_LCD, SIGNAL(triggered()), this, SLOT(slot_ac_LCD()));
connect(ac_Map, SIGNAL(triggered()), this, SLOT(slot_ac_Map()));
connect(ac_FastDebug, SIGNAL(triggered()), this, SLOT(slot_ac_FastDebug()));
connect(ac_NoDebug, SIGNAL(triggered()), this, SLOT(slot_ac_NoDebug()));
connect(ac_FastNavi, SIGNAL(triggered()), this, SLOT(slot_ac_FastNavi()));
685,6 → 688,17
}
}
 
void MKTool::slot_ac_Map()
{
if (!f_Map->isVisible())
{
f_Map = new dlg_Map(this);
 
f_Map->show();
}
}
 
 
void MKTool::slot_Motortest(int Motor1, int Motor2, int Motor3, int Motor4)
{
TX_Data[0] = Motor1;
1319,6 → 1333,8
 
GE_Server->store_NaviString(NaviString);
 
f_Map->add_Position(NaviString.Longitude.toDouble(), NaviString.Latitude.toDouble());
 
if ((QMK_Server->property("Connect")) == true)
{
// qDebug("Send Data to Server..!!");