hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

曲线显示数组，显示飞机ID

Browse Source
This commit is contained in:
hm
2020-10-30 15:36:25 +08:00
parent 59780653e0
commit 390422cd66
7 changed files with 422 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/ComponentUI/Scope/Chart.cpp
+8 -1
View File
@@ -569,7 +569,14 @@ void Chart::removeSerie(QString name)
QLineSeries *s = qobject_cast<QLineSeries *>(serie);
if(s)
{
if(s->name() == name)
QString str = s->name();
if(str.contains('['))
{
str = str.left(str.indexOf('['));
}
if(str == name)
{
chart()->removeSeries(s);
s->clear();
App/StatusUI/StatusUI.ui
+348 -348
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>377</width>
<height>800</height>
<width>376</width>
<height>845</height>
</rect>
</property>
<property name="windowTitle">
@@ -22,8 +22,35 @@
<string>惯导</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="5" column="1" rowspan="2">
<widget class="QLabel" name="label_gy1">
<item row="0" column="1">
<widget class="QLabel" name="label_39">
<property name="text">
<string>内部惯导</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_41">
<property name="text">
<string>SBG</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>ax[m/s2]</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_ax1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
@@ -35,8 +62,8 @@
</property>
</widget>
</item>
<item row="15" column="1">
<widget class="QLabel" name="label_cos1">
<item row="1" column="2">
<widget class="QLabel" name="label_ax2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
@@ -48,41 +75,15 @@
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_26">
<item row="2" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
<string>速度[m/s]</string>
<string>ay[m/s2]</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLabel" name="label_rol1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="QLabel" name="label_sta1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="15" column="2">
<widget class="QLabel" name="label_cos2">
<item row="2" column="1">
<widget class="QLabel" name="label_ay1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
@@ -107,8 +108,48 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_ax1">
<item row="3" column="0">
<widget class="QLabel" name="label_25">
<property name="text">
<string>az[m/s2]</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_az1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLabel" name="label_az2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>p[°/s]</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_gx1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
@@ -133,8 +174,15 @@
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QLabel" name="label_yaw2">
<item row="5" column="0">
<widget class="QLabel" name="label_31">
<property name="text">
<string>q[°/s]</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="label_gy1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
@@ -146,165 +194,8 @@
</property>
</widget>
</item>
<item row="17" column="0">
<widget class="QLabel" name="label_35">
<property name="text">
<string>定位状态</string>
</property>
</widget>
</item>
<item row="17" column="1">
<widget class="QLabel" name="label_fix1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="15" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
<string>航迹角[°]</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
<string>ay[m/s2]</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_gx1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QLabel" name="label_rol2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QLabel" name="label_lng1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="label_20">
<property name="text">
<string>经度[°]</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_39">
<property name="text">
<string>内部惯导</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QLabel" name="label_gs1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>纬度[°]</string>
</property>
</widget>
</item>
<item row="16" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>卫星数</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QLabel" name="label_gz2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_48">
<property name="text">
<string>俯仰[°]</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_ax2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_41">
<property name="text">
<string>SBG</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_ay1">
<item row="5" column="2">
<widget class="QLabel" name="label_gy2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
@@ -317,129 +208,13 @@
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_31">
<property name="text">
<string>q[°/s]</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_49">
<property name="text">
<string>滚转[°]</string>
</property>
</widget>
</item>
<item row="16" column="2">
<widget class="QLabel" name="label_sta2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QLabel" name="label_pit2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_29">
<property name="text">
<string>r[°/s]</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLabel" name="label_az2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="17" column="2">
<widget class="QLabel" name="label_fix2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QLabel" name="label_lat1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLabel" name="label_pit1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="4" column="0" rowspan="2">
<widget class="QLabel" name="label_23">
<property name="text">
<string>p[°/s]</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_az1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_22">
<property name="text">
<string>高度[m]</string>
</property>
</widget>
</item>
<item row="7" column="1">
<item row="6" column="1">
<widget class="QLabel" name="label_gz1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
@@ -453,7 +228,7 @@
</widget>
</item>
<item row="6" column="2">
<widget class="QLabel" name="label_gy2">
<widget class="QLabel" name="label_gz2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
@@ -465,28 +240,80 @@
</property>
</widget>
</item>
<item row="10" column="0">
<item row="7" column="0">
<widget class="QLabel" name="label_49">
<property name="text">
<string>滚转[°]</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLabel" name="label_rol1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QLabel" name="label_rol2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_48">
<property name="text">
<string>俯仰[°]</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLabel" name="label_pit1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QLabel" name="label_pit2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_38">
<property name="text">
<string>航向[°]</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_25">
<property name="text">
<string>az[m/s2]</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>ax[m/s2]</string>
</property>
</widget>
</item>
<item row="10" column="1">
<item row="9" column="1">
<widget class="QLabel" name="label_yaw1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
@@ -499,8 +326,8 @@
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QLabel" name="label_alt1">
<item row="9" column="2">
<widget class="QLabel" name="label_yaw2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
@@ -512,8 +339,25 @@
</property>
</widget>
</item>
<item row="14" column="2">
<widget class="QLabel" name="label_gs2">
<item row="10" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>纬度[°]</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QLabel" name="label_lat1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QLabel" name="label_lat2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
@@ -521,24 +365,28 @@
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="13" column="2">
<widget class="QLabel" name="label_alt2">
<item row="11" column="0">
<widget class="QLabel" name="label_20">
<property name="text">
<string>经度[°]</string>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QLabel" name="label_lng1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="12" column="2">
<item row="11" column="2">
<widget class="QLabel" name="label_lng2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
@@ -551,8 +399,15 @@
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QLabel" name="label_lat2">
<item row="12" column="0">
<widget class="QLabel" name="label_22">
<property name="text">
<string>高度[m]</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QLabel" name="label_alt1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
@@ -560,7 +415,152 @@
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="12" column="2">
<widget class="QLabel" name="label_alt2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_26">
<property name="text">
<string>速度[m/s]</string>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QLabel" name="label_gs1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="13" column="2">
<widget class="QLabel" name="label_gs2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
<string>航迹角[°]</string>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QLabel" name="label_cos1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="14" column="2">
<widget class="QLabel" name="label_cos2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="15" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>卫星数</string>
</property>
</widget>
</item>
<item row="15" column="1">
<widget class="QLabel" name="label_sta1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="15" column="2">
<widget class="QLabel" name="label_sta2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="16" column="0">
<widget class="QLabel" name="label_35">
<property name="text">
<string>定位状态</string>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="QLabel" name="label_fix1">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="16" column="2">
<widget class="QLabel" name="label_fix2">
<property name="styleSheet">
<string notr="true">background-color: rgb(189, 189, 189);</string>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
App/ToolsUI/tools_Index0/MAVLinkInspector/MAVLinkInspector.cc
+31 -14
View File
@@ -527,9 +527,9 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
else
{
// Single value
uint8_t u = *(m+msgInfo->fields[fieldid].wire_offset);
uint8_t n = *(m+msgInfo->fields[fieldid].wire_offset);
item->setData(2, Qt::DisplayRole, "uint8_t");
item->setData(1, Qt::DisplayRole, u);
item->setData(1, Qt::DisplayRole, QString::number(n,'f',0));
}
break;
case MAVLINK_TYPE_INT8_T:
@@ -551,7 +551,7 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
// Single value
int8_t n = *((int8_t*)(m+msgInfo->fields[fieldid].wire_offset));
item->setData(2, Qt::DisplayRole, "int8_t");
item->setData(1, Qt::DisplayRole, n);
item->setData(1, Qt::DisplayRole, QString::number(n,'f',0));
}
break;
case MAVLINK_TYPE_UINT16_T:
@@ -573,7 +573,7 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
// Single value
uint16_t n = *((uint16_t*)(m+msgInfo->fields[fieldid].wire_offset));
item->setData(2, Qt::DisplayRole, "uint16_t");
item->setData(1, Qt::DisplayRole, n);
item->setData(1, Qt::DisplayRole, QString::number(n,'f',0));
}
break;
case MAVLINK_TYPE_INT16_T:
@@ -595,7 +595,7 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
// Single value
int16_t n = *((int16_t*)(m+msgInfo->fields[fieldid].wire_offset));
item->setData(2, Qt::DisplayRole, "int16_t");
item->setData(1, Qt::DisplayRole, n);
item->setData(1, Qt::DisplayRole, QString::number(n,'f',0));
}
break;
case MAVLINK_TYPE_UINT32_T:
@@ -617,7 +617,7 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
// Single value
float n = *((uint32_t*)(m+msgInfo->fields[fieldid].wire_offset));
item->setData(2, Qt::DisplayRole, "uint32_t");
item->setData(1, Qt::DisplayRole, n);
item->setData(1, Qt::DisplayRole, QString::number(n,'f',0));
}
break;
case MAVLINK_TYPE_INT32_T:
@@ -639,7 +639,7 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
// Single value
int32_t n = *((int32_t*)(m+msgInfo->fields[fieldid].wire_offset));
item->setData(2, Qt::DisplayRole, "int32_t");
item->setData(1, Qt::DisplayRole, n);
item->setData(1, Qt::DisplayRole, QString::number(n,'f',0));
}
break;
case MAVLINK_TYPE_FLOAT:
@@ -659,9 +659,9 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
else
{
// Single value
float f = *((float*)(m+msgInfo->fields[fieldid].wire_offset));
float n = *((float*)(m+msgInfo->fields[fieldid].wire_offset));
item->setData(2, Qt::DisplayRole, "float");
item->setData(1, Qt::DisplayRole, f);
item->setData(1, Qt::DisplayRole, QString::number(n));
}
break;
case MAVLINK_TYPE_DOUBLE:
@@ -681,9 +681,9 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
else
{
// Single value
double f = *((double*)(m+msgInfo->fields[fieldid].wire_offset));
double n = *((double*)(m+msgInfo->fields[fieldid].wire_offset));
item->setData(2, Qt::DisplayRole, "double");
item->setData(1, Qt::DisplayRole, f);
item->setData(1, Qt::DisplayRole, QString::number(n));
}
break;
case MAVLINK_TYPE_UINT64_T:
@@ -705,7 +705,7 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
// Single value
uint64_t n = *((uint64_t*)(m+msgInfo->fields[fieldid].wire_offset));
item->setData(2, Qt::DisplayRole, "uint64_t");
item->setData(1, Qt::DisplayRole, (quint64) n);
item->setData(1, Qt::DisplayRole, QString::number((quint64)n,'f',0));
}
break;
case MAVLINK_TYPE_INT64_T:
@@ -727,7 +727,7 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
// Single value
int64_t n = *((int64_t*)(m+msgInfo->fields[fieldid].wire_offset));
item->setData(2, Qt::DisplayRole, "int64_t");
item->setData(1, Qt::DisplayRole, (qint64) n);
item->setData(1, Qt::DisplayRole, QString::number((qint64)n,'f',0));
}
break;
}
@@ -735,7 +735,23 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
if(item->checkState(0) == Qt::Checked)
{
if(item->data(1,Qt::DisplayRole).type() != QMetaType::QString)
if (msgInfo->fields[fieldid].array_length > 0)
{
QString str = item->data(1,Qt::DisplayRole).toString();
QStringList sections = str.split(QRegExp("[,*/^]")); //把每一个块装进一个QStringList中
for (unsigned int j = 0; j < msgInfo->fields[fieldid].array_length; ++j)
{
if(scope)
{
scope->chartView->setSerieData(QString::number(msg->sysid) + "." + item->data(0,Qt::DisplayRole).toString() + "[" + QString::number(j) + "]",sections[j]);
}
}
}
else
{
if(scope)
{
@@ -790,6 +806,7 @@ void MAVLinkInspector::on_treeWidget_itemChanged(QTreeWidgetItem *item, int colu
QString str = item->parent()->parent()->text(0);
str = str.mid(str.indexOf(' ') + 1);
scope->chartView->removeSerie(str + "." + item->data(0,Qt::DisplayRole).toString());
//qDebug() << str + "." + item->data(0,Qt::DisplayRole).toString();
}
}
}
opmap/mapwidget/AltitudeItem.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
#include "AltitudeItem.h"
#include "AltitudeItem.h"
namespace mapcontrol {
@@ -136,12 +136,12 @@ void AltitudeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
ePen.setColor(AltColor);
painter->setPen(ePen);
painter->drawLine(220,-170,250,-170);
painter->drawText(QRect(260,-180,40,20),Qt::AlignVCenter|Qt::AlignLeft, tr("altitude"));
painter->drawText(QRect(260,-180,40,20),Qt::AlignVCenter|Qt::AlignLeft, tr("航线"));
ePen.setColor(EleColor);
painter->setPen(ePen);
painter->drawLine(300,-170,330,-170);
painter->drawText(QRect(340,-180,40,20),Qt::AlignVCenter|Qt::AlignLeft, tr("ground"));
painter->drawText(QRect(340,-180,40,20),Qt::AlignVCenter|Qt::AlignLeft, tr("地形"));
painter->restore();
opmap/mapwidget/uavitem.cpp
+26 -47
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file uavitem.cpp
@@ -73,13 +73,20 @@ UAVItem::UAVItem(MapGraphicItem *map, OPMapWidget *parent, QString uavPic ,uint8
connect(map, SIGNAL(zoomChanged(double, double, double)), this, SLOT(zoomChangedSlot()));
}
UAVItem::~UAVItem()
{}
{
}
void UAVItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
Q_UNUSED(option);
Q_UNUSED(widget);
QPen pen;
QFont font;
painter->save();
//设置图层
if(isEdit)
{
@@ -110,62 +117,34 @@ void UAVItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q
// Draw plane
painter->drawPixmap(-pic.width() / 2, -pic.height() / 2, pic);
// Return if UAV Info context menu is turned off
if (!showUAVInfo) {
return;
}
QPen myPen;
// Turn on anti-aliasing so the fonts don't look terrible
painter->setRenderHint(QPainter::Antialiasing, true);
// Set pen attributes
QColor myColor(Qt::red);
myPen.setWidth(3);
myPen.setColor(myColor);
painter->setPen(myPen);
painter->drawPolygon(arrowHead);
painter->setPen(myPen);
painter->drawLine(arrowShaft);
painter->restore();
// Set trend arc's color
myPen.setColor(Qt::magenta);
painter->setPen(myPen);
painter->save();
if (trendSpanAngle > 0) {
QRectF rect(0, -trendRadius, trendRadius * 2, trendRadius * 2);
painter->drawArc(rect, 180 * 16, -trendSpanAngle * 16);
} else {
QRectF rect(-2 * trendRadius, -trendRadius, trendRadius * 2, trendRadius * 2);
painter->drawArc(rect, 0 * 16, -trendSpanAngle * 16);
}
// *********** Create time rings
if (groundspeed_mps_filt > 0) { // Don't clutter the display with rings that are only one pixel wide
myPen.setWidth(2);
myPen.setColor(QColor(0, 0, 0, 100));
painter->setPen(myPen);
painter->drawEllipse(QPointF(0, 0), precalcRings, precalcRings);
myPen.setColor(QColor(0, 0, 0, 110));
painter->setPen(myPen);
painter->drawEllipse(QPointF(0, 0), precalcRings * 2, precalcRings * 2);
myPen.setColor(QColor(0, 0, 0, 120));
painter->setPen(myPen);
painter->drawEllipse(QPointF(0, 0), precalcRings * 4, precalcRings * 4);
}
// Rotate the text back to vertical
qreal rot = this->rotation();
painter->rotate(-1 * rot);
myPen.setWidth(1);
myPen.setColor(Qt::white);
painter->setBrush(Qt::white);
painter->setPen(myPen);
painter->drawPath(textPath);
//设置每个飞机的ID号
pen.setWidth(10);
pen.setColor(Qt::red);
painter->setPen(pen);
font.setPointSize(10);
font.setWeight(QFont::Bold);
font.setFamily("Arial");//非衬线
painter->setFont(font);
painter->drawText(-50,-50,100,100,Qt::AlignCenter,QString::number(sysid));
painter->restore();
}
opmap/mapwidget/uavitem.h
+2 -1
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file uavitem.h
@@ -40,6 +40,7 @@
#include "opmapwidget.h"
#include "trailitem.h"
#include "traillineitem.h"
#include "QFont"
namespace mapcontrol {
class WayPointItem;
class OPMapWidget;
readme.md
+4 -4
View File
@@ -88,7 +88,7 @@
状态框跟随飞行，显示速度和高度经纬度
×多条航线
×舵面标定和检查
√舵面标定和检查
√惯导极性
@@ -194,13 +194,13 @@ SBG，需要设置坐标轴，坐标系存在问题
mavlink 不要用科学计数法
指令界面弹出置顶
√指令界面弹出置顶
√伺服界面
舵机状态显示顺序不对。
√舵机状态显示顺序不对。
√舵机指令不要恢复
串口插入后打开界面，会导致短时间卡死，甚至死机
串口插入后打开界面，会导致短时间卡死，甚至死机（使用底层解决，插入时立即检查，）
自动连接