rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
This commit is contained in:
James Cotton 2012-01-31 17:30:05 -06:00
commit eaf9a4bded
6 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
View File

@ -30,9 +30,6 @@
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="configgadget.qrc">:/configgadget/images/coptercontrol.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
@ -71,7 +68,11 @@
</property>
</widget>
</item>
<<<<<<< HEAD
<item row="1" column="5">
=======
<item row="1" column="4">
>>>>>>> master
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -84,6 +85,7 @@
</property>
</spacer>
</item>
<<<<<<< HEAD
<item row="1" column="4">
<widget class="QLabel" name="label_8">
<property name="text">
@ -110,6 +112,8 @@
<item row="4" column="4">
<widget class="QComboBox" name="cbUsbVcp"/>
</item>
=======
>>>>>>> master
<item row="0" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
@ -149,6 +153,7 @@
</property>
</widget>
</item>
<<<<<<< HEAD
<item row="2" column="0">
<widget class="QLabel" name="ComUsbBridgeSpeedLabel">
<property name="minimumSize">
@ -162,6 +167,8 @@
</property>
</widget>
</item>
=======
>>>>>>> master
<item row="0" column="1">
<widget class="QComboBox" name="telemetrySpeed">
<property name="toolTip">
@ -176,6 +183,7 @@
</property>
</widget>
</item>
<<<<<<< HEAD
<item row="2" column="1">
<widget class="QComboBox" name="comUsbBridgeSpeed">
<property name="toolTip">
@ -183,6 +191,8 @@
</property>
</widget>
</item>
=======
>>>>>>> master
</layout>
</item>
<item>
@ -346,7 +356,10 @@ Beware of not locking yourself out!</string>
</layout>
</widget>
<resources>
<<<<<<< HEAD
<include location="configgadget.qrc"/>
=======
>>>>>>> master
<include location="../coreplugin/core.qrc"/>
</resources>
<connections/>

3
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
View File

@ -40,6 +40,9 @@ ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
{
m_telemetry = new Ui_CC_HW_Widget();
m_telemetry->setupUi(this);
m_telemetry->label_2->setPixmap(QPixmap(":/configgadget/images/coptercontrol.svg"));
setupButtons(m_telemetry->saveTelemetryToRAM,m_telemetry->saveTelemetryToSD);
addUAVObjectToWidgetRelation("HwSettings","CC_FlexiPort",m_telemetry->cbFlexi);
addUAVObjectToWidgetRelation("HwSettings","CC_MainPort",m_telemetry->cbTele);

1
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.h
View File

@ -50,6 +50,7 @@ private slots:
private:
Ui_CC_HW_Widget *m_telemetry;
QSvgRenderer *m_renderer;
};
#endif // CONFIGCCHWWIDGET_H

2
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
View File

@ -107,6 +107,7 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) : ConfigTaskWidget(parent)
m_config->graphicsView->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
m_renderer = new QSvgRenderer();
QGraphicsScene *l_scene = m_config->graphicsView->scene();
m_config->graphicsView->setBackgroundBrush(QBrush(Utils::StyleHelper::baseColor()));
if (QFile::exists(":/configgadget/images/TX2.svg") && m_renderer->load(QString(":/configgadget/images/TX2.svg")) && m_renderer->isValid())
{
l_scene->clear(); // Deletes all items contained in the scene as well.
@ -400,6 +401,7 @@ void ConfigInputWidget::wizardSetUpStep(enum wizardSteps step)
case wizardChooseMode:
{
m_config->graphicsView->setVisible(true);
m_config->graphicsView->fitInView(m_txBackground, Qt::KeepAspectRatio );
setTxMovement(nothing);
m_config->wzText->setText(tr("Please choose your transmiter type.\n"
"Mode 1 means your throttle stick is on the right\n"

8
ground/openpilotgcs/src/plugins/config/input.ui
View File

@ -76,7 +76,7 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>70</height>
<height>90</height>
</size>
</property>
<property name="text">
@ -90,11 +90,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QGraphicsView" name="graphicsView">
<property name="styleSheet">
<string notr="true">background:transparent</string>
</property>
</widget>
<widget class="QGraphicsView" name="graphicsView"/>
</item>
<item>
<layout class="QVBoxLayout" name="checkBoxesLayout"/>

13
package/osx/libraries
View File

@ -5,7 +5,7 @@ PLUGINS="${APP}/Contents/Plugins"
OP_PLUGINS="${APP}/Contents/Plugins/OpenPilot"
QT_LIBS="QtGui QtTest QtCore QtSvg QtSql QtOpenGL QtNetwork QtXml QtDBus QtScript phonon"
QT_DIR=$(otool -L "${APP}/Contents/MacOS/OpenPilot GCS" | sed -n -e 's/\/QtCore\.framework.*//p' | sed -n -E 's:^.::p')
QT_EXTRA="accessible/libqtaccessiblewidgets.dylib bearer/libqgenericbearer.dylib codecs/libqcncodecs.dylib codecs/libqjpcodecs.dylib codecs/libqkrcodecs.dylib codecs/libqtwcodecs.dylib graphicssystems/libqtracegraphicssystem.dylib imageformats/libqgif.dylib imageformats/libqico.dylib imageformats/libqjpeg.dylib imageformats/libqmng.dylib imageformats/libqtiff.dylib qmltooling/libqmldbg_inspector.dylib qmltooling/libqmldbg_tcp.dylib"
QT_EXTRA="accessible/libqtaccessiblewidgets.dylib bearer/libqgenericbearer.dylib codecs/libqcncodecs.dylib codecs/libqjpcodecs.dylib codecs/libqkrcodecs.dylib codecs/libqtwcodecs.dylib graphicssystems/libqtracegraphicssystem.dylib imageformats/libqgif.dylib imageformats/libqico.dylib imageformats/libqjpeg.dylib imageformats/libqmng.dylib imageformats/libqtiff.dylib imageformats/libqsvg.dylib qmltooling/libqmldbg_inspector.dylib qmltooling/libqmldbg_tcp.dylib"
echo "Qt library directory is \"${QT_DIR}\""
@ -50,10 +50,21 @@ done
for f in ${QT_EXTRA}
do
echo "Copying package ${f}"
cp "${QT_DIR}/../plugins/${f}" "${APP}/Contents/Plugins/${f}"
echo "Changing package identification of ${f}"
install_name_tool -id \
@executable_path/../Plugins/${f} \
"${PLUGINS}/${f}"
echo "Changing package linkages"
for g in $QT_LIBS
do
install_name_tool -change \
"${QT_DIR}/${g}.framework/Versions/4/${g}" \
@executable_path/../Frameworks/${g}.framework/Versions/4/${g} \
"${APP}/Contents/Plugins/${f}"
done
done
echo "Copying SDL"