/QMK-Groundstation/trunk/qmapcontrol.h |
---|
File deleted |
/QMK-Groundstation/trunk/QMapControl.pri |
---|
File deleted |
/QMK-Groundstation/trunk/global.pri |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/geometry.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/tilemapadapter.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/osmmapadapter.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/layermanager.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/wmsmapadapter.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/maplayer.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/yahoomapadapter.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/circlepoint.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/googlemapadapter.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/layer.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/gps_position.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/imagemanager.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/mapcontrol.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/linestring.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/mapadapter.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/curve.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/googlesatmapadapter.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/point.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/geometry.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/tilemapadapter.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/mapnetwork.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/geometrylayer.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/osmmapadapter.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/imagepoint.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/wmsmapadapter.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/src.pro |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/googlemapadapter.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/circlepoint.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/layer.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/layermanager.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/imagemanager.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/gps_position.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/mapadapter.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/mapcontrol.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/linestring.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/maplayer.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/googlesatmapadapter.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/yahoomapadapter.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/mapnetwork.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/geometrylayer.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/curve.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/imagepoint.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/point.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/cQMK_Server.cpp |
---|
122,7 → 122,7 |
{ |
case 1 : |
{ |
SendData(1, QString(QA_NAME + " " + QA_VERSION + " [" + QA_OS + "]:" + Username + ":" + Password + ":")); |
SendData(1, QString(QA_NAME + " " + QA_VERSION + ":" + Username + ":" + Password + ":")); |
} |
break; |
case 2 : |
/QMK-Groundstation/trunk/Forms/dlg_Map.h |
---|
File deleted |
/QMK-Groundstation/trunk/Forms/dlg_Map.ui |
---|
File deleted |
/QMK-Groundstation/trunk/Forms/dlg_Map.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Forms/mktool.cpp |
---|
69,6 → 69,7 |
#ifdef _BETA_ |
ac_QMKServer->setEnabled(true); |
#endif |
// Settings-Tab hinzufügen. |
f_Settings = new wdg_Settings( this ); |
f_Settings->set_Config(Settings); |
203,9 → 204,6 |
// 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(); |
241,7 → 239,6 |
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())); |
688,17 → 685,6 |
} |
} |
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; |
1333,8 → 1319,6 |
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..!!"); |
/QMK-Groundstation/trunk/Forms/mktool.h |
---|
40,7 → 40,6 |
#include "ui_mktool.h" |
#include "wdg_Settings.h" |
#include "dlg_LCD.h" |
#include "dlg_Map.h" |
#include "../Classes/cConnection.h" |
#include "../Classes/cSettings.h" |
51,10 → 50,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 |
67,10 → 62,6 |
private: |
MapControl* mc; |
MapAdapter* mapadapter; |
Layer* mainlayer; |
// Object für Kopter-Verbindung |
cConnection *Conn; |
89,9 → 80,6 |
// LCD-Dialog |
dlg_LCD *f_LCD; |
// LCD-Dialog |
dlg_Map *f_Map; |
//TCP-Socket |
QTcpSocket *TcpSocket; |
192,7 → 180,6 |
void slot_ac_GetLabels(); |
void slot_ac_Motortest(); |
void slot_ac_LCD(); |
void slot_ac_Map(); |
void slot_pb_HexFile(); |
void slot_pb_SendWaypoint(); |
/QMK-Groundstation/trunk/Forms/mktool.ui |
---|
1,4 → 1,3 |
<?xml version="1.0" encoding="UTF-8"?> |
<ui version="4.0"> |
<class>dlg_mktool_UI</class> |
<widget class="QMainWindow" name="dlg_mktool_UI"> |
7,7 → 6,7 |
<x>0</x> |
<y>0</y> |
<width>675</width> |
<height>413</height> |
<height>422</height> |
</rect> |
</property> |
<property name="windowTitle"> |
60,13 → 59,13 |
<number>0</number> |
</property> |
<widget class="QWidget" name="Tab_0"> |
<attribute name="title" > |
<string>Debug-Daten </string> |
</attribute> |
<attribute name="icon"> |
<iconset resource="../MKTool.qrc"> |
<normaloff>:/Actions/Images/Actions/Debug.png</normaloff>:/Actions/Images/Actions/Debug.png</iconset> |
</attribute> |
<attribute name="title"> |
<string>Debug-Daten </string> |
</attribute> |
<layout class="QGridLayout" name="gridLayout_7"> |
<item row="0" column="0"> |
<layout class="QHBoxLayout" name="horizontalLayout"> |
987,13 → 986,13 |
</layout> |
</widget> |
<widget class="QWidget" name="Tab_1"> |
<attribute name="title" > |
<string>Plotter</string> |
</attribute> |
<attribute name="icon"> |
<iconset resource="../MKTool.qrc"> |
<normaloff>:/Actions/Images/Actions/Plotter-NO.png</normaloff>:/Actions/Images/Actions/Plotter-NO.png</iconset> |
</attribute> |
<attribute name="title"> |
<string>Plotter</string> |
</attribute> |
<layout class="QGridLayout" name="gridLayout_35"> |
<item row="0" column="0"> |
<widget class="QwtPlot" name="qwtPlot"/> |
1003,7 → 1002,7 |
<item> |
<widget class="QScrollBar" name="scroll_plot"> |
<property name="sizePolicy"> |
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> |
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > |
<horstretch>0</horstretch> |
<verstretch>0</verstretch> |
</sizepolicy> |
1019,7 → 1018,7 |
<item> |
<widget class="QPushButton" name="pb_StartPlotter"> |
<property name="sizePolicy"> |
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> |
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > |
<horstretch>0</horstretch> |
<verstretch>0</verstretch> |
</sizepolicy> |
1038,13 → 1037,13 |
</layout> |
</widget> |
<widget class="QWidget" name="Tab_3"> |
<attribute name="title" > |
<string>Terminal </string> |
</attribute> |
<attribute name="icon"> |
<iconset resource="../MKTool.qrc"> |
<normaloff>:/Actions/Images/Actions/Terminal.png</normaloff>:/Actions/Images/Actions/Terminal.png</iconset> |
</attribute> |
<attribute name="title"> |
<string>Terminal </string> |
</attribute> |
<layout class="QGridLayout" name="gridLayout_2"> |
<item row="0" column="0" colspan="8"> |
<widget class="QTextEdit" name="te_RX"> |
1055,11 → 1054,11 |
</font> |
</property> |
<property name="html"> |
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
p, li { white-space: pre-wrap; } |
</style></head><body style=" font-family:'Adobe Courier'; font-size:10pt; font-weight:400; font-style:normal;"> |
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string> |
</style></head><body style=" font-family:'Adobe Courier'; font-size:10pt; font-weight:400; font-style:normal;"> |
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string> |
</property> |
</widget> |
</item> |
1124,13 → 1123,13 |
</layout> |
</widget> |
<widget class="QWidget" name="Tab_4"> |
<attribute name="title" > |
<string>Cockpit</string> |
</attribute> |
<attribute name="icon"> |
<iconset resource="../MKTool.qrc"> |
<normaloff>:/Actions/Images/Actions/Cockpit.png</normaloff>:/Actions/Images/Actions/Cockpit.png</iconset> |
</attribute> |
<attribute name="title"> |
<string>Cockpit</string> |
</attribute> |
<layout class="QGridLayout" name="gridLayout_13"> |
<item row="0" column="0"> |
<widget class="QGroupBox" name="groupBox"> |
1329,12 → 1328,12 |
</font> |
</property> |
<property name="text"> |
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
p, li { white-space: pre-wrap; } |
</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:600; font-style:normal;"> |
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Geschwindigkeit</p> |
<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string> |
</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:600; font-style:normal;"> |
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Geschwindigkeit</p> |
<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string> |
</property> |
<property name="alignment"> |
<set>Qt::AlignHCenter|Qt::AlignTop</set> |
1354,12 → 1353,12 |
</font> |
</property> |
<property name="text"> |
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
p, li { white-space: pre-wrap; } |
</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:600; font-style:normal;"> |
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ausrichtung</p> |
<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string> |
</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:600; font-style:normal;"> |
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ausrichtung</p> |
<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string> |
</property> |
<property name="alignment"> |
<set>Qt::AlignHCenter|Qt::AlignTop</set> |
1379,12 → 1378,12 |
</font> |
</property> |
<property name="text"> |
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
p, li { white-space: pre-wrap; } |
</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:600; font-style:normal;"> |
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Flugrichtung</p> |
<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string> |
</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:600; font-style:normal;"> |
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Flugrichtung</p> |
<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string> |
</property> |
<property name="alignment"> |
<set>Qt::AlignHCenter|Qt::AlignTop</set> |
1426,12 → 1425,12 |
</font> |
</property> |
<property name="text"> |
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
p, li { white-space: pre-wrap; } |
</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:600; font-style:normal;"> |
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Höhen-</p> |
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">änderung</p></body></html></string> |
</style></head><body style=" font-family:'Sans Serif'; font-size:11pt; font-weight:600; font-style:normal;"> |
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Höhen-</p> |
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">änderung</p></body></html></string> |
</property> |
<property name="alignment"> |
<set>Qt::AlignHCenter|Qt::AlignTop</set> |
1524,13 → 1523,13 |
</layout> |
</widget> |
<widget class="QWidget" name="Tab_5"> |
<attribute name="title" > |
<string>Firmware Update </string> |
</attribute> |
<attribute name="icon"> |
<iconset resource="../MKTool.qrc"> |
<normaloff>:/Actions/Images/Actions/Firmware.png</normaloff>:/Actions/Images/Actions/Firmware.png</iconset> |
</attribute> |
<attribute name="title"> |
<string>Firmware Update </string> |
</attribute> |
<layout class="QGridLayout" name="gridLayout_37"> |
<item row="0" column="0"> |
<widget class="QTextEdit" name="te_Shell"> |
1619,7 → 1618,7 |
<item> |
<widget class="QPushButton" name="pb_HexFile"> |
<property name="sizePolicy"> |
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> |
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > |
<horstretch>0</horstretch> |
<verstretch>0</verstretch> |
</sizepolicy> |
1639,7 → 1638,7 |
<item> |
<widget class="QPushButton" name="pb_Update"> |
<property name="sizePolicy"> |
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> |
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > |
<horstretch>0</horstretch> |
<verstretch>0</verstretch> |
</sizepolicy> |
1664,13 → 1663,13 |
</layout> |
</widget> |
<widget class="QWidget" name="Tab_6"> |
<attribute name="title" > |
<string>Wegpunkte</string> |
</attribute> |
<attribute name="icon"> |
<iconset resource="../MKTool.qrc"> |
<normaloff>:/Actions/Images/Actions/Waypoints.png</normaloff>:/Actions/Images/Actions/Waypoints.png</iconset> |
</attribute> |
<attribute name="title"> |
<string>Wegpunkte</string> |
</attribute> |
<layout class="QGridLayout" name="gridLayout_14"> |
<item row="0" column="0"> |
<widget class="QGroupBox" name="groupBox_2"> |
1730,6 → 1729,7 |
</spacer> |
</item> |
</layout> |
<zorder>verticalSpacer_2</zorder> |
</widget> |
</item> |
<item row="0" column="1"> |
1774,7 → 1774,7 |
</rect> |
</property> |
<property name="sizePolicy"> |
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> |
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > |
<horstretch>0</horstretch> |
<verstretch>0</verstretch> |
</sizepolicy> |
1845,7 → 1845,7 |
</rect> |
</property> |
<property name="text"> |
<string>#cO][`S>zNIP^y``====M==================================z[lS>|zGP^{]Y====M========[n======>o>m>omMq>|m`J==E=============yY </string> |
<string>#cO][`S>zNIP^y``====M==================================z[lS>|zGP^{]Y====M========[n======>o>m>omMq>|m`J==E=============yY </string> |
</property> |
</widget> |
<widget class="QTextEdit" name="te_KML"> |
1882,7 → 1882,7 |
<x>0</x> |
<y>0</y> |
<width>675</width> |
<height>23</height> |
<height>24</height> |
</rect> |
</property> |
<widget class="QMenu" name="menuProgramm"> |
1944,7 → 1944,6 |
</property> |
<addaction name="ac_Motortest"/> |
<addaction name="ac_LCD"/> |
<addaction name="ac_Map"/> |
</widget> |
<widget class="QMenu" name="menuHardware"> |
<property name="title"> |
1995,7 → 1994,6 |
<addaction name="ac_QMKServer"/> |
<addaction name="separator"/> |
<addaction name="ac_StartServer"/> |
<addaction name="ac_Map"/> |
</widget> |
<widget class="QToolBar" name="tb_Werkzeuge"> |
<property name="windowTitle"> |
2363,15 → 2361,6 |
<string>LCD-Display</string> |
</property> |
</action> |
<action name="ac_Map"> |
<property name="icon"> |
<iconset resource="../MKTool.qrc"> |
<normaloff>:/Actions/Images/Actions/Waypoints.png</normaloff>:/Actions/Images/Actions/Waypoints.png</iconset> |
</property> |
<property name="text"> |
<string>Flug-Karte</string> |
</property> |
</action> |
</widget> |
<customwidgets> |
<customwidget> |
/QMK-Groundstation/trunk/debian.pro |
---|
1,8 → 1,79 |
include(QMapControl.pri) |
TEMPLATE = app |
OBJECTS_DIR = build/.o_unix |
UI_DIR = build/.ui |
MOC_DIR = build/.moc |
RCC_DIR = build/.rcc |
DESTDIR = build/bin |
DEFINES += _TTY_POSIX_ |
LIBS += -lqwt-qt4 |
INCLUDEPATH += $(HOME)/include /usr/include/qwt-qt4 |
include(global.pri) |
QT *= gui core network |
CONFIG += warn_on thread qt |
TARGET = QMK-Groundstation |
RESOURCES += MKTool.qrc |
SOURCES = \ |
main.cpp \ |
SerialPort/qextserialbase.cpp \ |
SerialPort/qextserialport.cpp \ |
SerialPort/ManageSerialPort.cpp \ |
Forms/mktool.cpp \ |
Forms/dlg_Config.cpp \ |
Forms/dlg_Motortest.cpp \ |
Forms/dlg_Preferences.cpp \ |
Forms/wdg_Settings.cpp \ |
Classes/cSettings.cpp \ |
Classes/cServer.cpp \ |
Classes/ToolBox.cpp \ |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp \ |
Classes/cConnection.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
unix:SOURCES += SerialPort/posix_qextserialport.cpp |
HEADERS = \ |
global.h \ |
Parameter_Positions.h \ |
SerialPort/qextserialbase.h \ |
SerialPort/qextserialport.h \ |
SerialPort/ManageSerialPort.h \ |
Forms/mktool.h \ |
Forms/dlg_Config.h \ |
Forms/dlg_Motortest.h \ |
Forms/dlg_Preferences.h \ |
Forms/wdg_Settings.h \ |
Classes/cSettings.h \ |
Classes/cServer.h \ |
Classes/ToolBox.h \ |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h \ |
Classes/cConnection.h \ |
typedefs.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
unix:HEADERS += SerialPort/posix_qextserialport.h |
FORMS += \ |
Forms/mktool.ui \ |
Forms/dlg_Config.ui \ |
Forms/dlg_Preferences.ui \ |
Forms/dlg_Motortest.ui \ |
Forms/wdg_Settings.ui \ |
Forms/dlg_LCD.ui |
/QMK-Groundstation/trunk/eeepc.pro |
---|
1,5 → 1,10 |
include(QMapControl.pri) |
TEMPLATE = app |
OBJECTS_DIR = build/.o_unix |
UI_DIR = build/.ui |
MOC_DIR = build/.moc |
RCC_DIR = build/.rcc |
DESTDIR = build/bin |
DEFINES += _TTY_POSIX_ _EEEPC_ |
6,4 → 11,69 |
LIBS += -lqwt-qt4 |
INCLUDEPATH += $(HOME)/include /usr/include/qwt-qt4 |
include(global.pri) |
QT *= gui core network |
CONFIG += warn_on thread qt |
TARGET = QMK-Groundstation |
RESOURCES += MKTool.qrc |
SOURCES = \ |
main.cpp \ |
SerialPort/qextserialbase.cpp \ |
SerialPort/qextserialport.cpp \ |
SerialPort/ManageSerialPort.cpp \ |
Forms/mktool.cpp \ |
Forms/dlg_Config.cpp \ |
Forms/dlg_Motortest.cpp \ |
Forms/dlg_Preferences.cpp \ |
Forms/wdg_Settings.cpp \ |
Classes/cSettings.cpp \ |
Classes/cServer.cpp \ |
Classes/ToolBox.cpp \ |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp \ |
Classes/cConnection.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
unix:SOURCES += SerialPort/posix_qextserialport.cpp |
HEADERS = \ |
global.h \ |
Parameter_Positions.h \ |
SerialPort/qextserialbase.h \ |
SerialPort/qextserialport.h \ |
SerialPort/ManageSerialPort.h \ |
Forms/mktool.h \ |
Forms/dlg_Config.h \ |
Forms/dlg_Motortest.h \ |
Forms/dlg_Preferences.h \ |
Forms/wdg_Settings.h \ |
Classes/cSettings.h \ |
Classes/cServer.h \ |
Classes/ToolBox.h \ |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h \ |
Classes/cConnection.h \ |
typedefs.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
unix:HEADERS += SerialPort/posix_qextserialport.h |
FORMS += \ |
Forms/mktool.ui \ |
Forms/dlg_Config.ui \ |
Forms/dlg_Preferences.ui \ |
Forms/dlg_Motortest.ui \ |
Forms/wdg_Settings.ui \ |
Forms/dlg_LCD.ui |
/QMK-Groundstation/trunk/gentoo.pro |
---|
1,8 → 1,79 |
include(QMapControl.pri) |
TEMPLATE = app |
OBJECTS_DIR = build/.o_unix |
UI_DIR = build/.ui |
MOC_DIR = build/.moc |
RCC_DIR = build/.rcc |
DESTDIR = build/bin |
DEFINES += _TTY_POSIX_ |
LIBS += -lqwt |
INCLUDEPATH += $(HOME)/include /usr/include/qwt5 |
include(global.pri) |
QT *= gui core network |
CONFIG += warn_on thread qt |
TARGET = QMK-Groundstation |
RESOURCES += MKTool.qrc |
SOURCES = \ |
main.cpp \ |
SerialPort/qextserialbase.cpp \ |
SerialPort/qextserialport.cpp \ |
SerialPort/ManageSerialPort.cpp \ |
Forms/mktool.cpp \ |
Forms/dlg_Config.cpp \ |
Forms/dlg_Motortest.cpp \ |
Forms/dlg_Preferences.cpp \ |
Forms/wdg_Settings.cpp \ |
Classes/cSettings.cpp \ |
Classes/cServer.cpp \ |
Classes/ToolBox.cpp \ |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp \ |
Classes/cConnection.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
unix:SOURCES += SerialPort/posix_qextserialport.cpp |
HEADERS = \ |
global.h \ |
Parameter_Positions.h \ |
SerialPort/qextserialbase.h \ |
SerialPort/qextserialport.h \ |
SerialPort/ManageSerialPort.h \ |
Forms/mktool.h \ |
Forms/dlg_Config.h \ |
Forms/dlg_Motortest.h \ |
Forms/dlg_Preferences.h \ |
Forms/wdg_Settings.h \ |
Classes/cSettings.h \ |
Classes/cServer.h \ |
Classes/ToolBox.h \ |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h \ |
Classes/cConnection.h \ |
typedefs.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
unix:HEADERS += SerialPort/posix_qextserialport.h |
FORMS += \ |
Forms/mktool.ui \ |
Forms/dlg_Config.ui \ |
Forms/dlg_Preferences.ui \ |
Forms/dlg_Motortest.ui \ |
Forms/wdg_Settings.ui \ |
Forms/dlg_LCD.ui |
/QMK-Groundstation/trunk/global.h |
---|
56,31 → 56,16 |
static const int SLEEP = 500000; |
static const QString QA_NAME = "QMK-Groundstation"; |
static const QString QA_VERSION_NR = "0.7.8"; |
static const QString QA_VERSION_NR = "0.7.3"; |
#ifdef _BETA_ |
static const QString QA_VERSION = QA_VERSION_NR + " (BETA)"; |
static const QString QA_HWVERSION = "FlightCtrl v0.72p & NaviCtrl v0.14b"; |
static const QString QA_HWVERSION = "FlightCtrl v0.72f & NaviCtrl v0.13a"; |
#else |
static const QString QA_VERSION = QA_VERSION_NR; |
static const QString QA_HWVERSION = "FlightCtrl v0.72p & NaviCtrl v0.14b"; |
static const QString QA_HWVERSION = "FlightCtrl v0.72p & NaviCtrl v0.14a"; |
#endif |
#ifdef Q_OS_LINUX |
static const QString QA_OS = "Linux"; |
#else |
#ifdef Q_OS_DARWIN |
static const QString QA_OS = "OSX"; |
#else |
#ifdef Q_OS_WIN32 |
static const QString QA_OS = "Windows"; |
#else |
static const QString QA_OS = "n/a"; |
#endif |
#endif |
#endif |
static const QString QA_DATE = "02.03.2009"; |
static const QString QA_YEAR = "2008-2009"; |
static const QString QA_AUTHOR = "Manuel Schrape"; |
90,7 → 75,7 |
"<HTML>" |
"<p><b><font size=8>" + QA_NAME + "</font></b></p>" |
"<br />" |
"Version " + QA_VERSION + " - " + QA_DATE + " on " + QA_OS + "" |
"Version " + QA_VERSION + " - " + QA_DATE + "" |
"<br /><b>kompatibel zu " + QA_HWVERSION + "</b>" |
"<br /><br />" |
"(C) " + QA_YEAR + " by " + QA_AUTHOR + " - " |
/QMK-Groundstation/trunk/osx.pro |
---|
1,8 → 1,79 |
include(QMapControl.pri) |
TEMPLATE = app |
OBJECTS_DIR = build/.o_mac |
UI_DIR = build/.ui |
MOC_DIR = build/.moc |
RCC_DIR = build/.rcc |
DESTDIR = build/bin |
DEFINES += _TTY_POSIX_ |
LIBS += -L/opt/local/lib -lqwt |
INCLUDEPATH += /opt/local/include |
include(global.pri) |
QT *= gui core network |
CONFIG += warn_on thread qt |
TARGET = QMK-Groundstation |
RESOURCES += MKTool.qrc |
SOURCES = \ |
main.cpp \ |
SerialPort/qextserialbase.cpp \ |
SerialPort/qextserialport.cpp \ |
SerialPort/ManageSerialPort.cpp \ |
Forms/mktool.cpp \ |
Forms/dlg_Config.cpp \ |
Forms/dlg_Motortest.cpp \ |
Forms/dlg_Preferences.cpp \ |
Forms/wdg_Settings.cpp \ |
Classes/cSettings.cpp \ |
Classes/cServer.cpp \ |
Classes/ToolBox.cpp \ |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp \ |
Classes/cConnection.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
unix:SOURCES += SerialPort/posix_qextserialport.cpp |
HEADERS = \ |
global.h \ |
Parameter_Positions.h \ |
SerialPort/qextserialbase.h \ |
SerialPort/qextserialport.h \ |
SerialPort/ManageSerialPort.h \ |
Forms/mktool.h \ |
Forms/dlg_Config.h \ |
Forms/dlg_Motortest.h \ |
Forms/dlg_Preferences.h \ |
Forms/wdg_Settings.h \ |
Classes/cSettings.h \ |
Classes/cServer.h \ |
Classes/ToolBox.h \ |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h \ |
Classes/cConnection.h \ |
typedefs.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
unix:HEADERS += SerialPort/posix_qextserialport.h |
FORMS += \ |
Forms/mktool.ui \ |
Forms/dlg_Config.ui \ |
Forms/dlg_Preferences.ui \ |
Forms/dlg_Motortest.ui \ |
Forms/wdg_Settings.ui \ |
Forms/dlg_LCD.ui |
/QMK-Groundstation/trunk/suse.pro |
---|
1,8 → 1,79 |
include(QMapControl.pri) |
TEMPLATE = app |
OBJECTS_DIR = build/.o_unix |
UI_DIR = build/.ui |
MOC_DIR = build/.moc |
RCC_DIR = build/.rcc |
DESTDIR = build/bin |
DEFINES += _TTY_POSIX_ |
LIBS += -lqwt |
INCLUDEPATH += $(HOME)/include /usr/include/qwt |
include(global.pri) |
QT *= gui core network |
CONFIG += warn_on thread qt |
TARGET = QMK-Groundstation |
RESOURCES += MKTool.qrc |
SOURCES = \ |
main.cpp \ |
SerialPort/qextserialbase.cpp \ |
SerialPort/qextserialport.cpp \ |
SerialPort/ManageSerialPort.cpp \ |
Forms/mktool.cpp \ |
Forms/dlg_Config.cpp \ |
Forms/dlg_Motortest.cpp \ |
Forms/dlg_Preferences.cpp \ |
Forms/wdg_Settings.cpp \ |
Classes/cSettings.cpp \ |
Classes/cServer.cpp \ |
Classes/ToolBox.cpp \ |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp \ |
Classes/cConnection.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
unix:SOURCES += SerialPort/posix_qextserialport.cpp |
HEADERS = \ |
global.h \ |
Parameter_Positions.h \ |
SerialPort/qextserialbase.h \ |
SerialPort/qextserialport.h \ |
SerialPort/ManageSerialPort.h \ |
Forms/mktool.h \ |
Forms/dlg_Config.h \ |
Forms/dlg_Motortest.h \ |
Forms/dlg_Preferences.h \ |
Forms/wdg_Settings.h \ |
Classes/cSettings.h \ |
Classes/cServer.h \ |
Classes/ToolBox.h \ |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h \ |
Classes/cConnection.h \ |
typedefs.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
unix:HEADERS += SerialPort/posix_qextserialport.h |
FORMS += \ |
Forms/mktool.ui \ |
Forms/dlg_Config.ui \ |
Forms/dlg_Preferences.ui \ |
Forms/dlg_Motortest.ui \ |
Forms/wdg_Settings.ui \ |
Forms/dlg_LCD.ui |
/QMK-Groundstation/trunk/win.pro |
---|
1,5 → 1,4 |
include( ../examples.pri ) |
include(QMapControl.pri) |
QWT_ROOT = ../qwt-5.1.1 |
33,4 → 32,69 |
DEFINES += _TTY_WIN_ QWT_DLL QT_DLL _WIN32_ |
include(global.pri) |
QT *= gui core network |
CONFIG += warn_on thread qt |
TARGET = QMK-Groundstation |
RESOURCES += MKTool.qrc |
SOURCES = \ |
main.cpp \ |
SerialPort/qextserialbase.cpp \ |
SerialPort/qextserialport.cpp \ |
SerialPort/ManageSerialPort.cpp \ |
Forms/mktool.cpp \ |
Forms/dlg_Config.cpp \ |
Forms/dlg_Motortest.cpp \ |
Forms/dlg_Preferences.cpp \ |
Forms/wdg_Settings.cpp \ |
Classes/cSettings.cpp \ |
Classes/cServer.cpp \ |
Classes/ToolBox.cpp \ |
Classes/cAttitude.cpp \ |
Classes/cSpeedMeter.cpp \ |
Classes/cQMK_Server.cpp \ |
Logger/Logger.cpp \ |
Logger/CSVLogger.cpp \ |
Forms/dlg_LCD.cpp \ |
Classes/cConnection.cpp |
win32:SOURCES += SerialPort/win_qextserialport.cpp |
unix:SOURCES += SerialPort/posix_qextserialport.cpp |
HEADERS = \ |
global.h \ |
Parameter_Positions.h \ |
SerialPort/qextserialbase.h \ |
SerialPort/qextserialport.h \ |
SerialPort/ManageSerialPort.h \ |
Forms/mktool.h \ |
Forms/dlg_Config.h \ |
Forms/dlg_Motortest.h \ |
Forms/dlg_Preferences.h \ |
Forms/wdg_Settings.h \ |
Classes/cSettings.h \ |
Classes/cServer.h \ |
Classes/ToolBox.h \ |
Classes/cAttitude.h \ |
Classes/cSpeedMeter.h \ |
Classes/cQMK_Server.h \ |
Logger/Logger.h \ |
Logger/CSVLogger.h \ |
Logger/DefaultLogger.h \ |
Forms/dlg_LCD.h \ |
Classes/cConnection.h \ |
typedefs.h |
win32:HEADERS += SerialPort/win_qextserialport.h |
unix:HEADERS += SerialPort/posix_qextserialport.h |
FORMS += \ |
Forms/mktool.ui \ |
Forms/dlg_Config.ui \ |
Forms/dlg_Preferences.ui \ |
Forms/dlg_Motortest.ui \ |
Forms/wdg_Settings.ui \ |
Forms/dlg_LCD.ui |