Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 393 → Rev 394

/QMK-Groundstation/branches/own_com_lib/Classes/ToolBox.cpp
18,6 → 18,7
***************************************************************************/
 
#include "ToolBox.h"
#include "../com/Parser.h"
 
/**
* specific data for QT
49,7 → 50,7
// Datensatz nach QString
QString ToolBox::dataToQString(int Data[150], int Start, int End)
{
return QString(Parser::dataToString(Data, Start, End));
return QString(Parser::dataToString(Data, Start, End).c_str());
}
 
// Alle Icons
/QMK-Groundstation/branches/own_com_lib/Classes/cKML_Server.cpp
117,7 → 117,9
 
for (int a = 0; a < NaviCount; a++)
{
block = block + Route[a].Longitude.toLatin1() + "," + Route[a].Latitude.toLatin1() + "," + Route[a].Altitude.toLatin1() + " " ;
block = block + QString::number(Route[a].Longitude).toAscii() + "," +
QString::number(Route[a].Latitude).toAscii() + "," +
QString::number(Route[a].Altitude).toAscii();
block = block + "\n";
}
 
/QMK-Groundstation/branches/own_com_lib/Classes/cQMK_Server.cpp
61,7 → 61,10
{
if (1==1)
{
SendData(100, QString(Pos.Longitude + ":" + Pos.Latitude + ":" + Pos.Altitude));
QString data = QString::number(Pos.Longitude).toAscii() + ":" +
QString::number(Pos.Latitude).toAscii() + ":" +
QString::number(Pos.Altitude).toAscii();
SendData(100, data);
}
}
 
/QMK-Groundstation/branches/own_com_lib/Classes/cSettings.cpp
82,7 → 82,7
// Config der Analogwert-Anzeige (Plotter / CVS)
void cSettings::write_Settings_Analog(int ID)
{
QString Hardware = HardwareType[ID];
QString Hardware = QString(HardwareType[ID].c_str());
 
QSettings Setting("KeyOz-Net", "QMK-Groundstation");
 
97,7 → 97,7
QBitArray Def_View;
Def_View.fill(true,MaxAnalog);
 
QString Hardware = HardwareType[ID];
QString Hardware = QString(HardwareType[ID].c_str());
 
QSettings Setting("KeyOz-Net", "QMK-Groundstation");
 
110,7 → 110,7
// Labels der Analogwerte.
void cSettings::write_Settings_AnalogLabels(int ID)
{
QString Hardware = HardwareType[ID];
QString Hardware = QString(HardwareType[ID].c_str());
 
QSettings Setting("KeyOz-Net", "QMK-Groundstation-Labels");
 
125,7 → 125,7
 
void cSettings::read_Settings_AnalogLabels(int ID)
{
QString Hardware = HardwareType[ID];
QString Hardware = QString(HardwareType[ID].c_str());
 
QSettings Setting("KeyOz-Net", "QMK-Groundstation-Labels");
 
/QMK-Groundstation/branches/own_com_lib/Classes/cSettings.h
19,7 → 19,7
#ifndef CSETTINGS_H
#define CSETTINGS_H
 
//#include "../global.h"
#include "../global.h"
#include "../com/Kopter.h"
 
struct set_TTY
/QMK-Groundstation/branches/own_com_lib/Forms/dlg_Config.cpp
94,7 → 94,7
{
Settings = Set;
 
lb_Hardware->setText(HardwareType[ID]);
lb_Hardware->setText(QString(HardwareType[ID].c_str()));
 
for (int a = 0; a < MaxAnalog; a++)
{
/QMK-Groundstation/branches/own_com_lib/Forms/dlg_LCD.cpp
25,8 → 25,8
 
void dlg_LCD::show_Data(int *Data)
{
le_LCD0->setText(ToolBox::Data2QString(Data,2,22));
le_LCD1->setText(ToolBox::Data2QString(Data,22,42));
le_LCD2->setText(ToolBox::Data2QString(Data,42,62));
le_LCD3->setText(ToolBox::Data2QString(Data,62,82));
le_LCD0->setText(ToolBox::dataToQString(Data,2,22));
le_LCD1->setText(ToolBox::dataToQString(Data,22,42));
le_LCD2->setText(ToolBox::dataToQString(Data,42,62));
le_LCD3->setText(ToolBox::dataToQString(Data,62,82));
}
/QMK-Groundstation/branches/own_com_lib/Logger/CSVLogger.cpp
51,7 → 51,7
{
if (!csvfile->isOpen())
{
QString mode_name = mode->Hardware;
QString mode_name = QString(mode->Hardware.c_str());
 
if (mode_name.size() == 0)
{