Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 313 → Rev 314

/QMK-Groundstation/trunk/Classes/ToolBox.cpp
32,10 → 32,15
#endif
}
 
QString ToolBox::get_Float(long Wert, long Count)
QString ToolBox::get_Float(long Wert, int Count)
{
QString Temp;
QString Temp, s_Wert;
 
s_Wert = QString("%1").arg(Wert);
 
Temp = s_Wert.left(s_Wert.length() - Count) + QString(".") + s_Wert.right(Count);
 
/*
if (Wert > 0)
Temp = "";
else
42,7 → 47,7
Temp = "-";
 
Temp = Temp + QString("%1").arg(Wert / Count) + "." + QString("%1").arg(Wert % Count);
 
*/
return Temp;
}
 
/QMK-Groundstation/trunk/Classes/ToolBox.h
39,7 → 39,7
 
static QString Data2QString(int Data[150], int Start = 0, int End = 150);
static QIcon Icon(int ID);
static QString get_Float(long Wert, long Count);
static QString get_Float(long Wert, int Count);
static void Wait(int Time);
};
 
/QMK-Groundstation/trunk/Forms/mktool.cpp
60,7 → 60,7
setWindowTitle(QA_NAME + " v" + QA_VERSION);
 
// Tab mit Debug-Elementen verbergen
//tab_Main->removeTab(6);
tab_Main->removeTab(6);
// Develop - Nicht gebrauchte sachen abschalten.
pb_SettingsReset->hide();
pb_Flash->hide();
408,8 → 408,8
List = Tmp.split("<coordinates>");
List = List[1].split(",");
 
le_TarLong->setText(ToolBox::get_Float((List[0].toDouble() * 10000000), 10000000));
le_TarLat->setText(ToolBox::get_Float((List[1].toDouble() * 10000000), 10000000));
le_TarLong->setText(ToolBox::get_Float((List[0].toDouble() * 10000000), 7));
le_TarLat->setText(ToolBox::get_Float((List[1].toDouble() * 10000000), 7));
}
}
 
470,10 → 470,10
msg += "Bitte die Eingabe ueberpruefen!\n";
msg += "Die Werte muessen sich in der Naehe der aktuellen Koordinaten befinden\n";
msg += "(Lon: ";
msg += ToolBox::get_Float(Navi.Current.Longitude,10000000);
msg += ToolBox::get_Float(Navi.Current.Longitude,7);
msg += ", ";
msg += "Lat: ";
msg += ToolBox::get_Float(Navi.Current.Latitude,10000000);
msg += ToolBox::get_Float(Navi.Current.Latitude,7);
msg += ")";
msgB.setText(msg);
msgB.exec();
1359,9 → 1359,9
 
sNaviString NaviString;
 
NaviString.Longitude = ToolBox::get_Float(Navi.Current.Longitude,10000000);
NaviString.Latitude = ToolBox::get_Float(Navi.Current.Latitude,10000000);
NaviString.Altitude = ToolBox::get_Float(Navi.Current.Altitude,1000);
NaviString.Longitude = ToolBox::get_Float(Navi.Current.Longitude,7);
NaviString.Latitude = ToolBox::get_Float(Navi.Current.Latitude,7);
NaviString.Altitude = ToolBox::get_Float(Navi.Current.Altitude,3);
 
le_CurLong->setText(NaviString.Longitude);
le_CurLat->setText(NaviString.Latitude);
/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.7.11";
static const QString QA_VERSION_NR = "0.7.12";
 
#ifdef _BETA_
static const QString QA_VERSION = QA_VERSION_NR + " (BETA)";