Commit bf0a7e19 authored by pixhawk's avatar pixhawk

Minor visual improvements

parent a7bbb6f2
......@@ -413,7 +413,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
emit valueChanged(uasId, "roll deg", "deg", (roll/M_PI)*180.0, time);
emit valueChanged(uasId, "pitch deg", "deg", (pitch/M_PI)*180.0, time);
emit valueChanged(uasId, "yaw deg", "deg", compass, time);
emit valueChanged(uasId, "heading deg", "deg", compass, time);
emit valueChanged(uasId, "rollspeed d/s", "deg/s", (attitude.rollspeed/M_PI)*180.0, time);
emit valueChanged(uasId, "pitchspeed d/s", "deg/s", (attitude.pitchspeed/M_PI)*180.0, time);
emit valueChanged(uasId, "yawspeed d/s", "deg/s", (attitude.yawspeed/M_PI)*180.0, time);
......
......@@ -252,7 +252,30 @@ void DebugConsole::setAutoHold(bool hold)
void DebugConsole::receiveTextMessage(int id, int component, int severity, QString text)
{
Q_UNUSED(severity);
m_ui->receiveText->appendHtml(QString("<font color=\"%1\">(MAV%2:%3) %4</font>\n").arg(UASManager::instance()->getUASForId(id)->getColor().name(), QString::number(id), QString::number(component), text));
QString name = UASManager::instance()->getUASForId(id)->getUASName();
QString comp;
// Get a human readable name if possible
switch (component)
{
// TODO: To be completed
case MAV_COMP_ID_IMU:
comp = tr("IMU");
break;
case MAV_COMP_ID_MAPPER:
comp = tr("MAPPER");
break;
case MAV_COMP_ID_WAYPOINTPLANNER:
comp = tr("WP-PLANNER");
break;
case MAV_COMP_ID_AIRSLAM:
comp = tr("AIRSLAM");
break;
default:
comp = QString::number(component);
break;
}
m_ui->receiveText->appendHtml(QString("<font color=\"%1\">(%2:%3) %4</font>\n").arg(UASManager::instance()->getUASForId(id)->getColor().name(), name, comp, text));
//m_ui->receiveText->appendPlainText("");
}
......
......@@ -397,13 +397,13 @@ void MainWindow::buildPxWidgets()
{
//FIXME: memory of acceptList will never be freed again
QStringList* acceptList = new QStringList();
acceptList->append("-105,roll,deg,+105,s");
acceptList->append("-105,pitch,deg,+105,s");
acceptList->append("-105,yaw,deg,+105,s");
acceptList->append("-105,roll deg,deg,+105,s");
acceptList->append("-105,pitch deg,deg,+105,s");
acceptList->append("-105,heading deg,deg,+105,s");
acceptList->append("-60,rollspeed,deg/s,+60,s");
acceptList->append("-60,pitchspeed,deg/s,+60,s");
acceptList->append("-60,yawspeed,deg/s,+60,s");
acceptList->append("-60,rollspeed d/s,deg/s,+60,s");
acceptList->append("-60,pitchspeed d/s,deg/s,+60,s");
acceptList->append("-60,yawspeed d/s,deg/s,+60,s");
acceptList->append("0,airspeed,m/s,30");
acceptList->append("0,gpsspeed,m/s,30");
acceptList->append("0,truespeed,m/s,30");
......
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>200</width>
<height>150</height>
<height>228</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -25,7 +25,7 @@
<property name="maximumSize">
<size>
<width>267</width>
<height>194</height>
<height>16777215</height>
</size>
</property>
<property name="windowTitle">
......@@ -34,13 +34,10 @@
<property name="toolTip">
<string>Control widget to send basic control actions to the micro air vehicle</string>
</property>
<layout class="QGridLayout" name="gridLayout" rowstretch="5,1,40,1,40,40,40" columnstretch="5,20,20,25,5">
<layout class="QGridLayout" name="gridLayout" rowstretch="5,1,40,1,40,40,40,1000" columnstretch="5,20,20,25,5">
<property name="margin">
<number>4</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0" rowspan="7">
<spacer name="horizontalSpacer">
<property name="orientation">
......@@ -261,6 +258,19 @@
</property>
</widget>
</item>
<item row="7" column="1" colspan="3">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment