Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 305 → Rev 306

/QMK-Groundstation/trunk/Forms/mktool.h
44,7 → 44,7
 
#include "../Classes/cConnection.h"
#include "../Classes/cSettings.h"
#include "../Classes/cServer.h"
#include "../Classes/cKML_Server.h"
#include "../Classes/cQMK_Server.h"
#include "../Classes/cAttitude.h"
#include "../Classes/cSpeedMeter.h"
51,10 → 51,6
#include "../Logger/Logger.h"
#include "../typedefs.h"
 
#include "../qmapcontrol.h"
 
using namespace qmapcontrol;
 
class QextSerialPort;
 
class MKTool : public QMainWindow, public Ui::dlg_mktool_UI
66,13 → 62,8
~MKTool();
 
private:
 
MapControl* mc;
MapAdapter* mapadapter;
Layer* mainlayer;
 
// Object für Kopter-Verbindung
cConnection *Conn;
cConnection *o_Connection;
 
// Settings-Object (Programmeinstellungen)
cSettings *Settings;
80,8 → 71,8
// Settings-Widget (FC-Settings)
wdg_Settings *f_Settings;
 
// HTTP-Server-Object für Google Earth
cServer *GE_Server;
// HTTP-Server-Object für KML-Files
cKML_Server *KML_Server;
 
// QMK-Serverobjekt
cQMK_Server *QMK_Server;
89,7 → 80,7
// LCD-Dialog
dlg_LCD *f_LCD;
 
// LCD-Dialog
// Map-Dialog
dlg_Map *f_Map;
 
//TCP-Socket
151,6 → 142,7
void init_Connections();
void init_Arrays();
void init_Plot();
void init_Cockpit();
 
// Daten-Plotter
void update_Plot();
171,6 → 163,10
void slot_QMKS_Connected();
void slot_QMKS_Disconnected(int Error);
 
void slot_set_Settings(cSettings *t_Settings);
 
void slot_MAP_SetTarget(sWayPoint Target);
 
void slot_showTerminal(int Typ, QString Text);
 
void slot_ac_Hardware();