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-24 16:46:08 +08:00
parent 9847a4befd
commit bf66bf7cc3
7 changed files with 306 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/ComponentUI/Inputter/Inputter.cpp
+12 -9
View File
@@ -1,4 +1,4 @@
#include "Inputter.h"
#include "Inputter.h"
#include "ui_Inputter.h"
Inputter::Inputter(QWidget *parent) :
@@ -143,16 +143,19 @@ void Inputter::on_pushButton_0_clicked()
void Inputter::on_pushButton_minus_clicked()
{
if(curentStr.at(0) == '-')
if(inputType == 0)
{
curentStr = curentStr.mid(1);
}
else
{
curentStr.insert(0,'-');
}
if(curentStr.at(0) == '-')
{
curentStr = curentStr.mid(1);
}
else
{
curentStr.insert(0,'-');
}
ui->lineEdit->setText(curentStr);
ui->lineEdit->setText(curentStr);
}
}
App/GCS_zh_CN.qm
BIN
View File
Binary file not shown.
App/GCS_zh_CN.ts
+115 -97
View File
@@ -332,17 +332,16 @@
<translation type="vanished">返航</translation>
</message>
<message>
<location filename="CommandUI/CommandUI.cpp" line="55"/>
<location filename="CommandUI/CommandUI.cpp" line="56"/>
<source>Command Version:</source>
<translation>指令 版本：</translation>
</message>
<message>
<location filename="CommandUI/CommandUI.cpp" line="210"/>
<source>press will send a command to vehicle</source>
<translation>按下将发送指令至无人机</translation>
<translation type="vanished">按下将发送指令至无人机</translation>
</message>
<message>
<location filename="CommandUI/CommandUI.cpp" line="223"/>
<location filename="CommandUI/CommandUI.cpp" line="241"/>
<source>clicked</source>
<translation>点击</translation>
</message>
@@ -373,7 +372,7 @@
<location filename="ComponentUI/Confirm/Confirm.cpp" line="41"/>
<source>Notice:<byte value="xd"/>
</source>
<translation>注意:
<translation>注意:
</translation>
</message>
</context>
@@ -385,212 +384,198 @@
<translation>界面</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="22"/>
<source>Tiltle</source>
<translation>标题</translation>
<translation type="vanished">标题</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="35"/>
<source>USR Name</source>
<translation>用户名</translation>
<translation type="vanished">用户名</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="72"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="537"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="770"/>
<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"/>
<source>Connect</source>
<translation>连接</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="85"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="78"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="123"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="136"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="183"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="196"/>
<source>Param1</source>
<translation>参数1</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="160"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="173"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="139"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="152"/>
<source>Param4</source>
<translation>参数4</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="203"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="210"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="108"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="115"/>
<source>Param5</source>
<translation>参数5</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="234"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="247"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="22"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="35"/>
<source>Param2</source>
<translation>参数2</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="271"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="284"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="260"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="273"/>
<source>Param3</source>
<translation>参数3</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="308"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="321"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="101"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="130"/>
<source>Type</source>
<translation>类型</translation>
<translation type="vanished">类型</translation>
</message>
<message>
<source>unname</source>
<translation type="vanished">未命名</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="55"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="98"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="287"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="326"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="345"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="414"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="456"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="498"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="543"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="581"/>
<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"/>
<source>SerialPort</source>
<translation>串口</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="65"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="297"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="302"/>
<source>115200</source>
<translation>115200</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="66"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="298"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="422"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="303"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="427"/>
<source>8</source>
<translation>8</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="67"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="299"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="463"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="549"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="587"/>
<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"/>
<source>NONE</source>
<translation>无</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="68"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="300"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="305"/>
<source>1</source>
<translation>1</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="100"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="129"/>
<source>User Name</source>
<translation>用户名</translation>
<translation type="vanished">用户名</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="102"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="117"/>
<source>Port</source>
<translation>端口</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="103"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="118"/>
<source>Baud</source>
<translation>波特率</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="104"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="119"/>
<source>Data</source>
<translation>数据</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="105"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="120"/>
<source>Parity</source>
<translation>校验</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="106"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="121"/>
<source>Stop</source>
<translation>停止</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="117"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="132"/>
<source>this port is busy now
</source>
<translation>端口已经被占用
</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="127"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="305"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="327"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="368"/>
<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"/>
<source>UDP</source>
<translation>UDP</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="131"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="144"/>
<source>Local</source>
<translation>本地</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="133"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="146"/>
<source>Remote</source>
<translation>远端</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="139"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="152"/>
<source>NetWork</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="464"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="553"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="591"/>
<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"/>
<source>ODD</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="465"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="557"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="595"/>
<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"/>
<source>EVEN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="578"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="754"/>
<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>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="54"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="158"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="231"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="233"/>
<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"/>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="251"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="256"/>
<source>Name</source>
<translation type="unfinished">名称</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="421"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="426"/>
<source>7</source>
<translation type="unfinished">7</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="423"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="428"/>
<source>9</source>
<translation type="unfinished">9</translation>
</message>
@@ -599,18 +584,18 @@
<translation type="vanished">网络</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="307"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="309"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="312"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="314"/>
<source>127.0.0.1</source>
<translation>127.0.0.1</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="308"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="313"/>
<source>6061</source>
<translation>6061</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="310"/>
<location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="315"/>
<source>6060</source>
<translation>6060</translation>
</message>
@@ -636,24 +621,22 @@
<translation>界面</translation>
</message>
<message>
<location filename="Setting/Index0/Index0.ui" line="46"/>
<location filename="Setting/Index0/Index0.ui" line="78"/>
<source>Link</source>
<translation>连接设置</translation>
</message>
<message>
<location filename="Setting/Index0/Index0.ui" line="65"/>
<location filename="Setting/Index0/Index0.ui" line="46"/>
<source>Map</source>
<translation>地图设置</translation>
</message>
<message>
<location filename="Setting/Index0/Index0.ui" line="78"/>
<source>Command</source>
<translation>指令</translation>
<translation type="vanished">指令</translation>
</message>
<message>
<location filename="Setting/Index0/Index0.ui" line="104"/>
<source>Check</source>
<translation>自检</translation>
<translation type="vanished">自检</translation>
</message>
</context>
<context>
@@ -796,17 +779,19 @@
</message>
<message>
<location filename="Setting/Index0/LinkUI/LinkUI.ui" line="36"/>
<location filename="Setting/Index0/LinkUI/LinkUI.ui" line="48"/>
<source>Add</source>
<translation>新增连接</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/LinkUI.ui" line="83"/>
<location filename="Setting/Index0/LinkUI/LinkUI.cpp" line="20"/>
<source>SerialPort</source>
<translation type="vanished">串口</translation>
<translation>串口</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/LinkUI.ui" line="96"/>
<source>UDP</source>
<translation type="vanished">UDP</translation>
<translation>UDP</translation>
</message>
<message>
<source>ADD</source>
@@ -817,9 +802,34 @@
<translation type="vanished">添加部件</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/LinkUI.cpp" line="44"/>
<source>New</source>
<translation type="unfinished"></translation>
<location filename="Setting/Index0/LinkUI/LinkUI.cpp" line="21"/>
<source>Multicast</source>
<translation>组播</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/LinkUI.cpp" line="22"/>
<source>Unicast</source>
<translation>单播</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/LinkUI.cpp" line="25"/>
<source>DataLink</source>
<translation>数据链</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/LinkUI.cpp" line="26"/>
<source>RTK</source>
<translation>差分基站</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/LinkUI.cpp" line="27"/>
<source>Emergecy</source>
<translation>紧急按钮</translation>
</message>
<message>
<location filename="Setting/Index0/LinkUI/LinkUI.cpp" line="28"/>
<source>Remote</source>
<translation>遥控器</translation>
</message>
</context>
<context>
@@ -1152,6 +1162,14 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Scope</name>
<message>
<location filename="ComponentUI/Scope/Scope.ui" line="14"/>
<source>Form</source>
<translation type="unfinished">界面</translation>
</message>
</context>
<context>
<name>Selector</name>
<message>
App/Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp
+45 -39
View File
@@ -70,30 +70,46 @@ void ConnectDialog::setInit(QVariant inter, QVariant device)
bool isNew = true;
for(QJsonValue info: Connect_info) {
if (info.isObject()) {
if(info.toObject().value("Name") == m_usrName)
{
m_Param1 = info.toObject().value("Param1");
m_Param2 = info.toObject().value("Param2");
m_Param3 = info.toObject().value("Param3");
m_Param4 = info.toObject().value("Param4");
m_Param5 = info.toObject().value("Param5");
//类型不一样不行
if(info.toObject().value("Type") == m_Type)
{
m_Param1 = info.toObject().value("Param1");
m_Param2 = info.toObject().value("Param2");
m_Param3 = info.toObject().value("Param3");
m_Param4 = info.toObject().value("Param4");
m_Param5 = info.toObject().value("Param5");
isNew = false;
}
else
{
}
isNew = false;
}
}
}
if(isNew == true)//新建一个新的连接
{
//根据接口类型新建一个界面
m_Param1 = ui->pushButton_param1->text();
m_Param2 = ui->pushButton_param2->text();
m_Param3 = ui->pushButton_param3->text();
m_Param4 = ui->pushButton_param4->text();
m_Param5 = ui->pushButton_param5->text();
if(m_Type.toString() == tr("SerialPort"))
{
m_Param1 = tr("COM1");
m_Param2 = tr("115200");
m_Param3 = tr("8");
m_Param4 = tr("NONE");
m_Param5 = tr("1");
}
else if(m_Type.toString() == tr("UDP"))
{
m_Param1 = tr("192.168.0.1");
m_Param2 = tr("6060");
m_Param3 = tr("192.168.0.1");
m_Param4 = tr("6061");
}
}
@@ -114,8 +130,6 @@ void ConnectDialog::reBuildList(void)
if(m_Type.toString() == tr("SerialPort"))
{
ui->label_usrName->setText(tr("User Name"));
ui->label_Type->setText(tr("Type"));
ui->label_Param1->setText(tr("Port"));
ui->label_Param2->setText(tr("Baud"));
ui->label_Param3->setText(tr("Data"));
@@ -143,8 +157,6 @@ void ConnectDialog::reBuildList(void)
}
else if(m_Type.toString() == tr("UDP"))
{
ui->label_usrName->setText(tr("User Name"));
ui->label_Type->setText(tr("Type"));
ui->label_Param1->setText(tr("Local"));
ui->label_Param2->setText(tr(""));
ui->label_Param3->setText(tr("Remote"));
@@ -157,8 +169,6 @@ void ConnectDialog::reBuildList(void)
}
ui->pushButton_usrName->setText(m_usrName.toString());
ui->pushButton_type->setText(m_Type.toString());
ui->pushButton_param1->setText(m_Param1.toString());
ui->pushButton_param2->setText(m_Param2.toString());
ui->pushButton_param3->setText(m_Param3.toString());
@@ -210,7 +220,6 @@ void ConnectDialog::setUsrName(QVariant value)
if(isNew == true)//新建一个新的连接
{
m_Type = ui->pushButton_type->text();
m_usrName = value;
m_Param1 = ui->pushButton_param1->text();
m_Param2 = ui->pushButton_param2->text();
@@ -240,17 +249,12 @@ void ConnectDialog::onUsrNameClicked(void)//英文输入
}
}
if(!list.contains(ui->pushButton_usrName->text()))
{
list.prepend(ui->pushButton_usrName->text());
}
if(!list.contains(tr("New")))
{
list.append(tr("New"));
}
selector->setList(list,ui->pushButton_usrName->text());
selector->setList(list,m_usrName.toString());
connect(selector,SIGNAL(confirmValue(QVariant)),
this,SLOT(setUsrName(QVariant)));
@@ -265,7 +269,7 @@ void ConnectDialog::setType(QVariant value)
for(QJsonValue info: Connect_info) {
if (info.isObject()) {
if(info.toObject().value(tr("Name")).toString() == ui->pushButton_usrName->text())
if(info.toObject().value(tr("Name")).toString() == m_usrName.toString())
{
if(info.toObject().value("Type") == value)
{
@@ -283,7 +287,7 @@ void ConnectDialog::setType(QVariant value)
for(QJsonValue info: Connect_info) {
if (info.isObject()) {
if(info.toObject().value("Name") == ui->pushButton_usrName->text())
if(info.toObject().value("Name") == m_usrName.toString())
{
m_Type = value;
@@ -343,7 +347,7 @@ void ConnectDialog::onTypeClicked(void)//选择器
list << tr("SerialPort")
<< tr("UDP");
selector->setList(list,ui->pushButton_type->text());
//selector->setList(list,ui->pushButton_type->text());
connect(selector,SIGNAL(confirmValue(QVariant)),
this,SLOT(setType(QVariant)));
@@ -351,6 +355,12 @@ void ConnectDialog::onTypeClicked(void)//选择器
selector->show();
}
/*
//============================================================================
// 参数设置
//============================================================================
*/
void ConnectDialog::setParam1(QVariant value)
{
m_Param1 = value;
@@ -359,7 +369,7 @@ void ConnectDialog::setParam1(QVariant value)
void ConnectDialog::onParam1Clicked(void)//name/localaddr 串口-选择 udp-输入
{
if(ui->pushButton_type->text() == tr("SerialPort"))
if(m_Type.toString() == tr("SerialPort"))
{
Selector *selector = new Selector(this);
selector->setGeometry(0,0,this->width(),this->height());
@@ -382,7 +392,7 @@ void ConnectDialog::onParam1Clicked(void)//name/localaddr 串口-选择 udp-
selector->show();
}
else if(ui->pushButton_type->text() == tr("UDP"))
else if(m_Type.toString() == tr("UDP"))
{
Inputter *inputter = new Inputter(this);
inputter->setGeometry(0,0,this->width(),this->height());
@@ -428,7 +438,7 @@ void ConnectDialog::setParam3(QVariant value)
void ConnectDialog::onParam3Clicked(void)//databit/remote addr 串口-选择 udp-输入
{
if(ui->pushButton_type->text() == tr("SerialPort"))
if(m_Type.toString() == tr("SerialPort"))
{
Selector *selector = new Selector(this);
selector->setGeometry(0,0,this->width(),this->height());
@@ -470,7 +480,7 @@ void ConnectDialog::setParam4(QVariant value)
void ConnectDialog::onParam4Clicked(void)//parity/remote port 串口-选择 udp-输入
{
if(ui->pushButton_type->text() == tr("SerialPort"))
if(m_Type.toString() == tr("SerialPort"))
{
Selector *selector = new Selector(this);
selector->setGeometry(0,0,this->width(),this->height());
@@ -512,7 +522,7 @@ void ConnectDialog::setParam5(QVariant value)
void ConnectDialog::onParam5Clicked()//stopbit/remote port 串口-选择 udp-输入
{
if(ui->pushButton_type->text() == tr("SerialPort"))
if(m_Type.toString() == tr("SerialPort"))
{
Selector *selector = new Selector(this);
selector->setGeometry(0,0,this->width(),this->height());
@@ -776,8 +786,6 @@ void ConnectDialog::PortConnected(QVariant state, QVariant usrName, QVariant Typ
ui->pushButton_param3->setEnabled(false);
ui->pushButton_param4->setEnabled(false);
ui->pushButton_param5->setEnabled(false);
ui->pushButton_type->setEnabled(false);
ui->pushButton_usrName->setEnabled(false);
}
else
{
@@ -792,8 +800,6 @@ void ConnectDialog::PortConnected(QVariant state, QVariant usrName, QVariant Typ
ui->pushButton_param3->setEnabled(true);
ui->pushButton_param4->setEnabled(true);
ui->pushButton_param5->setEnabled(true);
ui->pushButton_type->setEnabled(true);
ui->pushButton_usrName->setEnabled(true);
}
}
App/Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui
+122 -203
View File
@@ -14,30 +14,30 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="3">
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="1">
<widget class="QLabel" name="label_usrName">
<widget class="QLabel" name="label_Param2">
<property name="text">
<string>Tiltle</string>
<string>Param2</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_usrName">
<widget class="QPushButton" name="pushButton_param2">
<property name="minimumSize">
<size>
<width>250</width>
<width>200</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>USR Name</string>
<string>Param2</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -51,14 +51,7 @@
</item>
</layout>
</item>
<item row="0" column="1" rowspan="3">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="6" column="0" colspan="6">
<item row="6" column="0" colspan="5">
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_Connect">
@@ -101,21 +94,88 @@
</item>
</layout>
</item>
<item row="4" column="0" colspan="6">
<item row="2" column="1">
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_param5">
<property name="minimumSize">
<size>
<width>250</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Param5</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_Param5">
<property name="text">
<string>Param5</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="3">
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="1">
<widget class="QLabel" name="label_Param4">
<property name="text">
<string>Param4</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_param4">
<property name="minimumSize">
<size>
<width>200</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Param4</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="4" column="0" colspan="5">
<widget class="QLabel" name="label_Description">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="3" rowspan="3">
<widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="0" column="2">
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="1">
<widget class="QLabel" name="label_Param1">
@@ -153,117 +213,46 @@
</layout>
</item>
<item row="1" column="4">
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="1">
<widget class="QLabel" name="label_Param4">
<property name="text">
<string>Param4</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_param4">
<property name="minimumSize">
<size>
<width>200</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Param4</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_param5">
<property name="minimumSize">
<size>
<width>250</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Param5</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_Param5">
<property name="text">
<string>Param5</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
<item row="5" column="0" colspan="5">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="4">
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="1">
<widget class="QLabel" name="label_Param2">
<property name="text">
<string>Param2</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_param2">
<property name="minimumSize">
<size>
<width>200</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Param2</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
<item row="0" column="2" rowspan="3">
<widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="1" column="2">
<item row="3" column="0" colspan="5">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="1">
<widget class="QLabel" name="label_Param3">
@@ -300,76 +289,6 @@
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QLabel" name="label_Type">
<property name="text">
<string>Type</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_type">
<property name="minimumSize">
<size>
<width>250</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Type</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="3" column="0" colspan="6">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="0" colspan="6">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="5">
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>
App/Setting/Index0/LinkUI/LinkUI.cpp
+7 -1
View File
@@ -198,7 +198,13 @@ void LinkUI::on_pushButton_UDP_clicked()
{
QPushButton *s = qobject_cast<QPushButton *>(sender());
if(btn != s)
btn->setEnabled(false);
{
btn->setEnabled(false);
}
else
{
InterfaceString = btn->text();
}
}
}
dlink/dlink.cpp
+5 -1
View File
@@ -58,7 +58,11 @@ int DLink::SendMessageTo(quint8 ch, quint8 *msg, quint16 len)
//qDebug() << QThread::currentThread();
DLink::serialPort->write((const char *)msg,len);
qint64 flag = DLink::serialPort->write((const char *)msg,len);
qDebug() << flag;
//serialPort->write()
//qDebug() << "serialPort Send Msg" << msg;
}