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

数据显示复选框

Browse Source
This commit is contained in:
Company
2020-07-27 18:02:09 +08:00
parent bf66bf7cc3
commit 89d01be197
8 changed files with 163 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/App.pro
+1 -5
View File
@@ -21,10 +21,6 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
include(./ComponentUI/ComponentUI.pri)
include (./InspectUI/InspectUI.pri)
include (./ToolsUI/ToolsUI.pri)
include (./About/About.pri)
include (./Setting/Setting.pri)
@@ -40,7 +36,7 @@ include (./CheckUI/CheckUI.pri)
win32:
{
VERSION = 1.2.3.1
VERSION = 1.0.0.0
QMAKE_TARGET_PRODUCT = Ground Control Station
QMAKE_TARGET_COMPANY = company
App/GCS_zh_CN.qm
BIN
View File
Binary file not shown.
App/GCS_zh_CN.ts
+79 -65
View File
@@ -393,8 +393,8 @@
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="65"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="542"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="773"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="564"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="795"/>
<source>Connect</source>
<translation>连接</translation>
</message>
@@ -442,39 +442,44 @@
<translation type="vanished">未命名</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="115"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="292"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="331"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="350"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="419"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="461"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="503"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="548"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="586"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="98"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="131"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="308"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="347"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="372"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="441"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="483"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="525"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="570"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="608"/>
<source>SerialPort</source>
<translation>串口</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="302"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="101"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="318"/>
<source>115200</source>
<translation>115200</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="303"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="427"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="102"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="319"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="449"/>
<source>8</source>
<translation>8</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="304"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="468"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="554"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="592"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="103"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="320"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="490"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="576"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="614"/>
<source>NONE</source>
<translation>无</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="305"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="104"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="321"/>
<source>1</source>
<translation>1</translation>
</message>
@@ -483,99 +488,112 @@
<translation type="vanished">用户名</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="117"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="133"/>
<source>Port</source>
<translation>端口</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="118"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="134"/>
<source>Baud</source>
<translation>波特率</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="119"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="135"/>
<source>Data</source>
<translation>数据</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="120"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="136"/>
<source>Parity</source>
<translation>校验</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="121"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="137"/>
<source>Stop</source>
<translation>停止</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="132"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="148"/>
<source>this port is busy now
</source>
<translation>端口已经被占用
</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="142"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="310"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="332"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="373"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="106"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="158"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="326"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="348"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="395"/>
<source>UDP</source>
<translation>UDP</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="144"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="100"/>
<source>COM1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="108"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="110"/>
<source>192.168.0.1</source>
<translation type="unfinished">192.168.0.1</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="160"/>
<source>Local</source>
<translation>本地</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="146"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="162"/>
<source>Remote</source>
<translation>远端</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="152"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="168"/>
<source>NetWork</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="469"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="558"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="596"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="491"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="580"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="618"/>
<source>ODD</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="470"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="562"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="600"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="492"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="584"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="622"/>
<source>EVEN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="583"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="759"/>
<source>DisConnect</source>
<translation type="unfinished"></translation>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="605"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="781"/>
<source>Disconnect</source>
<oldsource>DisConnect</oldsource>
<translation>断开连接</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="169"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="236"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="238"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="185"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="252"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="254"/>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="256"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="272"/>
<source>Name</source>
<translation type="unfinished">名称</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="426"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="448"/>
<source>7</source>
<translation type="unfinished">7</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="428"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="450"/>
<source>9</source>
<translation type="unfinished">9</translation>
</message>
@@ -584,18 +602,20 @@
<translation type="vanished">网络</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="312"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="314"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="328"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="330"/>
<source>127.0.0.1</source>
<translation>127.0.0.1</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="313"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="111"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="329"/>
<source>6061</source>
<translation>6061</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="315"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="109"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="331"/>
<source>6060</source>
<translation>6060</translation>
</message>
@@ -743,31 +763,24 @@
<context>
<name>InspectUI</name>
<message>
<location filename="InspectUI/InspectUI.ui" line="14"/>
<source>Form</source>
<translation>界面</translation>
<translation type="vanished">界面</translation>
</message>
<message>
<location filename="InspectUI/InspectUI.ui" line="26"/>
<location filename="InspectUI/InspectUI.cpp" line="19"/>
<source>Mavlink</source>
<translation>Mavlink</translation>
<translation type="vanished">Mavlink</translation>
</message>
<message>
<location filename="InspectUI/InspectUI.ui" line="49"/>
<location filename="InspectUI/InspectUI.cpp" line="24"/>
<source>Parameter</source>
<translation>参数</translation>
<translation type="vanished">参数</translation>
</message>
<message>
<location filename="InspectUI/InspectUI.ui" line="72"/>
<source>ADD</source>
<translation>添加</translation>
<translation type="vanished">添加</translation>
</message>
<message>
<location filename="InspectUI/InspectUI.cpp" line="29"/>
<source>add component</source>
<translation>添加部件</translation>
<translation type="vanished">添加部件</translation>
</message>
</context>
<context>
@@ -861,6 +874,7 @@
</message>
<message>
<location filename="ToolsUI/tools_Index0/MAVLinkInspector/MAVLinkInspector.cc" line="68"/>
<location filename="ToolsUI/tools_Index0/MAVLinkInspector/MAVLinkInspector.cc" line="309"/>
<source>Vehicle %1</source>
<translation>无人机 %1</translation>
</message>
@@ -1167,7 +1181,7 @@
<message>
<location filename="ComponentUI/Scope/Scope.ui" line="14"/>
<source>Form</source>
<translation type="unfinished">界面</translation>
<translation>界面</translation>
</message>
</context>
<context>
App/Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp
+2 -2
View File
@@ -602,7 +602,7 @@ void ConnectDialog::onConnectClicked(void)//关闭本条
emit connectSignal(true,m_usrName,m_Type,m_Param1,m_Param2,m_Param3,m_Param4,m_Param5);
}
}
else if(ui->pushButton_Connect->text() == tr("DisConnect"))//断开连接
else if(ui->pushButton_Connect->text() == tr("Disconnect"))//断开连接
{
QVariant type;
if(m_Type == tr("SerialPort"))
@@ -778,7 +778,7 @@ void ConnectDialog::PortConnected(QVariant state, QVariant usrName, QVariant Typ
qDebug() << "connect success";
connectState = true;
ui->pushButton_Connect->setText(tr("DisConnect"));
ui->pushButton_Connect->setText(tr("Disconnect"));
ui->pushButton_Cancel->setEnabled(false);
ui->pushButton_param1->setEnabled(false);
App/ToolsUI/tools_Index0/MAVLinkInspector/MAVLinkInspector.cc
+74 -1
View File
@@ -274,6 +274,8 @@ void MAVLinkInspector::refreshView()
for (unsigned int i = 0; i < msgInfo->num_fields; ++i)
{
QTreeWidgetItem* field = new QTreeWidgetItem();
field->setCheckState(0,Qt::PartiallyChecked);
widget->setCheckState(0,Qt::PartiallyChecked);
widget->addChild(field);
}
msgTreeItems->insert(msg->msgid,widget);
@@ -306,7 +308,7 @@ void MAVLinkInspector::addUAStoTree(int sysId)
{
//UASInterface* uas = vehicle->uas();
QStringList idstring;
idstring << QString("Vehicle %1").arg(sysId);//uas->getUASID());
idstring << QString(tr("Vehicle %1").arg(sysId));//uas->getUASID());
QTreeWidgetItem* uasWidget = new QTreeWidgetItem(idstring);
uasWidget->setFirstColumnSpanned(true);
uasTreeWidgetItems.insert(sysId,uasWidget);
@@ -740,3 +742,74 @@ void MAVLinkInspector::on_treeWidget_itemClicked(QTreeWidgetItem *item, int colu
}
void MAVLinkInspector::on_treeWidget_itemChanged(QTreeWidgetItem *item, int column)
{
QString itemText = item->text(0);
if (item->checkState(0) == Qt::Checked)
{
QTreeWidgetItem *parent = item->parent();
int cnt = item->childCount();
if (cnt >0)
{
for (int i = 0;i < cnt;i++)
{
item->child(i)->setCheckState(0,Qt::Checked);
}
}
else
{
updateParentItem(item);
}
}
else if (item->checkState(0) == Qt::Unchecked)
{
int cnt = item->childCount();
if (cnt > 0)
{
for (int i = 0;i < cnt;i++)
{
item->child(i)->setCheckState(0,Qt::Unchecked);
}
}
else
{
updateParentItem(item);
}
}
}
void MAVLinkInspector::updateParentItem(QTreeWidgetItem *item)
{
QTreeWidgetItem *parent = item->parent();
if (parent == NULL)
{
return;
}
//选中的子节点个数
int selectedCount = 0;
int childCount = parent->childCount();
for (int i = 0; i < childCount; i++)
{
QTreeWidgetItem *childItem = parent->child(i);
if (childItem->checkState(0) == Qt::Checked)
{
selectedCount++;
}
}
if (selectedCount <= 0)
{
//未选中状态
parent->setCheckState(0, Qt::Unchecked);
}
else if (selectedCount > 0 && selectedCount < childCount)
{
//部分选中状态
parent->setCheckState(0, Qt::PartiallyChecked);
}
else if (selectedCount == childCount)
{
//选中状态
parent->setCheckState(0, Qt::Checked);
}
}
App/ToolsUI/tools_Index0/MAVLinkInspector/MAVLinkInspector.h
+4
View File
@@ -90,6 +90,10 @@ private slots:
void on_treeWidget_itemClicked(QTreeWidgetItem *item, int column);
void on_treeWidget_itemChanged(QTreeWidgetItem *item, int column);
void updateParentItem(QTreeWidgetItem *item);
private:
Ui::MAVLinkInspector *ui;
};
App/mainwindow.cpp
+2 -2
View File
@@ -37,8 +37,8 @@ MainWindow::MainWindow(QWidget *parent)
checkUI->hide();
//---
inspectui = new InspectUI(this);
inspectui->hide();
//inspectui = new InspectUI(this);
//inspectui->hide();
//信息
toolsui = new ToolsUI(this);
App/mainwindow.h
+1 -1
View File
@@ -101,7 +101,7 @@ protected:
DLink *dlink = nullptr;
InspectUI *inspectui = nullptr;
//InspectUI *inspectui = nullptr;
ToolsUI *toolsui = nullptr;