zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

More code documentation

QGC4.4
Gus Grubba 5 years ago
parent
347a855289
commit
f6c49f99f5
20 changed files with 203 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      doc/Doxyfile
  2. BIN
      doc/graphs.graffle
  3. 56
      doc/header.html
  4. 2
      doc/links.md
  5. 38
      doc/links.svg
  6. 2
      doc/vehicleMgmt.md
  7. 9
      src/AnalyzeView/MAVLinkInspectorController.h
  8. 17
      src/Camera/QGCCameraControl.h
  9. 5
      src/Camera/QGCCameraIO.h
  10. 5
      src/Camera/QGCCameraManager.h
  11. 16
      src/Joystick/Joystick.h
  12. 14
      src/Joystick/JoystickManager.h
  13. 18
      src/Joystick/JoystickSDL.h
  14. 5
      src/Settings/AppSettings.h
  15. 5
      src/Settings/AutoConnectSettings.h
  16. 4
      src/Settings/BrandImageSettings.h
  17. 30
      src/api/QGCCorePlugin.h
  18. 5
      src/api/QGCOptions.h
  19. 24
      src/ui/MainRootWindow.qml

2
doc/Doxyfile
Unescape View File

@ -191,7 +191,7 @@ IGNORE_PREFIX = @@ -191,7 +191,7 @@ IGNORE_PREFIX =
GENERATE_HTML = YES
HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
HTML_HEADER =
HTML_HEADER = ./header.html
HTML_FOOTER =
HTML_STYLESHEET =
HTML_EXTRA_STYLESHEET =

BIN
doc/graphs.graffle
View File

Binary file not shown.

56
doc/header.html
Unescape View File

@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
<!-- HTML header for doxygen 1.8.16-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<meta name="generator" content="Doxygen $doxygenversion"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="$relpath^jquery.js"></script>
<script type="text/javascript" src="$relpath^dynsections.js"></script>
$treeview
$search
$mathjax
<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
$extrastylesheet
</head>
<body>
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
<!--BEGIN TITLEAREA-->
<div id="titlearea">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr style="height: 56px;">
<!--BEGIN PROJECT_LOGO-->
<td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo" style="width:64px;height:64px;"/></td>
<!--END PROJECT_LOGO-->
<!--BEGIN PROJECT_NAME-->
<td id="projectalign" style="padding-left: 0.5em;">
<div style="font: 200% Tahoma, Arial,sans-serif; margin: 0px; padding: 2px 0px;">$projectname
<!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER-->
</div>
<!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF-->
</td>
<!--END PROJECT_NAME-->
<!--BEGIN !PROJECT_NAME-->
<!--BEGIN PROJECT_BRIEF-->
<td style="padding-left: 0.5em;">
<div id="projectbrief">$projectbrief</div>
</td>
<!--END PROJECT_BRIEF-->
<!--END !PROJECT_NAME-->
<!--BEGIN DISABLE_INDEX-->
<!--BEGIN SEARCHENGINE-->
<td>$searchbox</td>
<!--END SEARCHENGINE-->
<!--END DISABLE_INDEX-->
</tr>
</tbody>
</table>
</div>
<!--END TITLEAREA-->
<!-- end header part -->

2
doc/links.md
Unescape View File

@ -12,5 +12,5 @@ LinkInterface::bytesReceived signal and when data needs to be sent back to a veh @@ -12,5 +12,5 @@ LinkInterface::bytesReceived signal and when data needs to be sent back to a veh
LinkInterface::writeBytesSafe method.
<div align="center">
<img src="../links.svg">
<img src="../links.svg" style="width:80%; height=auto;">
</div>

38
doc/links.svg
Unescape View File

@ -1,7 +1,17 @@ @@ -1,7 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="60.25 139 567.25007 358.75" width="567.25007" height="358.75">
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="55.69 134.44 579.25007 370.75" width="579.25007" height="370.75">
<defs>
<filter id="Shadow" filterUnits="userSpaceOnUse" x="55.69" y="134.44">
<feGaussianBlur in="SourceAlpha" result="blur" stdDeviation="2.616"/>
<feOffset in="blur" result="offset" dx="1.44" dy="1.44"/>
<feFlood flood-color="black" flood-opacity=".5" result="flood"/>
<feComposite in="flood" in2="offset" operator="in" result="color"/>
<feMerge>
<feMergeNode in="color"/>
<feMergeNode in="SourceGraphic"/>
</feMerge>
</filter>
<linearGradient x1="0" x2="1" id="Gradient" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#eee"/>
<stop offset="1" stop-color="#afafaf"/>
@ -35,48 +45,48 @@ @@ -35,48 +45,48 @@
<linearGradient id="Obj_Gradient_7" xl:href="#Gradient_3" gradientTransform="translate(471.00007 389.25) rotate(90) scale(40)"/>
</defs>
<metadata> Produced by OmniGraffle 7.12.1
<dc:date>2020-02-01 16:33:59 +0000</dc:date>
<dc:date>2020-02-01 16:48:51 +0000</dc:date>
</metadata>
<g id="Canvas_1" fill-opacity="1" fill="none" stroke="none" stroke-opacity="1" stroke-dasharray="none">
<title>Canvas 1</title>
<g id="Canvas_1: Layer 1">
<title>Layer 1</title>
<g id="Graphic_2">
<g id="Graphic_2" filter="url(#Shadow)">
<path d="M 166.5 139.5 L 328.5 139.5 C 333.47056 139.5 337.5 143.52944 337.5 148.5 L 337.5 220.5 C 337.5 225.47056 333.47056 229.5 328.5 229.5 L 166.5 229.5 C 161.52944 229.5 157.5 225.47056 157.5 220.5 L 157.5 148.5 C 157.5 143.52944 161.52944 139.5 166.5 139.5 Z" fill="url(#Obj_Gradient)"/>
<path d="M 166.5 139.5 L 328.5 139.5 C 333.47056 139.5 337.5 143.52944 337.5 148.5 L 337.5 220.5 C 337.5 225.47056 333.47056 229.5 328.5 229.5 L 166.5 229.5 C 161.52944 229.5 157.5 225.47056 157.5 220.5 L 157.5 148.5 C 157.5 143.52944 161.52944 139.5 166.5 139.5 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<text transform="translate(162.5 177.5)" fill="black">
<tspan font-family="Courier" font-size="12" font-weight="400" fill="black" x="45.393555" y="11">LinkManager</tspan>
</text>
</g>
<g id="Graphic_6">
<g id="Graphic_6" filter="url(#Shadow)">
<path d="M 69.75 274.5 L 231.75 274.5 C 236.72056 274.5 240.75 278.52944 240.75 283.5 L 240.75 355.5 C 240.75 360.47056 236.72056 364.5 231.75 364.5 L 69.75 364.5 C 64.77944 364.5 60.75 360.47056 60.75 355.5 L 60.75 283.5 C 60.75 278.52944 64.77944 274.5 69.75 274.5 Z" fill="url(#Obj_Gradient_2)"/>
<path d="M 69.75 274.5 L 231.75 274.5 C 236.72056 274.5 240.75 278.52944 240.75 283.5 L 240.75 355.5 C 240.75 360.47056 236.72056 364.5 231.75 364.5 L 69.75 364.5 C 64.77944 364.5 60.75 360.47056 60.75 355.5 L 60.75 283.5 C 60.75 278.52944 64.77944 274.5 69.75 274.5 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<text transform="translate(65.75 312.5)" fill="black">
<tspan font-family="Courier" font-size="12" font-weight="400" fill="black" x="23.79004" y="11">LinkConfiguration</tspan>
</text>
</g>
<g id="Graphic_9">
<g id="Graphic_9" filter="url(#Shadow)">
<path d="M 261 274.5 L 423 274.5 C 427.97056 274.5 432 278.52944 432 283.5 L 432 355.5 C 432 360.47056 427.97056 364.5 423 364.5 L 261 364.5 C 256.02944 364.5 252 360.47056 252 355.5 L 252 283.5 C 252 278.52944 256.02944 274.5 261 274.5 Z" fill="url(#Obj_Gradient_3)"/>
<path d="M 261 274.5 L 423 274.5 C 427.97056 274.5 432 278.52944 432 283.5 L 432 355.5 C 432 360.47056 427.97056 364.5 423 364.5 L 261 364.5 C 256.02944 364.5 252 360.47056 252 355.5 L 252 283.5 C 252 278.52944 256.02944 274.5 261 274.5 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<text transform="translate(257 312.5)" fill="black">
<tspan font-family="Courier" font-size="12" font-weight="400" fill="black" x="38.192383" y="11">LinkInterface</tspan>
</text>
</g>
<g id="Graphic_11">
<g id="Graphic_11" filter="url(#Shadow)">
<path d="M 261 396 L 423 396 C 427.97056 396 432 400.02944 432 405 L 432 477 C 432 481.97056 427.97056 486 423 486 L 261 486 C 256.02944 486 252 481.97056 252 477 L 252 405 C 252 400.02944 256.02944 396 261 396 Z" fill="url(#Obj_Gradient_4)"/>
<path d="M 261 396 L 423 396 C 427.97056 396 432 400.02944 432 405 L 432 477 C 432 481.97056 427.97056 486 423 486 L 261 486 C 256.02944 486 252 481.97056 252 477 L 252 405 C 252 400.02944 256.02944 396 261 396 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<text transform="translate(257 434)" fill="black">
<tspan font-family="Courier" font-size="12" font-weight="400" fill="black" x="59.7959" y="11">UDPLink</tspan>
</text>
</g>
<g id="Graphic_13">
<g id="Graphic_13" filter="url(#Shadow)">
<path d="M 69.75 396 L 231.75 396 C 236.72056 396 240.75 400.02944 240.75 405 L 240.75 477 C 240.75 481.97056 236.72056 486 231.75 486 L 69.75 486 C 64.77944 486 60.75 481.97056 60.75 477 L 60.75 405 C 60.75 400.02944 64.77944 396 69.75 396 Z" fill="url(#Obj_Gradient_5)"/>
<path d="M 69.75 396 L 231.75 396 C 236.72056 396 240.75 400.02944 240.75 405 L 240.75 477 C 240.75 481.97056 236.72056 486 231.75 486 L 69.75 486 C 64.77944 486 60.75 481.97056 60.75 477 L 60.75 405 C 60.75 400.02944 64.77944 396 69.75 396 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<text transform="translate(65.75 434)" fill="black">
<tspan font-family="Courier" font-size="12" font-weight="400" fill="black" x="27.390625" y="11">UDPConfiguration</tspan>
</text>
</g>
<g id="Graphic_14">
<g id="Graphic_14" filter="url(#Shadow)">
<path d="M 516.00007 384.75 L 618.0001 384.75 C 622.9706 384.75 627.0001 388.77944 627.0001 393.75 L 627.0001 425.25 C 627.0001 430.22056 622.9706 434.25 618.0001 434.25 L 516.00007 434.25 C 511.0295 434.25 507.00007 430.22056 507.00007 425.25 L 507.00007 393.75 C 507.00007 388.77944 511.0295 384.75 516.00007 384.75 Z" fill="#c0ffc0"/>
<path d="M 516.00007 384.75 L 618.0001 384.75 C 622.9706 384.75 627.0001 388.77944 627.0001 393.75 L 627.0001 425.25 C 627.0001 430.22056 622.9706 434.25 618.0001 434.25 L 516.00007 434.25 C 511.0295 434.25 507.00007 430.22056 507.00007 425.25 L 507.00007 393.75 C 507.00007 388.77944 511.0295 384.75 516.00007 384.75 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<text transform="translate(512.00007 395.332)" fill="black">
@ -84,7 +94,7 @@ @@ -84,7 +94,7 @@
<tspan font-family="Courier" font-size="12" font-weight="400" fill="black" x="8.192383" y="25.336">bytesReceived</tspan>
</text>
</g>
<g id="Graphic_15">
<g id="Graphic_15" filter="url(#Shadow)">
<path d="M 516.00007 447.75 L 618.0001 447.75 C 622.9706 447.75 627.0001 451.77944 627.0001 456.75 L 627.0001 488.25 C 627.0001 493.22056 622.9706 497.25 618.0001 497.25 L 516.00007 497.25 C 511.0295 497.25 507.00007 493.22056 507.00007 488.25 L 507.00007 456.75 C 507.00007 451.77944 511.0295 447.75 516.00007 447.75 Z" fill="#ffc0c0"/>
<path d="M 516.00007 447.75 L 618.0001 447.75 C 622.9706 447.75 627.0001 451.77944 627.0001 456.75 L 627.0001 488.25 C 627.0001 493.22056 622.9706 497.25 618.0001 497.25 L 516.00007 497.25 C 511.0295 497.25 507.00007 493.22056 507.00007 488.25 L 507.00007 456.75 C 507.00007 451.77944 511.0295 447.75 516.00007 447.75 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<text transform="translate(512.00007 458.332)" fill="black">
@ -92,11 +102,11 @@ @@ -92,11 +102,11 @@
<tspan font-family="Courier" font-size="12" font-weight="400" fill="black" x="4.591797" y="25.336">writeBytesSafe</tspan>
</text>
</g>
<g id="Graphic_16">
<g id="Graphic_16" filter="url(#Shadow)">
<path d="M 498.75013 460.44024 L 498.75013 480.44024 L 463.25 480.44024 L 463.25 490.44024 L 443.25 470.44024 L 463.25 450.44024 L 463.25 460.44024 Z" fill="url(#Obj_Gradient_6)"/>
<path d="M 498.75013 460.44024 L 498.75013 480.44024 L 463.25 480.44024 L 463.25 490.44024 L 443.25 470.44024 L 463.25 450.44024 L 463.25 460.44024 Z" stroke="#c01b00" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
</g>
<g id="Graphic_17">
<g id="Graphic_17" filter="url(#Shadow)">
<path d="M 443.25 419.25 L 443.25 399.25 L 478.7501 399.25 L 478.7501 389.25 L 498.75013 409.25 L 478.7501 429.25 L 478.7501 419.25 Z" fill="url(#Obj_Gradient_7)"/>
<path d="M 443.25 419.25 L 443.25 399.25 L 478.7501 399.25 L 478.7501 389.25 L 498.75013 409.25 L 478.7501 429.25 L 478.7501 419.25 Z" stroke="#c01b00" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
</g>
@ -107,13 +117,13 @@ @@ -107,13 +117,13 @@
<path d="M 247.5 229.5 L 247.5 252 L 342 252 L 342 274.5" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
</g>
<g id="Line_45">
<line x1="150.75" y1="364.5" x2="150.75" y2="396" stroke="#7f8080" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<line x1="150.75" y1="364.5" x2="150.75" y2="396" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
</g>
<g id="Line_46">
<line x1="342" y1="364.5" x2="342" y2="396" stroke="#7f8080" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<line x1="342" y1="364.5" x2="342" y2="396" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
</g>
<g id="Line_47">
<line x1="240.75" y1="441" x2="252" y2="441" stroke="#7f8080" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
<line x1="240.75" y1="441" x2="252" y2="441" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
</g>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

2
doc/vehicleMgmt.md
Unescape View File

@ -10,5 +10,5 @@ signal for the first time, it creates a vehicle instance, recording the vehicle @@ -10,5 +10,5 @@ signal for the first time, it creates a vehicle instance, recording the vehicle
The Vehicle class holds all the functionality to handle vehicles. It receives all messages sent from the vehicle and manage all messages and commands to that vehicle.
<div align="center">
<img src="../vehicleMgmt.svg">
<img src="../vehicleMgmt.svg" style="width:80%; height=auto;">
</div>

9
src/AnalyzeView/MAVLinkInspectorController.h
Unescape View File

@ -7,6 +7,10 @@ @@ -7,6 +7,10 @@
*
****************************************************************************/
/// @file
/// @brief MAVLink message inspector and charting controller
/// @author Gus Grubba <gus@auterion.com>
#pragma once
#include "MAVLinkProtocol.h"
@ -28,6 +32,7 @@ class MAVLinkChartController; @@ -28,6 +32,7 @@ class MAVLinkChartController;
class MAVLinkInspectorController;
//-----------------------------------------------------------------------------
/// MAVLink message field
class QGCMAVLinkMessageField : public QObject {
Q_OBJECT
public:
@ -81,6 +86,7 @@ private: @@ -81,6 +86,7 @@ private:
};
//-----------------------------------------------------------------------------
/// MAVLink message
class QGCMAVLinkMessage : public QObject {
Q_OBJECT
public:
@ -130,6 +136,7 @@ private: @@ -130,6 +136,7 @@ private:
};
//-----------------------------------------------------------------------------
/// Vehicle MAVLink message belongs to
class QGCMAVLinkVehicle : public QObject {
Q_OBJECT
public:
@ -172,6 +179,7 @@ private: @@ -172,6 +179,7 @@ private:
};
//-----------------------------------------------------------------------------
/// MAVLink message charting controller
class MAVLinkChartController : public QObject {
Q_OBJECT
public:
@ -232,6 +240,7 @@ private: @@ -232,6 +240,7 @@ private:
};
//-----------------------------------------------------------------------------
/// MAVLink message inspector controller (provides the logic for UI display)
class MAVLinkInspectorController : public QObject
{
Q_OBJECT

17
src/Camera/QGCCameraControl.h
Unescape View File

@ -5,6 +5,10 @@ @@ -5,6 +5,10 @@
*
*/
/// @file
/// @brief MAVLink Camera API
/// @author Gus Grubba <gus@auterion.com>
#pragma once
#include "QGCApplication.h"
@ -18,6 +22,8 @@ Q_DECLARE_LOGGING_CATEGORY(CameraControlLog) @@ -18,6 +22,8 @@ Q_DECLARE_LOGGING_CATEGORY(CameraControlLog)
Q_DECLARE_LOGGING_CATEGORY(CameraControlVerboseLog)
//-----------------------------------------------------------------------------
/// Video Stream Info
/// Encapsulates the contents of a [VIDEO_STREAM_INFORMATION](https://mavlink.io/en/messages/common.html#VIDEO_STREAM_INFORMATION) message
class QGCVideoStreamInfo : public QObject
{
Q_OBJECT
@ -50,6 +56,7 @@ private: @@ -50,6 +56,7 @@ private:
};
//-----------------------------------------------------------------------------
/// Camera option exclusions
class QGCCameraOptionExclusion : public QObject
{
public:
@ -60,6 +67,7 @@ public: @@ -60,6 +67,7 @@ public:
};
//-----------------------------------------------------------------------------
/// Camera option ranges
class QGCCameraOptionRange : public QObject
{
public:
@ -74,6 +82,7 @@ public: @@ -74,6 +82,7 @@ public:
};
//-----------------------------------------------------------------------------
/// MAVLink Camera API controller
class QGCCameraControl : public FactGroup
{
Q_OBJECT
@ -257,7 +266,7 @@ public: @@ -257,7 +266,7 @@ public:
virtual Fact* wb ();
virtual Fact* mode ();
//-- Stream names to show the user (for selection)
/// Stream names to show the user (for selection)
virtual QStringList streamLabels () { return _streamLabels; }
virtual ThermalViewMode thermalMode () { return _thermalMode; }
@ -281,11 +290,11 @@ public: @@ -281,11 +290,11 @@ public:
virtual void handleVideoInfo (const mavlink_video_stream_information_t *vi);
virtual void handleVideoStatus (const mavlink_video_stream_status_t *vs);
//-- Notify controller a parameter has changed
/// Notify controller a parameter has changed
virtual void factChanged (Fact* pFact);
//-- Allow controller to modify or invalidate incoming parameter
/// Allow controller to modify or invalidate incoming parameter
virtual bool incomingParameter (Fact* pFact, QVariant& newValue);
//-- Allow controller to modify or invalidate parameter change
/// Allow controller to modify or invalidate parameter change
virtual bool validateParameter (Fact* pFact, QVariant& newValue);
// Known Parameters

5
src/Camera/QGCCameraIO.h
Unescape View File

@ -5,6 +5,10 @@ @@ -5,6 +5,10 @@
*
*/
/// @file
/// @brief MAVLink Camera API. Camera parameter handler.
/// @author Gus Grubba <gus@auterion.com>
#pragma once
#include "QGCApplication.h"
@ -34,6 +38,7 @@ typedef struct { @@ -34,6 +38,7 @@ typedef struct {
}) param_ext_union_t;
//-----------------------------------------------------------------------------
/// Camera parameter handler.
class QGCCameraParamIO : public QObject
{
public:

5
src/Camera/QGCCameraManager.h
Unescape View File

@ -5,6 +5,10 @@ @@ -5,6 +5,10 @@
*
*/
/// @file
/// @brief MAVLink Camera API. Camera Manager.
/// @author Gus Grubba <gus@auterion.com>
#pragma once
#include "QGCApplication.h"
@ -20,6 +24,7 @@ Q_DECLARE_LOGGING_CATEGORY(CameraManagerLog) @@ -20,6 +24,7 @@ Q_DECLARE_LOGGING_CATEGORY(CameraManagerLog)
class Joystick;
//-----------------------------------------------------------------------------
/// Camera Manager
class QGCCameraManager : public QObject
{
Q_OBJECT

16
src/Joystick/Joystick.h
Unescape View File

@ -7,9 +7,10 @@ @@ -7,9 +7,10 @@
*
****************************************************************************/
/// @file
/// @brief Joystick Controller
#ifndef Joystick_H
#define Joystick_H
#pragma once
#include <QObject>
#include <QThread>
@ -21,7 +22,7 @@ @@ -21,7 +22,7 @@
Q_DECLARE_LOGGING_CATEGORY(JoystickLog)
Q_DECLARE_LOGGING_CATEGORY(JoystickValuesLog)
//-- Action assigned to button
/// Action assigned to button
class AssignedButtonAction : public QObject {
Q_OBJECT
public:
@ -31,7 +32,7 @@ public: @@ -31,7 +32,7 @@ public:
bool repeat = false;
};
//-- Assignable Button Action
/// Assignable Button Action
class AssignableButtonAction : public QObject {
Q_OBJECT
public:
@ -45,6 +46,7 @@ private: @@ -45,6 +46,7 @@ private:
bool _repeat = false;
};
/// Joystick Controller
class Joystick : public QThread
{
Q_OBJECT
@ -168,10 +170,14 @@ public: @@ -168,10 +170,14 @@ public:
/// Set the current calibration mode
void setCalibrationMode (bool calibrating);
/// Get joystick message rate (in Hz)
float axisFrequency () { return _axisFrequency; }
/// Set joystick message rate (in Hz)
void setAxisFrequency (float val);
/// Get joystick button repeat rate (in Hz)
float buttonFrequency () { return _buttonFrequency; }
/// Set joystick button repeat rate (in Hz)
void setButtonFrequency(float val);
signals:
@ -349,5 +355,3 @@ private: @@ -349,5 +355,3 @@ private:
private slots:
void _activeVehicleChanged(Vehicle* activeVehicle);
};
#endif

14
src/Joystick/JoystickManager.h
Unescape View File

@ -7,9 +7,10 @@ @@ -7,9 +7,10 @@
*
****************************************************************************/
/// @file
/// @brief Joystick Manager
#ifndef JoystickManager_H
#define JoystickManager_H
#pragma once
#include "QGCLoggingCategory.h"
#include "Joystick.h"
@ -20,6 +21,7 @@ @@ -20,6 +21,7 @@
Q_DECLARE_LOGGING_CATEGORY(JoystickManagerLog)
/// Joystick Manager
class JoystickManager : public QGCTool
{
Q_OBJECT
@ -28,18 +30,20 @@ public: @@ -28,18 +30,20 @@ public:
JoystickManager(QGCApplication* app, QGCToolbox* toolbox);
~JoystickManager();
/// List of available joysticks
Q_PROPERTY(QVariantList joysticks READ joysticks NOTIFY availableJoysticksChanged)
Q_PROPERTY(QStringList joystickNames READ joystickNames NOTIFY availableJoysticksChanged)
/// Active joystick
Q_PROPERTY(Joystick* activeJoystick READ activeJoystick WRITE setActiveJoystick NOTIFY activeJoystickChanged)
Q_PROPERTY(QString activeJoystickName READ activeJoystickName WRITE setActiveJoystickName NOTIFY activeJoystickNameChanged)
/// List of available joysticks
QVariantList joysticks();
/// List of available joystick names
QStringList joystickNames(void);
/// Get active joystick
Joystick* activeJoystick(void);
/// Set active joystick
void setActiveJoystick(Joystick* joystick);
QString activeJoystickName(void);
@ -76,5 +80,3 @@ private: @@ -76,5 +80,3 @@ private:
int _joystickCheckTimerCounter;
QTimer _joystickCheckTimer;
};
#endif

18
src/Joystick/JoystickSDL.h
Unescape View File

@ -1,5 +1,16 @@ @@ -1,5 +1,16 @@
#ifndef JOYSTICKSDL_H
#define JOYSTICKSDL_H
/****************************************************************************
*
* (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
/// @file
/// @brief SDL Joystick Interface
#pragma once
#include "Joystick.h"
#include "Vehicle.h"
@ -7,6 +18,7 @@ @@ -7,6 +18,7 @@
#include <SDL.h>
/// @brief SDL Joystick Interface
class JoystickSDL : public Joystick
{
public:
@ -39,5 +51,3 @@ private: @@ -39,5 +51,3 @@ private:
int _index; ///< Index for SDL_JoystickOpen
};
#endif // JOYSTICKSDL_H

5
src/Settings/AppSettings.h
Unescape View File

@ -6,12 +6,17 @@ @@ -6,12 +6,17 @@
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
/// @file
/// @brief Application Settings
#pragma once
#include <QTranslator>
#include "SettingsGroup.h"
#include "QGCMAVLink.h"
/// Application Settings
class AppSettings : public SettingsGroup
{
Q_OBJECT

5
src/Settings/AutoConnectSettings.h
Unescape View File

@ -7,10 +7,15 @@ @@ -7,10 +7,15 @@
*
****************************************************************************/
/// @file
/// @brief Auto connect settings
#pragma once
#include "SettingsGroup.h"
/// Auto connect settings
/// Defines which links should be automatically created and started at runtime
class AutoConnectSettings : public SettingsGroup
{
Q_OBJECT

4
src/Settings/BrandImageSettings.h
Unescape View File

@ -7,10 +7,14 @@ @@ -7,10 +7,14 @@
*
****************************************************************************/
/// @file
/// @brief Branding settings
#pragma once
#include "SettingsGroup.h"
/// Simple branding. Allows to define icon to use on main toolbar.
class BrandImageSettings : public SettingsGroup
{
Q_OBJECT

30
src/api/QGCCorePlugin.h
Unescape View File

@ -98,7 +98,7 @@ public: @@ -98,7 +98,7 @@ public:
virtual QString showAdvancedUIMessage() const;
/// @return An instance of an alternate position source (or NULL if not available)
virtual QGeoPositionInfoSource* createPositionSource(QObject* parent) { Q_UNUSED(parent); return nullptr; }
virtual QGeoPositionInfoSource* createPositionSource(QObject* /*parent*/) { return nullptr; }
/// Allows a plugin to override the specified color name from the palette
virtual void paletteOverride(QString colorName, QGCPalette::PaletteColorInfo_t& colorInfo);
@ -118,23 +118,23 @@ public: @@ -118,23 +118,23 @@ public:
/// @return true: Allow vehicle to continue processing, false: Vehicle should not process message
virtual bool mavlinkMessage(Vehicle* vehicle, LinkInterface* link, mavlink_message_t message);
/// Allows custom builds to add custom items to the FlightMap. Objects put into QmlObjectListModel
/// should derive from QmlComponentInfo and set the url property.
/// Allows custom builds to add custom items to the FlightMap. Objects put into QmlObjectListModel should derive from QmlComponentInfo and set the url property.
virtual QmlObjectListModel* customMapItems();
/// Allows custom builds to add custom items to the plan file. Either before the document is
/// created or after.
virtual void preSaveToJson (PlanMasterController* pController, QJsonObject& json) { Q_UNUSED(pController); Q_UNUSED(json); }
virtual void postSaveToJson (PlanMasterController* pController, QJsonObject& json) { Q_UNUSED(pController); Q_UNUSED(json); }
/// Allows custom builds to add custom items to the plan file before the document is created.
virtual void preSaveToJson (PlanMasterController* /*pController*/, QJsonObject& /*json*/) {}
/// Allows custom builds to add custom items to the plan file after the document is created.
virtual void postSaveToJson (PlanMasterController* /*pController*/, QJsonObject& /*json*/) {}
/// Same for the specific "mission" portion
virtual void preSaveToMissionJson (PlanMasterController* pController, QJsonObject& missionJson) { Q_UNUSED(pController); Q_UNUSED(missionJson); }
virtual void postSaveToMissionJson (PlanMasterController* pController, QJsonObject& missionJson) { Q_UNUSED(pController); Q_UNUSED(missionJson); }
/// Allows custom builds to add custom items to the mission section of the plan file before the item is created.
virtual void preSaveToMissionJson (PlanMasterController* /*pController*/, QJsonObject& /*missionJson*/) {}
/// Allows custom builds to add custom items to the mission section of the plan file after the item is created.
virtual void postSaveToMissionJson (PlanMasterController* /*pController*/, QJsonObject& /*missionJson*/) {}
/// Allows custom builds to load custom items from the plan file. Either before the document is
/// parsed or after.
virtual void preLoadFromJson (PlanMasterController* pController, QJsonObject& json) { Q_UNUSED(pController); Q_UNUSED(json); }
virtual void postLoadFromJson (PlanMasterController* pController, QJsonObject& json) { Q_UNUSED(pController); Q_UNUSED(json); }
/// Allows custom builds to load custom items from the plan file before the document is parsed.
virtual void preLoadFromJson (PlanMasterController* /*pController*/, QJsonObject& /*json*/) {}
/// Allows custom builds to load custom items from the plan file after the document is parsed.
virtual void postLoadFromJson (PlanMasterController* /*pController*/, QJsonObject& /*json*/) {}
/// Returns the url to download the stable version check file. Return QString() to indicate no version check should be performed.
/// Default QGC mainline implemenentation returns QGC Stable file location. Default QGC custom build code returns QString().
@ -151,7 +151,7 @@ public: @@ -151,7 +151,7 @@ public:
/// Returns the complex mission items to display in the Plan UI
/// @param complexMissionItemNames Default set of complex items
/// @return Complex items to be made available to user
virtual QStringList complexMissionItemNames(Vehicle* vehicle, const QStringList& complexMissionItemNames) { Q_UNUSED(vehicle); return complexMissionItemNames; }
virtual QStringList complexMissionItemNames(Vehicle* /*vehicle*/, const QStringList& complexMissionItemNames) { return complexMissionItemNames; }
bool showTouchAreas() const { return _showTouchAreas; }
bool showAdvancedUI() const { return _showAdvancedUI; }

5
src/api/QGCOptions.h
Unescape View File

@ -93,10 +93,13 @@ public: @@ -93,10 +93,13 @@ public:
/// Provides an optional preflight checklist
virtual QUrl preFlightChecklistUrl () const { return QUrl(); }
/// Allows replacing the toolbar
/// Allows replacing the Main toolbar
virtual QUrl mainToolbarUrl () const;
/// Allows replacing the Plan View toolbar
virtual QUrl planToolbarUrl () const;
/// Allows replacing the toolbar Light Theme color
virtual QColor toolbarBackgroundLight () const;
/// Allows replacing the toolbar Dark Theme color
virtual QColor toolbarBackgroundDark () const;
/// Allows replacing the Plan View toolbar container
virtual QUrl planToolbarIndicatorsUrl () const;

24
src/ui/MainRootWindow.qml
Unescape View File

@ -21,7 +21,8 @@ import QGroundControl.ScreenTools 1.0 @@ -21,7 +21,8 @@ import QGroundControl.ScreenTools 1.0
import QGroundControl.FlightDisplay 1.0
import QGroundControl.FlightMap 1.0
/// Native QML top level window
/// @brief Native QML top level window
/// All properties defined here are visible to all QML pages.
ApplicationWindow {
id: mainWindow
minimumWidth: ScreenTools.isMobile ? Screen.width : Math.min(215 * Screen.pixelDensity, Screen.width)
@ -48,9 +49,12 @@ ApplicationWindow { @@ -48,9 +49,12 @@ ApplicationWindow {
//-------------------------------------------------------------------------
//-- Global Scope Variables
/// Current active Vehicle
property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
/// Indicates communication with vehicle is list (no heartbeats)
property bool communicationLost: activeVehicle ? activeVehicle.connectionLost : false
property string formatedMessage: activeVehicle ? activeVehicle.formatedMessage : ""
/// Indicates usable height between toolbar and footer
property real availableHeight: mainWindow.height - mainWindow.header.height - mainWindow.footer.height
property var currentPlanMissionItem: planMasterControllerPlan ? planMasterControllerPlan.missionController.currentPlanViewItem : null
@ -62,6 +66,7 @@ ApplicationWindow { @@ -62,6 +66,7 @@ ApplicationWindow {
readonly property real defaultTextHeight: ScreenTools.defaultFontPixelHeight
readonly property real defaultTextWidth: ScreenTools.defaultFontPixelWidth
/// Default color palette used throughout the UI
QGCPalette { id: qgcPal; colorGroupEnabled: true }
//-------------------------------------------------------------------------
@ -144,6 +149,7 @@ ApplicationWindow { @@ -144,6 +149,7 @@ ApplicationWindow {
simpleMessageDialog.open()
}
/// Saves main window position and size
MainWindowSavedState {
window: mainWindow
}
@ -287,14 +293,14 @@ ApplicationWindow { @@ -287,14 +293,14 @@ ApplicationWindow {
}
//-------------------------------------------------------------------------
//-- Main, full window background (Fly View)
/// Main, full window background (Fly View)
background: Item {
id: rootBackground
anchors.fill: parent
}
//-------------------------------------------------------------------------
//-- Toolbar
/// Toolbar
header: ToolBar {
height: ScreenTools.toolbarHeight
visible: !QGroundControl.videoManager.fullScreen
@ -325,7 +331,7 @@ ApplicationWindow { @@ -325,7 +331,7 @@ ApplicationWindow {
}
//-------------------------------------------------------------------------
//-- Fly View
/// Fly View
FlightDisplayView {
id: flightView
anchors.fill: parent
@ -339,7 +345,7 @@ ApplicationWindow { @@ -339,7 +345,7 @@ ApplicationWindow {
}
//-------------------------------------------------------------------------
//-- Plan View
/// Plan View
Loader {
id: planViewLoader
anchors.fill: parent
@ -348,7 +354,7 @@ ApplicationWindow { @@ -348,7 +354,7 @@ ApplicationWindow {
}
//-------------------------------------------------------------------------
//-- Settings
/// Settings
Loader {
id: settingsWindow
anchors.fill: parent
@ -357,7 +363,7 @@ ApplicationWindow { @@ -357,7 +363,7 @@ ApplicationWindow {
}
//-------------------------------------------------------------------------
//-- Setup
/// Setup
Loader {
id: setupWindow
anchors.fill: parent
@ -366,7 +372,7 @@ ApplicationWindow { @@ -366,7 +372,7 @@ ApplicationWindow {
}
//-------------------------------------------------------------------------
//-- Analyze
/// Analyze
Loader {
id: analyzeWindow
anchors.fill: parent
@ -375,7 +381,7 @@ ApplicationWindow { @@ -375,7 +381,7 @@ ApplicationWindow {
}
//-------------------------------------------------------------------------
//-- Loader helper for any child, no matter how deep, to display elements
// @brief Loader helper for any child, no matter how deep, to display elements
// on top of the main window.
// This is DEPRECATED. Use Popup instead.
Loader {

Write Preview
Loading…
Cancel
Save