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

Merge branch 'config' of github.com:mavlink/qgroundcontrol into config

QGC4.4
Lorenz Meier 12 years ago
parent
88921e7db7 a5fb558a8c
commit
9f7ae75b98
5 changed files with 87 additions and 72 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. 4
      src/QGCCore.cc
  2. 6
      src/comm/SerialLink.cc
  3. 7
      src/configuration.h
  4. 4
      src/ui/configuration/terminalconsole.cpp
  5. 138
      src/ui/px4_configuration/QGCPX4SensorCalibration.ui

4
src/QGCCore.cc
Unescape View File

@ -77,8 +77,8 @@ QGCCore::QGCCore(bool firstStart, int &argc, char* argv[]) : QApplication(argc, @@ -77,8 +77,8 @@ QGCCore::QGCCore(bool firstStart, int &argc, char* argv[]) : QApplication(argc,
// Set application name
this->setApplicationName(QGC_APPLICATION_NAME);
this->setApplicationVersion(QGC_APPLICATION_VERSION);
this->setOrganizationName(QLatin1String("diydrones"));
this->setOrganizationDomain("com.diydrones");
this->setOrganizationName(QGC::ORG_NAME);
this->setOrganizationDomain(QGC::ORG_DOMAIN);
// Set settings format
QSettings::setDefaultFormat(QSettings::IniFormat);

6
src/comm/SerialLink.cc
Unescape View File

@ -106,7 +106,7 @@ QList<QString> SerialLink::getCurrentPorts() @@ -106,7 +106,7 @@ QList<QString> SerialLink::getCurrentPorts()
void SerialLink::loadSettings()
{
// Load defaults from settings
QSettings settings(QGC::COMPANYNAME, QGC::APPNAME);
QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
settings.sync();
if (settings.contains("SERIALLINK_COMM_PORT"))
{
@ -122,7 +122,7 @@ void SerialLink::loadSettings() @@ -122,7 +122,7 @@ void SerialLink::loadSettings()
void SerialLink::writeSettings()
{
// Store settings
QSettings settings(QGC::COMPANYNAME, QGC::APPNAME);
QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
settings.setValue("SERIALLINK_COMM_PORT", getPortName());
settings.setValue("SERIALLINK_COMM_BAUD", getBaudRateType());
settings.setValue("SERIALLINK_COMM_PARITY", getParityType());
@ -174,7 +174,7 @@ void SerialLink::run() @@ -174,7 +174,7 @@ void SerialLink::run()
}
}
if (isConnected() && (linkErrorCount > 100)) {
if (isConnected() && (linkErrorCount > 1000)) {
qDebug() << "linkErrorCount too high: disconnecting!";
linkErrorCount = 0;
emit communicationUpdate(getName(), tr("Disconnecting on too many link errors"));

7
src/configuration.h
Unescape View File

@ -11,14 +11,15 @@ @@ -11,14 +11,15 @@
#define WITH_TEXT_TO_SPEECH 1
#define QGC_APPLICATION_NAME "QGroundControl"
#define QGC_APPLICATION_VERSION "v. 1.1.2 (beta)"
#define QGC_APPLICATION_VERSION "v. 2.0.0 (beta)"
namespace QGC
{
const QString APPNAME = "QGROUNDCONTROL";
const QString COMPANYNAME = "QGROUNDCONTROL";
const int APPLICATIONVERSION = 110; // 1.1.0
const QString ORG_NAME = "QGROUNDCONTROL.ORG"; //can be customized by forks to e.g. mycompany.com to maintain separate Settings for customized apps
const QString ORG_DOMAIN = "org.qgroundcontrol";//can be customized by forks
const int APPLICATIONVERSION = 200; // 2.0.0
}
#endif // QGC_CONFIGURATION_H

4
src/ui/configuration/terminalconsole.cpp
Unescape View File

@ -265,7 +265,7 @@ void TerminalConsole::setLink(int index) @@ -265,7 +265,7 @@ void TerminalConsole::setLink(int index)
void TerminalConsole::loadSettings()
{
// Load defaults from settings
QSettings settings(QGC::COMPANYNAME, QGC::APPNAME);
QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
settings.sync();
if (settings.contains("TERMINALCONSOLE_COMM_PORT"))
{
@ -287,7 +287,7 @@ void TerminalConsole::loadSettings() @@ -287,7 +287,7 @@ void TerminalConsole::loadSettings()
void TerminalConsole::writeSettings()
{
// Store settings
QSettings settings(QGC::COMPANYNAME, QGC::APPNAME);
QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
settings.setValue("TERMINALCONSOLE_COMM_PORT", m_settings.name);
settings.setValue("TERMINALCONSOLE_COMM_BAUD", m_settings.baudRate);
settings.setValue("TERMINALCONSOLE_COMM_PARITY", m_settings.parity);

138
src/ui/px4_configuration/QGCPX4SensorCalibration.ui
Unescape View File

@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>657</width>
<height>598</height>
<width>659</width>
<height>603</height>
</rect>
</property>
<property name="windowTitle">
@ -36,74 +36,37 @@ QPushButton#gyroButton, QPushButton#accelButton { @@ -36,74 +36,37 @@ QPushButton#gyroButton, QPushButton#accelButton {
border: 2px solid #465158;
}</string>
</property>
<layout class="QGridLayout" name="gridLayout" rowstretch="1,0,0,0,0,0,0,0,0,0" columnstretch="30,8,8,15">
<layout class="QGridLayout" name="gridLayout" rowstretch="20,0,0,0,0,0,0" columnstretch="30,0,0,0">
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Autopilot and GPS / Compass Orientation</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="3">
<widget class="QLabel" name="instructionLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
</property>
</widget>
<widget class="QPlainTextEdit" name="textView"/>
</item>
<item row="8" column="0" colspan="4">
<spacer name="verticalSpacer">
<item row="6" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>498</width>
<height>5</height>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="9" column="2">
<spacer name="horizontalSpacer">
<item row="5" column="0" colspan="4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<width>498</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="0">
<widget class="QComboBox" name="autopilotComboBox"/>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="magComboBox"/>
</item>
<item row="0" column="2" rowspan="7" colspan="2">
<widget class="QPlainTextEdit" name="textView"/>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="iconLabel">
<property name="text">
<string/>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<item row="6" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="2">
<widget class="QLabel" name="accelLabel">
@ -170,26 +133,77 @@ QPushButton#gyroButton, QPushButton#accelButton { @@ -170,26 +133,77 @@ QPushButton#gyroButton, QPushButton#accelButton {
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QLabel" name="autopilotLabel">
<item row="2" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Autopilot Orientation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="autopilotLabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>250</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="autopilotComboBox"/>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" rowspan="2" colspan="2">
<widget class="QLabel" name="iconLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="gpsLabel">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
</size>
</property>
<item row="4" column="0" colspan="2">
<widget class="QLabel" name="instructionLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="2" rowspan="4" colspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Magnetometer Orientation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="gpsLabel">
<property name="minimumSize">
<size>
<width>150</width>
<height>120</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="magComboBox"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources>

Write Preview
Loading…
Cancel
Save