rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

Merged in leafarB/librepilot (pull request #138)

Browse Source 
Next
This commit is contained in:
Philippe Renon 2015-12-20 20:41:23 +01:00
commit 886c2ccb47
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ground/gcs/src/app/main.cpp
View File

@ -209,6 +209,11 @@ inline QString msgSendArgumentFailed()
"Unable to send command line arguments to the already running instance. It appears to be not responding."); "Unable to send command line arguments to the already running instance. It appears to be not responding.");
} }
inline QString msgLogfileOpenFailed(const QString &fileName)
{
return QCoreApplication::translate("Application", "Failed to open log file %1").arg(fileName);
}
// Prepare a remote argument: If it is a relative file, add the current directory // Prepare a remote argument: If it is a relative file, add the current directory
// since the the central instance might be running in a different directory. // since the the central instance might be running in a different directory.
inline QString prepareRemoteArgument(const QString &arg) inline QString prepareRemoteArgument(const QString &arg)
@ -313,7 +318,7 @@ void logInit(QString fileName)
logStream = new QTextStream(file); logStream = new QTextStream(file);
qInstallMessageHandler(mainMessageOutput); qInstallMessageHandler(mainMessageOutput);
} else { } else {
// TODO error popup displayError(msgLogfileOpenFailed(fileName));
} }
} }

2
ground/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp
View File

@ -614,7 +614,7 @@ bool UAVObjectGeneratorGCS::process_object(ObjectInfo *object)
ctxt.object = object; ctxt.object = object;
ctxt.registerImpl += ::generate(ctxt, ctxt.registerImpl += ::generate(ctxt,
" qmlRegisterType<:ClassName>(\"%1.:ClassName\", 1, 0, \":ClassName\");\n").arg("UAVTalk"); " qmlRegisterType<:ClassName>(\"%1.:ClassName\", 1, 0, \":ClassName\");\n").arg("UAVTalk");
for (int n = 0; n < object->fields.length(); ++n) { for (int n = 0; n < object->fields.length(); ++n) {
FieldInfo *field = object->fields[n]; FieldInfo *field = object->fields[n];