rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00
Code Issues Releases Activity

Merge branch 'rel-14.10' into next

Browse Source
This commit is contained in:
Fredrik Larsson 2014-10-24 03:26:39 +11:00
commit a18e3566ea
8 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/config/stabilization.ui
View File

@ -25419,7 +25419,7 @@ border-radius: 5;</string>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSlider" name="AltKpSlider"> <widget class="QSlider" name="AltKpSlider">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How fast the vehicle should climb or descent to compensate a certain altitude difference. higher values could result in more accurate altitude hold but also more violent control actions, lower values are safer and ensure smoother flight. The default value should be fine for the majority of crafts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;How fast the vehicle should climb or descent to compensate a certain altitude difference. Higher values could result in more accurate altitude hold but also more violent control actions, lower values are safer and ensure smoother flight. The default value should be fine for the majority of crafts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>100</number>

1
ground/openpilotgcs/src/plugins/coreplugin/core.qrc
View File

@ -1,5 +1,6 @@
<RCC> <RCC>
<qresource prefix="/core"> <qresource prefix="/core">
<file>images/openpilot_logo_500.png</file>
<file>images/openpilot_logo_256.png</file> <file>images/openpilot_logo_256.png</file>
<file>images/openpilot_logo_128.png</file> <file>images/openpilot_logo_128.png</file>
<file>images/openpilot_logo_64.png</file> <file>images/openpilot_logo_64.png</file>

BIN
ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_500.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

11
ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
View File

@ -105,7 +105,7 @@ void AirframeInitialTuningPage::updatePhoto(QJsonObject *templ)
QByteArray imageData = QByteArray::fromBase64(templ->value("photo").toString().toLatin1()); QByteArray imageData = QByteArray::fromBase64(templ->value("photo").toString().toLatin1());
photo.loadFromData(imageData, "PNG"); photo.loadFromData(imageData, "PNG");
} else { } else {
photo.load(":/core/images/opie_90x120.gif"); photo.load(":/core/images/openpilot_logo_500.png");
} }
m_photoItem = ui->templateImage->scene()->addPixmap(photo); m_photoItem = ui->templateImage->scene()->addPixmap(photo);
ui->templateImage->setSceneRect(ui->templateImage->scene()->itemsBoundingRect()); ui->templateImage->setSceneRect(ui->templateImage->scene()->itemsBoundingRect());
@ -133,7 +133,12 @@ void AirframeInitialTuningPage::updateDescription(QJsonObject *templ)
description.append("<b>").append(tr("Comments: ")).append("</b>").append(templ->value("comment").toString()); description.append("<b>").append(tr("Comments: ")).append("</b>").append(templ->value("comment").toString());
ui->templateDescription->setText(description); ui->templateDescription->setText(description);
} else { } else {
ui->templateDescription->setText(tr("No vehicle selected!")); ui->templateDescription->setText(tr("This option will use the current tuning settings saved on the controller, if your controller "
"is currently unconfigured, then the OpenPilot firmware defaults will be used.\n\n"
"It is suggested that if this is a first time configuration of your controller, rather than "
"use this option, instead select a tunning set that matches your own airframe as close as "
"possible from the list above or if you are not able to fine one, then select the generic item "
"from the list."));
} }
} }
@ -181,7 +186,7 @@ void AirframeInitialTuningPage::loadValidFiles()
void AirframeInitialTuningPage::setupTemplateList() void AirframeInitialTuningPage::setupTemplateList()
{ {
QListWidgetItem *item = new QListWidgetItem(tr("None"), ui->templateList); QListWidgetItem *item = new QListWidgetItem(tr("Current Tuning"), ui->templateList);
item->setData(Qt::UserRole + 1, QVariant::fromValue((QJsonObject *)NULL)); item->setData(Qt::UserRole + 1, QVariant::fromValue((QJsonObject *)NULL));
foreach(QString templ, m_templates.keys()) { foreach(QString templ, m_templates.keys()) {

2
ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.ui
View File

@ -531,7 +531,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Ok</string> <string>Export</string>
</property> </property>
</widget> </widget>
</item> </item>

43
ground/openpilotgcs/src/plugins/welcome/qml/ActivityPanel.qml
View File

@ -131,8 +131,9 @@ Item {
id: middleRow id: middleRow
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 25 anchors.leftMargin: 25
property string prefix: ""
Text { Text {
property string prefix: ""
width: container.width - anchors.leftMargin - icon.width - 24 - 8 width: container.width - anchors.leftMargin - icon.width - 24 - 8
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
textFormat: Text.RichText textFormat: Text.RichText
@ -140,37 +141,37 @@ Item {
text: { text: {
switch(action) { switch(action) {
case "commented": case "commented":
case "comment": parent.prefix = qsTr("Commented on "); break; case "comment": prefix = qsTr("Commented on "); break;
case "post": case "post":
case "created": parent.prefix = qsTr("Created "); break; case "created": prefix = qsTr("Created "); break;
case "create-and-start": parent.prefix = qsTr("Created and started "); break; case "create-and-start": prefix = qsTr("Created and started "); break;
case "complete": parent.prefix = qsTr("Completed "); break; case "complete": prefix = qsTr("Completed "); break;
case "close": case "close":
case "closed": parent.prefix = qsTr("Closed "); break; case "closed": prefix = qsTr("Closed "); break;
case "abandon": parent.prefix = qsTr("Abandoned "); break; case "abandon": prefix = qsTr("Abandoned "); break;
case "commit": parent.prefix = qsTr("Committed "); break; case "commit": prefix = qsTr("Committed "); break;
case "resolved": parent.prefix = qsTr("Resolved "); break; case "resolved": prefix = qsTr("Resolved "); break;
case "start": parent.prefix = qsTr("Started "); break; case "start": prefix = qsTr("Started "); break;
case "started": parent.prefix = qsTr("Started working on "); break; case "started": prefix = qsTr("Started working on "); break;
case "stopped": parent.prefix = qsTr("Stopped working on "); break; case "stopped": prefix = qsTr("Stopped working on "); break;
case "Code Review": parent.prefix = qsTr("Requested code review on "); break; case "Code Review": prefix = qsTr("Requested code review on "); break;
case "Testing": parent.prefix = qsTr("Requested testing of "); break; case "Testing": prefix = qsTr("Requested testing of "); break;
case "": parent.prefix = qsTr("Updated "); break; case "": prefix = qsTr("Updated "); break;
default: parent.prefix = action.substr(0, 1).toUpperCase() + action.substr(1) + " " ; break; default: prefix = action.substr(0, 1).toUpperCase() + action.substr(1) + " " ; break;
} }
parent.prefix = "<font color='#224d81'>" + parent.prefix + "</font>" prefix = "<font color='#224d81'>" + prefix + "</font>"
if(action == "commented" || action == "comment" || (action == "" && actionSummary == "")) { if(action == "commented" || action == "comment" || (action == "" && actionSummary == "")) {
if(actionTargetTitle != actionTargetSummary) { if(actionTargetTitle != actionTargetSummary) {
parent.prefix + actionTargetTitle + ": " + actionTargetSummary prefix + actionTargetTitle + ": " + actionTargetSummary
} else { } else {
parent.prefix + actionTargetTitle prefix + actionTargetTitle
} }
} }
else { else {
if(actionSummary == "") { if(actionSummary == "") {
parent.prefix + actionTitle prefix + actionTitle
} else { } else {
parent.prefix + actionTitle + ": " + actionSummary prefix + actionTitle + ": " + actionSummary
} }
} }
} }

9
ground/openpilotgcs/src/plugins/welcome/qml/main.qml
View File

@ -4,6 +4,7 @@ Rectangle {
id: container id: container
width: 1024 width: 1024
height: 768 height: 768
anchors.horizontalCenter: parent.horizontalCenter
color: "#272727" color: "#272727"
@ -115,31 +116,25 @@ Rectangle {
height: 18 height: 18
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: textOpVersion.width + textOpVersionAvailable.width width: textOpVersion.width + textOpVersionAvailable.width + this.spacing
spacing: 16 spacing: 16
Text { Text {
id: textOpVersion id: textOpVersion
color: "#c4c0c0" color: "#c4c0c0"
text: welcomePlugin.versionString text: welcomePlugin.versionString
verticalAlignment: Text.AlignTop
anchors.left: parent.anchors.left
font.bold: true font.bold: true
styleColor: "#00000000" styleColor: "#00000000"
horizontalAlignment: Text.AlignHCenter
font.pixelSize: 14 font.pixelSize: 14
} }
Text { Text {
id: textOpVersionAvailable id: textOpVersionAvailable
color: "#5fcf07" color: "#5fcf07"
text: welcomePlugin.newVersionText text: welcomePlugin.newVersionText
anchors.rightMargin: 0
font.bold: true font.bold: true
font.underline: true font.underline: true
styleColor: "#00000000" styleColor: "#00000000"
horizontalAlignment: Text.AlignHCenter
font.pixelSize: 14 font.pixelSize: 14
anchors.left: textOpVersion.right
MouseArea{ MouseArea{
id: mouseAreaOpVersionAvailable id: mouseAreaOpVersionAvailable
hoverEnabled: true hoverEnabled: true

6
package/winx86/openpilotgcs.nsi
View File

@ -1,4 +1,4 @@
# #
# Project: OpenPilot # Project: OpenPilot
# NSIS configuration file for OpenPilot GCS # NSIS configuration file for OpenPilot GCS
# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2014. # The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2014.
@ -72,7 +72,7 @@
VIAddVersionKey "Comments" "${INSTALLER_NAME}. ${BUILD_DESCRIPTION}" VIAddVersionKey "Comments" "${INSTALLER_NAME}. ${BUILD_DESCRIPTION}"
VIAddVersionKey "CompanyName" "The OpenPilot Team, http://www.openpilot.org" VIAddVersionKey "CompanyName" "The OpenPilot Team, http://www.openpilot.org"
VIAddVersionKey "LegalTrademarks" "${PRODUCT_NAME} is a trademark of The OpenPilot Team" VIAddVersionKey "LegalTrademarks" "${PRODUCT_NAME} is a trademark of The OpenPilot Team"
VIAddVersionKey "LegalCopyright" "© 2010-2014 The OpenPilot Team" VIAddVersionKey "LegalCopyright" "© 2010-2014 The OpenPilot Team"
VIAddVersionKey "FileDescription" "${INSTALLER_NAME}" VIAddVersionKey "FileDescription" "${INSTALLER_NAME}"
;-------------------------------- ;--------------------------------
@ -93,7 +93,7 @@
;-------------------------------- ;--------------------------------
; Branding ; Branding
BrandingText "© 2010-2014 The OpenPilot Team, http://www.openpilot.org" BrandingText "© 2010-2014 The OpenPilot Team, http://www.openpilot.org"
!define MUI_ICON "${NSIS_DATA_TREE}\resources\openpilot.ico" !define MUI_ICON "${NSIS_DATA_TREE}\resources\openpilot.ico"
!define MUI_HEADERIMAGE !define MUI_HEADERIMAGE