/QMK-Groundstation/TODO.TXT |
---|
4,7 → 4,7 |
DONE *** Schalter für OSD-Abo |
DONE ** Anzeigen von Flugdaten im Cockpit. |
DONE ** Übertragen von Targets und Waypoints. |
** Übertragen von Targets und Waypoints. |
DONE ** Icons und Iconhandling überarbeiten. |
** Help-Texte bei den Settings aus Datei laden. |
/QMK-Groundstation/trunk/Classes/QMapControl/fixedimageoverlay.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/openaerialmapadapter.h |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/fixedimageoverlay.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/openaerialmapadapter.cpp |
---|
File deleted |
/QMK-Groundstation/trunk/Classes/QMapControl/point.h |
---|
129,7 → 129,7 |
/*! |
* @return the latitude of the point |
*/ |
qreal latitude() const; |
qreal latitude() const; |
//! returns the coordinate of the point |
/*! |
137,7 → 137,7 |
* the y component the latitude |
* @return the coordinate of a point |
*/ |
QPointF coordinate() const; |
QPointF coordinate() const; |
virtual QList<Point*> points(); |
152,7 → 152,7 |
*/ |
QPixmap* pixmap(); |
//! Sets the zoom level on which the point�s pixmap gets displayed on full size |
//! Sets the zoom level on which the point´s pixmap gets displayed on full size |
/*! |
* Use this method to set a zoom level on which the pixmap gets displayed with its real size. |
* On zoomlevels below it will be displayed smaller, and on zoom levels thereover it will be displayed larger |
163,7 → 163,7 |
//! sets a minimal size for the pixmap |
/*! |
* When the point's pixmap should change its size on zooming, this method sets the minimal size. |
* When the point´s pixmap should change its size on zooming, this method sets the minimal size. |
* @see setBaselevel |
* @param minsize the minimal size which the pixmap should have |
*/ |
/QMK-Groundstation/trunk/Forms/dlg_Map.cpp |
---|
26,8 → 26,8 |
cb_Maps->removeItem(5); |
cb_Maps->removeItem(4); |
// cb_Maps->removeItem(3); |
// cb_Maps->removeItem(2); |
cb_Maps->removeItem(3); |
cb_Maps->removeItem(2); |
pb_Add->setEnabled(false); |
pb_Goto->setEnabled(false); |
46,7 → 46,6 |
connect(pb_Delete, SIGNAL(clicked()), this, SLOT(slot_DeleteWayPoints())); |
connect(pb_Goto, SIGNAL(clicked()), this, SLOT(slot_GotoTarget())); |
connect(pb_SendWaypoints, SIGNAL(clicked()), this, SLOT(slot_SendWayPoints())); |
connect(pb_LoadPic, SIGNAL(clicked()), this, SLOT(slot_LoadMapPic())); |
connect(pb_Load, SIGNAL(clicked()), this, SLOT(slot_LoadWayPoints())); |
connect(pb_Save, SIGNAL(clicked()), this, SLOT(slot_SaveWayPoints())); |
423,43 → 422,10 |
} |
o_Map->updateRequestNew(); |
// qDebug(QString("%1").arg(Coord.x()).toLatin1().data()); |
// qDebug(QString("%1").arg(Coord.y()).toLatin1().data()); |
} |
void dlg_Map::slot_LoadMapPic() |
{ |
QString Filename = QFileDialog::getOpenFileName(this, "Bild als Karte", o_Settings->DIR.Logging, "Bilddatei(*.jpg *.png *.gif);;Alle Dateien (*)"); |
if (!Filename.isEmpty()) |
{ |
QFile f_Points(Filename + ".pos"); |
if (f_Points.exists()) |
{ |
f_Points.open(QIODevice::ReadOnly | QIODevice::Text); |
QString s_Points; |
while (!f_Points.atEnd()) |
{ |
s_Points.append(f_Points.readLine()); |
} |
f_Points.close(); |
QStringList s_Pos = s_Points.split(","); |
FixedImageOverlay* fip = new FixedImageOverlay(s_Pos[0].toDouble(), s_Pos[1].toDouble(), s_Pos[2].toDouble(), s_Pos[3].toDouble(), Filename); |
o_Layer->addGeometry(fip); |
o_Map->updateRequestNew(); |
} |
} |
} |
// auf Veränderung der Fenstergröße reagieren |
void dlg_Map::resizeEvent ( QResizeEvent * event ) |
{ |
/QMK-Groundstation/trunk/Forms/dlg_Map.h |
---|
84,8 → 84,6 |
void slot_SendWayPoints(); |
void slot_ShowWayPoints(bool); |
void slot_LoadMapPic(); |
void slot_GotoTarget(); |
void slot_Close(); |
/QMK-Groundstation/trunk/Forms/dlg_Map.ui |
---|
310,13 → 310,6 |
</item> |
</widget> |
</item> |
<item> |
<widget class="QPushButton" name="pb_LoadPic"> |
<property name="text"> |
<string>Bild laden</string> |
</property> |
</widget> |
</item> |
</layout> |
</item> |
</layout> |
/QMK-Groundstation/trunk/QMapControl.pri |
---|
24,9 → 24,7 |
geometrylayer.h \ |
yahoomapadapter.h \ |
googlemapadapter.h \ |
googlesatmapadapter.h \ |
openaerialmapadapter.h \ |
fixedimageoverlay.h |
googlesatmapadapter.h |
SOURCES += curve.cpp \ |
geometry.cpp \ |
imagemanager.cpp \ |
47,8 → 45,6 |
geometrylayer.cpp \ |
yahoomapadapter.cpp \ |
googlemapadapter.cpp \ |
googlesatmapadapter.cpp \ |
openaerialmapadapter.cpp \ |
fixedimageoverlay.cpp |
googlesatmapadapter.cpp |
QT += network |
/QMK-Groundstation/trunk/global.h |
---|
56,7 → 56,7 |
static const int SLEEP = 500000; |
static const QString QA_NAME = "QMK-Groundstation"; |
static const QString QA_VERSION_NR = "0.8.7"; |
static const QString QA_VERSION_NR = "0.8.5"; |
#ifdef _BETA_ |
static const QString QA_VERSION = QA_VERSION_NR + " (BETA)"; |
/QMK-Groundstation/trunk/qmapcontrol.h |
---|
13,5 → 13,3 |
#include "Classes/QMapControl/yahoomapadapter.h" |
#include "Classes/QMapControl/googlemapadapter.h" |
#include "Classes/QMapControl/googlesatmapadapter.h" |
#include "Classes/QMapControl//openaerialmapadapter.h" |
#include "Classes/QMapControl//fixedimageoverlay.h" |