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 'Brian-PipXtreme-V2-gui-upgrades' into Brian-PipXtreme-V2

Browse Source
This commit is contained in:
Brian Webb 2012-06-04 18:27:36 -07:00
commit 3721504458
2 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
View File

@ -185,11 +185,15 @@ void ConfigPipXtremeWidget::updateStatus(UAVObject *object)
} }
UAVObjectField* pairRssiField = object->getField("PairSignalStrengths"); UAVObjectField* pairRssiField = object->getField("PairSignalStrengths");
if (pairRssiField) { if (pairRssiField) {
m_pipx->PairSignalStrength1->setValue(pairRssiField->getValue(0).toInt()); m_pipx->PairSignalStrengthBar1->setValue(pairRssiField->getValue(0).toInt());
m_pipx->PairSignalStrength2->setValue(pairRssiField->getValue(1).toInt()); m_pipx->PairSignalStrengthBar2->setValue(pairRssiField->getValue(1).toInt());
m_pipx->PairSignalStrength3->setValue(pairRssiField->getValue(2).toInt()); m_pipx->PairSignalStrengthBar3->setValue(pairRssiField->getValue(2).toInt());
m_pipx->PairSignalStrength4->setValue(pairRssiField->getValue(3).toInt()); m_pipx->PairSignalStrengthBar4->setValue(pairRssiField->getValue(3).toInt());
} else { m_pipx->PairSignalStrengthLabel1->setText(QString("%1dB").arg(pairRssiField->getValue(0).toInt()));
m_pipx->PairSignalStrengthLabel2->setText(QString("%1dB").arg(pairRssiField->getValue(1).toInt()));
m_pipx->PairSignalStrengthLabel3->setText(QString("%1dB").arg(pairRssiField->getValue(2).toInt()));
m_pipx->PairSignalStrengthLabel4->setText(QString("%1dB").arg(pairRssiField->getValue(3).toInt()));
} else {
qDebug() << "PipXtremeGadgetWidget: Count not read PairID field."; qDebug() << "PipXtremeGadgetWidget: Count not read PairID field.";
} }

36
ground/openpilotgcs/src/plugins/config/pipxtreme.ui
View File

@ -145,7 +145,7 @@
<widget class="QLineEdit" name="PairID1"/> <widget class="QLineEdit" name="PairID1"/>
</item> </item>
<item row="0" column="3"> <item row="0" column="3">
<widget class="QProgressBar" name="PairSignalStrength1"> <widget class="QProgressBar" name="PairSignalStrengthBar1">
<property name="minimum"> <property name="minimum">
<number>-127</number> <number>-127</number>
</property> </property>
@ -174,7 +174,7 @@
<widget class="QLineEdit" name="PairID2"/> <widget class="QLineEdit" name="PairID2"/>
</item> </item>
<item row="1" column="3"> <item row="1" column="3">
<widget class="QProgressBar" name="PairSignalStrength2"> <widget class="QProgressBar" name="PairSignalStrengthBar2">
<property name="minimum"> <property name="minimum">
<number>-127</number> <number>-127</number>
</property> </property>
@ -203,7 +203,7 @@
<widget class="QLineEdit" name="PairID3"/> <widget class="QLineEdit" name="PairID3"/>
</item> </item>
<item row="2" column="3"> <item row="2" column="3">
<widget class="QProgressBar" name="PairSignalStrength3"> <widget class="QProgressBar" name="PairSignalStrengthBar3">
<property name="minimum"> <property name="minimum">
<number>-127</number> <number>-127</number>
</property> </property>
@ -232,7 +232,7 @@
<widget class="QLineEdit" name="PairID4"/> <widget class="QLineEdit" name="PairID4"/>
</item> </item>
<item row="3" column="3"> <item row="3" column="3">
<widget class="QProgressBar" name="PairSignalStrength4"> <widget class="QProgressBar" name="PairSignalStrengthBar4">
<property name="minimum"> <property name="minimum">
<number>-127</number> <number>-127</number>
</property> </property>
@ -250,6 +250,34 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4">
<widget class="QLabel" name="PairSignalStrengthLabel1">
<property name="text">
<string>-100dB</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLabel" name="PairSignalStrengthLabel2">
<property name="text">
<string>-100dB</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QLabel" name="PairSignalStrengthLabel3">
<property name="text">
<string>-100dB</string>
</property>
</widget>
</item>
<item row="3" column="4">
<widget class="QLabel" name="PairSignalStrengthLabel4">
<property name="text">
<string>-100dB</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>