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

修改地面站闪退问题

Browse Source
This commit is contained in:
hm
2021-07-09 18:26:47 +08:00
parent 56054d9f16
commit e2b6158eba
11 changed files with 756 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/GCS_zh_CN.qm
BIN
View File
Binary file not shown.
App/GCS_zh_CN.ts
+720 -1227
View File
File diff suppressed because it is too large Load Diff
App/HealthUI/HealthUI.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ HealthUI::HealthUI(QWidget *parent) :
Install("记录打开",7,state::inital);
Install("外置记录",8,state::inital);//1,绿，2，黄
Install("正在写入",9,state::inital);//3
Install("动检完成",10,state::inital);//3
//Install("动检完成",10,state::inital);//3
App/StatusUI/StatusUI.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ StatusUI::StatusUI(QWidget *parent) :
{"对准失败",StateWidget::state::red},
{"未知参数",StateWidget::state::red}});
install(e_fly,0,"导航模式",0,
QMap<QVariant, StateWidget::state>{{"N/A",StateWidget::state::gray},
QMap<QVariant, StateWidget::state>{{"未初始化",StateWidget::state::gray},
{"INS/大气",StateWidget::state::orange},
{"INS/DGPS",StateWidget::state::green},
{"INS/GNSS",StateWidget::state::green},
App/ToolsUI/RemoteControl/remotecontrol.cpp
+3 -3
View File
@@ -139,9 +139,9 @@ RemoteControl::RemoteControl(QWidget *parent) :
PowerSwitch->setSegment(3);
PowerSwitch->setPosition(3);
PowerSwitch->setNotice(0,"Soft");
PowerSwitch->setNotice(1,"Remote");
PowerSwitch->setNotice(2,"OFF");
PowerSwitch->setNotice(0,tr("Soft"));
PowerSwitch->setNotice(1,tr("Remote"));
PowerSwitch->setNotice(2,tr("OFF"));
App/ToolsUI/ToolsUI.h
-5
View File
@@ -47,15 +47,10 @@ public:
Tools_Index3 *index3 = nullptr;
tools_Index4 *index4 = nullptr;
PowerSystem *powersystem = nullptr;
ServoSystem *servosystem = nullptr;
CommandBox *command = nullptr;
Diagram *diagram = nullptr;
Senser *senser = nullptr;
evtol *Evtol = nullptr;
RemoteControl *remotecontrol = nullptr;
App/ToolsUI/tools_Index4/tools_Index4.cpp
+9
View File
@@ -35,6 +35,15 @@ tools_Index4::tools_Index4(QWidget *parent) :
tools_Index4::~tools_Index4()
{
foreach (QProgressBar *bar, barlist) {
if(bar)
{
delete bar;
}
}
delete ui;
}
App/mainwindow.cpp
+6 -4
View File
@@ -494,9 +494,10 @@ MainWindow::MainWindow(QWidget *parent)
connect(dlink->mavlinknode->Mission,SIGNAL(currentPoint(int)),
menuBarUI,SLOT(setTargetPoint(int)),Qt::DirectConnection);
/*
connect(dlink->mavlinknode->Mission,SIGNAL(currentPoint(int)),
toolsui->diagram,SLOT(setTargetPoint(int)),Qt::DirectConnection);
*/
//==== showmessage=====
connect(toolsui->command,SIGNAL(showMessage(QString,int)),this,SLOT(showMessage(QString,int)));
@@ -1377,6 +1378,7 @@ void MainWindow::updateUI()//事件驱动式更新数据
double lat = (double)(v.gps_raw_int.lat * 10e-8);
double lng = (double)(v.gps_raw_int.lon * 10e-8);
if(((lat > -90)&&(lat < 90))&&((lng > -180)&&(lng < 180)))
{
map->setUAVPos(v.sysid,
@@ -1393,7 +1395,7 @@ void MainWindow::updateUI()//事件驱动式更新数据
uint64_t time = ((uint64_t)dlink->mavlinknode->vehicleList.value(currentUAV).ins2.time)% 1000000;
uint64_t date = ((uint64_t)dlink->mavlinknode->vehicleList.value(currentUAV).ins2.time)/ 1000000;
//uint64_t date = ((uint64_t)dlink->mavlinknode->vehicleList.value(currentUAV).ins2.time)/ 1000000;
//qDebug() << time << date << (uint64_t)dlink->mavlinknode->vehicleList.value(currentUAV).ins2.time;
@@ -1438,7 +1440,7 @@ void MainWindow::updateUI()//事件驱动式更新数据
healthui->setColor(8,getBit(enabled,1)?(getBit(enabled,0)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//record
healthui->setColor(9,getBit(enabled,2)?(HealthUI::state::success):(HealthUI::state::inital));//正在记录，未记录
healthui->setValue(9,getBit(enabled,2)?(tr("正在写入")):(tr("停止写入")));//sel
healthui->setColor(10,getBit(health,9)?(HealthUI::state::success):(HealthUI::state::inital));//动检完成
//healthui->setColor(10,getBit(health,9)?(HealthUI::state::success):(HealthUI::state::inital));//动检完成
healthui->setColor(11,getBit(health,15)?(HealthUI::state::failure):(HealthUI::state::inital));//气囊盖
@@ -1513,7 +1515,7 @@ void MainWindow::updateUI()//事件驱动式更新数据
com_str.clear();
switch (com) {
case 0:
com_str = tr("N/A");
com_str = tr("未初始化");
break;
case 1:
com_str = tr("INS/大气");
MavLinkNode/statusprocess.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ void statusprocess::setHeartbeat(QVariant state,QVariant frq)
status.m_Mode = _modetype::Nop_Mode;//空闲模式
}
setRunFrq(frq.toInt());
setRunFrq(frq.toFloat());
}
opmap/MAP_zh_CN.ts
+15 -5
View File
@@ -78,27 +78,37 @@ Please first select the area of the map to rip with &lt;CTRL&gt;+Left mouse clic
<context>
<name>mapcontrol::OPMapWidget</name>
<message>
<location filename="mapwidget/opmapwidget.cpp" line="1645"/>
<location filename="mapwidget/opmapwidget.cpp" line="513"/>
<source>Selete File...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mapwidget/opmapwidget.cpp" line="515"/>
<source>command file (*.csv)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mapwidget/opmapwidget.cpp" line="1661"/>
<source>please create a plan</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mapwidget/opmapwidget.cpp" line="1650"/>
<location filename="mapwidget/opmapwidget.cpp" line="1666"/>
<source>start to send mossion %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mapwidget/opmapwidget.cpp" line="1679"/>
<location filename="mapwidget/opmapwidget.cpp" line="1695"/>
<source>send way point %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mapwidget/opmapwidget.cpp" line="1686"/>
<location filename="mapwidget/opmapwidget.cpp" line="1702"/>
<source>fail to send %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mapwidget/opmapwidget.cpp" line="1770"/>
<location filename="mapwidget/opmapwidget.cpp" line="1786"/>
<source>recieve way point %1</source>
<translation type="unfinished"></translation>
</message>
opmap/mapwidget/opmapwidget.cpp
-1
View File
@@ -1162,7 +1162,6 @@ void OPMapWidget::WPSetCurrent(int seq)
}
}
}
}