diff --git a/App/CommandUI/CommandUI.ui b/App/CommandUI/CommandUI.ui index a47d83f..678f430 100644 --- a/App/CommandUI/CommandUI.ui +++ b/App/CommandUI/CommandUI.ui @@ -32,10 +32,23 @@ - + + + + 50 + 16777215 + + + + + + 100 + 16777215 + + 切换无人机 @@ -47,13 +60,26 @@ + + + 80 + 16777215 + + 切换航点 - + + + + 60 + 16777215 + + + diff --git a/App/ComponentUI/Inputter/Inputter.cpp b/App/ComponentUI/Inputter/Inputter.cpp index 2123f25..f18fff5 100644 --- a/App/ComponentUI/Inputter/Inputter.cpp +++ b/App/ComponentUI/Inputter/Inputter.cpp @@ -50,7 +50,6 @@ Inputter::~Inputter() delete DoubleClickTimer; } - delete ui; } @@ -60,7 +59,7 @@ bool Inputter::event(QEvent *event) if(event->type() == QEvent::Leave) { - //this->close(); + //this->close();//鼠标离开立即关闭 } return QWidget::event(event); } @@ -142,7 +141,7 @@ void Inputter::setInputType(int Type) break; case 1: inputType = type::MAC; - ui->pushButton_nan->setEnabled(false); + //ui->pushButton_nan->setEnabled(false);//去除nan按键 ui->pushButton_minus->setEnabled(false); break; } diff --git a/App/ComponentUI/Inputter/Inputter.ui b/App/ComponentUI/Inputter/Inputter.ui index 007e4aa..34e12ab 100644 --- a/App/ComponentUI/Inputter/Inputter.ui +++ b/App/ComponentUI/Inputter/Inputter.ui @@ -185,25 +185,6 @@ - - - - - 80 - 20 - - - - - 100 - 100 - - - - 0 - - - @@ -242,25 +223,6 @@ - - - - - 80 - 20 - - - - - 100 - 100 - - - - nan - - - @@ -331,25 +293,6 @@ - - - - - 80 - 20 - - - - - 100 - 100 - - - - . - - - @@ -401,6 +344,44 @@ + + + + + 80 + 20 + + + + + 100 + 100 + + + + . + + + + + + + + 80 + 20 + + + + + 200 + 100 + + + + 0 + + + diff --git a/App/GCS_zh_CN.ts b/App/GCS_zh_CN.ts index 4d490ec..f3aef13 100644 --- a/App/GCS_zh_CN.ts +++ b/App/GCS_zh_CN.ts @@ -510,17 +510,17 @@ 请不要操作过快，上一个指令未发送完成 - + set mission :group %1,point %2 设置 第%1组，第%2点 - + point: 航点： - + click confirm to set uav %1 as current 点击选择%1无人机 @@ -549,7 +549,7 @@ %1 正在执行 - + click confirm to set group %1 Point %2 as current point click confirm to set Point %1 as current point 点击设置第%1组，航点%2为当前航点 @@ -3985,269 +3985,269 @@ Circle(radius) 伺服界面 - + 舵机 - - - - - + + + + + 上电自检 - + 左副翼 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 0 0 - - - - - + + + + + 指令位 - - - - - + + + + + 地面自检 - - - - - + + + + + 当前位 - - - - - + + + + + 找零 - + 右升降 - + 右副翼 - + 左升降 - + 发动机指令 发动机指令 - + 控制指令 - + 紧急停车 - + 停车 - + 冷运转 - + 关加力 - + 全加力档 - + 半加力档 - + 半加力 - + 全加力 - - + + 给定转速 - + 地面起动 - + 测试指令 - + 测试 - + 测试项 - + 测试值 - + 油量校准 - + 千克 - + 油量 - + 油量设定 - + 参数设置 - + 无人机# - + 外置大气机 - + 选择惯导 - + 选择 - + IAS_SEL - + 地速算空速 - + 内置大气机 - + 加热关闭 - + 加热打开 加热1开 - + 电源指令 - + 500瓦打开 - + 500瓦关闭 - + 500瓦电源 500W电源 @@ -4318,53 +4318,53 @@ Circle(radius) - + 扫频设置 - + 副翼 - + 升降 - - + + 方向舵 - + 幅值 - + 结束频率（Hz） - + 开始频率（Hz） - + 扫频频率变化率（Hz/s） - + 开始测试 - + 停止测试 @@ -4384,63 +4384,78 @@ Circle(radius) - + + 曳光管指令 + + + + + 发射曳光管 + + + + + 曳光管 + + + + 500瓦开 - + 版本信息 - + 飞控固件版本号： - + HIL模式状态： - + 电源 - + 28V剩余电量（%） - + 56V模块温度(℃) - + 机载28V电压（V） 机载28V电压 - + 56V剩余电量（%） - + 28V模块温度(℃) - + 状态 - + 28V电源 @@ -4461,33 +4476,33 @@ Circle(radius) 5803A - + 机载电源 - + 机载56V电压（V） - + 机载56V电流（A） - + 机载28V电流（A） - + 56V电源 - - + + 空速管加热 @@ -4499,7 +4514,7 @@ Circle(radius) - + time: %1 s 加热时间： %1 秒 @@ -4554,100 +4569,101 @@ Circle(radius) 请不要操作过快，上一个指令未发送完成 - + please set command first ,command :%1 请设置指令，当前指令号为 %1 - + 发送指令 - + 修改参数 - - - - - - - - + + + + + + + + 警告 - - + + 请选择测试项和测试点 - + 请设定给定转速 - - - - + + + + 请设定目标 - + 设定舵机 %1 %2 - + 请设定 - + 设定舵机归零 %1 - + %1 %2kg - - - - - - - - + + + + + + + + + 设定 %1 - + airspeed head warning 空速管加热警告 - + airspeed head can only support 30s since it opening,so it must be turn off after 30s 空速管在地面只能加热不超过30秒，在地面加热超过30秒后请立即关闭加热功能，避免空速管损坏 - + ok 确定 - + cancel 取消 diff --git a/App/HealthUI/HealthUI.ui b/App/HealthUI/HealthUI.ui index 9e01d95..66f2856 100644 --- a/App/HealthUI/HealthUI.ui +++ b/App/HealthUI/HealthUI.ui @@ -338,7 +338,7 @@ background-color: rgb(205, 205, 205); - 大气机 + 空速管加热 Qt::AlignCenter diff --git a/App/MissionUI/MissionUI.cpp b/App/MissionUI/MissionUI.cpp index 56fcb6d..a86bb68 100644 --- a/App/MissionUI/MissionUI.cpp +++ b/App/MissionUI/MissionUI.cpp @@ -468,7 +468,7 @@ MissionUI::MissionUI(QWidget *parent) : btn_download->show(); btn_insert->hide(); btn_delete->show(); - btn_clean->hide(); + //btn_clean->hide(); btn_add->hide(); } else if(index <= 4) diff --git a/App/ToolsUI/PowerSystem/PowerSystem.cpp b/App/ToolsUI/PowerSystem/PowerSystem.cpp index 8c12b9c..dda8e89 100644 --- a/App/ToolsUI/PowerSystem/PowerSystem.cpp +++ b/App/ToolsUI/PowerSystem/PowerSystem.cpp @@ -49,7 +49,7 @@ PowerSystem::PowerSystem(QWidget *parent) : setColor(ui->checkBox_12,state::success); setColor(ui->checkBox_13,state::success); setColor(ui->checkBox_14,state::success); - setColor(ui->checkBox_15,state::success); + //setColor(ui->checkBox_15,state::success); setColor(ui->checkBox_16,state::success); setColor(ui->checkBox_17,state::success); setColor(ui->checkBox_18,state::success); @@ -340,7 +340,7 @@ void PowerSystem::setTurbineState(mavlink_turbinestate_t *t) setColor(ui->checkBox_12,((t->Fault & 0x0010) > 0)?(state::failure):(state::success)); setColor(ui->checkBox_13,((t->Fault & 0x0020) > 0)?(state::failure):(state::success)); setColor(ui->checkBox_14,((t->Fault & 0x0040) > 0)?(state::failure):(state::success)); - setColor(ui->checkBox_15,((t->Fault & 0x0080) > 0)?(state::failure):(state::success)); + //setColor(ui->checkBox_15,((t->Fault & 0x0080) > 0)?(state::failure):(state::success)); setColor(ui->checkBox_16,((t->Fault & 0x0100) > 0)?(state::failure):(state::success)); setColor(ui->checkBox_17,((t->Fault & 0x0200) > 0)?(state::failure):(state::success)); setColor(ui->checkBox_18,((t->Fault & 0x0400) > 0)?(state::failure):(state::success)); diff --git a/App/ToolsUI/PowerSystem/PowerSystem.ui b/App/ToolsUI/PowerSystem/PowerSystem.ui index f9d5a60..a89434c 100644 --- a/App/ToolsUI/PowerSystem/PowerSystem.ui +++ b/App/ToolsUI/PowerSystem/PowerSystem.ui @@ -1126,66 +1126,6 @@ Qt::AlignCenter - - - - N1转速传感器 - - - false - - - - - - - 核心机主油泵输出 - - - false - - - - - - - 舵机控制器 - - - false - - - - - - - N2转速传感器 - - - false - - - - - - - 加力点火油泵输出 - - - false - - - - - - - 舵机位移传感器 - - - false - - - @@ -1205,6 +1145,16 @@ + + + + P1t进口总压传感器 + + + false + + + @@ -1215,20 +1165,40 @@ - - + + - 电源 + 舵机控制器 false - - + + - 加力主油泵输出 + P5t涡轮后压力感器 + + + false + + + + + + + 核心机主油泵输出 + + + false + + + + + + + 舵机位移传感器 false @@ -1245,39 +1215,50 @@ - - + + - P1t进口总压传感器 + N1转速传感器 false - - + + - P3t出口总压传感器 + 加力点火油泵输出 false - - false + + + + + + 加力主油泵输出 - - false - - + false - - + + - P5t涡轮后压力感器 + 电源 + + + false + + + + + + + N2转速传感器 false diff --git a/App/ToolsUI/Senser/inital.png b/App/ToolsUI/Senser/inital.png new file mode 100644 index 0000000..c340803 Binary files /dev/null and b/App/ToolsUI/Senser/inital.png differ diff --git a/App/ToolsUI/Senser/warning.png b/App/ToolsUI/Senser/warning.png new file mode 100644 index 0000000..6993ea1 Binary files /dev/null and b/App/ToolsUI/Senser/warning.png differ diff --git a/App/ToolsUI/ServoSystem/ServoSystem.cpp b/App/ToolsUI/ServoSystem/ServoSystem.cpp index b598ec1..f509e06 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.cpp +++ b/App/ToolsUI/ServoSystem/ServoSystem.cpp @@ -19,13 +19,12 @@ ServoSystem::ServoSystem(QWidget *parent) : file.close(); //======== - setColor(ui->checkBox_onBoard,state::success); - setColor(ui->checkBox_28v,state::success); - setColor(ui->checkBox_56v,state::success); - setColor(ui->checkBox_AirSpeed,state::success); - setColor(ui->checkBox_500W,state::failure); - - //setColor(ui->label_LE_SBIT,state::failure); + setColor(ui->checkBox_onBoard,state::inital); + setColor(ui->checkBox_28v,state::inital); + setColor(ui->checkBox_56v,state::inital); + setColor(ui->checkBox_AirSpeed,state::inital); + setColor(ui->checkBox_500W,state::inital); + setColor(ui->checkBox_Tracer,state::inital); setCheckState(6,state::failure); @@ -296,13 +295,13 @@ void ServoSystem::setCheckState(uint32_t pos,QVariant value) setColor(ui->checkBox_56v,(value.toBool())?(state::success):(state::failure)); break; case 4: - setColor(ui->checkBox_AirSpeed,(value.toBool())?(state::success):(state::failure)); + setColor(ui->checkBox_AirSpeed,(value.toBool())?(state::success):(state::inital)); break; case 5: - setColor(ui->checkBox_500W,(value.toBool())?(state::success):(state::failure)); + setColor(ui->checkBox_500W,(value.toBool())?(state::success):(state::inital)); break; case 6: - //setColor(ui->checkBox_5525D,(value.toBool())?(state::success):(state::failure)); + //setColor(ui->checkBox_Tracer,(value.toBool())?(state::success):(state::failure)); break; case 7: //setColor(ui->checkBox_5803A,(value.toBool())?(state::success):(state::failure)); @@ -380,6 +379,11 @@ void ServoSystem::setServoState(mavlink_servo_output_raw_t *t) } +void ServoSystem::setCCMState(mavlink_ccmstate_t *t) +{ + //判断echo_seq,是否一直在增加 + +} void ServoSystem::setAPversion(QString ver) { @@ -537,6 +541,29 @@ void ServoSystem::commandAccepted(bool flag,uint16_t command,uint8_t result) m_command = 0; m_confirm = 0; + if(isWaitPitotAck == true) + { + if(result == MAV_RESULT_ACCEPTED)//已经正确执行 + { + isWaitPitotAck = false; + setColor(ui->checkBox_AirSpeed,state::success); + } + else if(result == MAV_RESULT_ACCEPTED)//已经正确执行 + { + isWaitPitotAck = false; + setColor(ui->checkBox_AirSpeed,state::success); + } + } + + if(isWaitTracerAck == true) + { + if(result == MAV_RESULT_ACCEPTED)//已经正确执行 + { + isWaitTracerAck = false; + setColor(ui->checkBox_Tracer,state::success); + } + } + } if(string.size() > 0) @@ -657,11 +684,16 @@ void ServoSystem::on_pushButton_SendCommand_clicked() if(cmdType == 0) { - emit showMessage(tr("发送指令 ") + QString::number(m_command) + " " + m_name,5000); - emit cmd_long(m_param1,m_param2,m_param3,m_param4,m_param5,m_param6,m_param7,m_command,m_confirm); - if(m_name == ui->pushButton_AirHeatOn->text()) + + QString name = m_name.split(' ',QString::SkipEmptyParts).last(); + + //qDebug() << m_name << name; + + if(name == ui->pushButton_AirHeatOn->text()) { + isWaitPitotAck = true; + if((tim)&&(tim->isActive())) { tim->stop(); @@ -670,8 +702,9 @@ void ServoSystem::on_pushButton_SendCommand_clicked() heatCount = 0; tim->start(); } - else if(m_name == ui->pushButton_HeatOff->text()) + else if(name == ui->pushButton_HeatOff->text()) { + setColor(ui->checkBox_AirSpeed,state::inital); if((tim)&&(tim->isActive())) { tim->stop(); @@ -679,6 +712,14 @@ void ServoSystem::on_pushButton_SendCommand_clicked() ui->label_heatTime->setText(tr("time: %1 s").arg(heatCount)); } } + else if(name == ui->pushButton_tracer->text()) + { + isWaitTracerAck = true; + //qDebug() << "wait for tracer"; + } + + emit showMessage(tr("发送指令 ") + QString::number(m_command) + " " + m_name,5000); + emit cmd_long(m_param1,m_param2,m_param3,m_param4,m_param5,m_param6,m_param7,m_command,m_confirm); } else if(cmdType == 1) @@ -1143,6 +1184,8 @@ void ServoSystem::on_pushButton_AirHeatOn_clicked() if(rst == QMessageBox::AcceptRole) { + + on_commandClicked(ui->pushButton_AirHeatOn->text(), 1,1,0,0,0,0,0,20005,0); @@ -1237,6 +1280,8 @@ void ServoSystem::on_pushButton_500W_Close_clicked() void ServoSystem::on_pushButton_tracer_clicked() { + + on_commandClicked(tr("设定 %1").arg(ui->pushButton_tracer->text()), 0,0,0,0,0,0,0,20013,0); } diff --git a/App/ToolsUI/ServoSystem/ServoSystem.h b/App/ToolsUI/ServoSystem/ServoSystem.h index 09489a7..996551a 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.h +++ b/App/ToolsUI/ServoSystem/ServoSystem.h @@ -42,6 +42,8 @@ public: enum state{ success = 0, failure, + warning, + inital, }; explicit ServoSystem(QWidget *parent = nullptr); @@ -140,6 +142,7 @@ public slots: void setCheckState(uint32_t pos,QVariant value); void setBUMState(mavlink_bmustate_t *t); + void setCCMState(mavlink_ccmstate_t *t); void setServoState(mavlink_servo_output_raw_t *t); @@ -230,7 +233,9 @@ private: int heatCount = 30; QTimer *tim = nullptr; - + bool isWaitPitotAck = false; + bool isWaitPitotClose = true; + bool isWaitTracerAck = false; }; diff --git a/App/ToolsUI/ServoSystem/ServoSystem.qrc b/App/ToolsUI/ServoSystem/ServoSystem.qrc index 137188b..12ccc52 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.qrc +++ b/App/ToolsUI/ServoSystem/ServoSystem.qrc @@ -8,5 +8,7 @@ fail_rect.png success_rect.png warning_rect.png + inital.png + warning.png diff --git a/App/ToolsUI/ServoSystem/ServoSystem.qss b/App/ToolsUI/ServoSystem/ServoSystem.qss index 585ba23..9f37083 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.qss +++ b/App/ToolsUI/ServoSystem/ServoSystem.qss @@ -88,4 +88,12 @@ image:url(:/img/fail.png); } +.QCheckBox::indicator[state="2"] { + image:url(:/img/warning.png); +} + +.QCheckBox::indicator[state="3"] { + image:url(:/img/inital.png); +} + diff --git a/App/ToolsUI/ServoSystem/ServoSystem.ui b/App/ToolsUI/ServoSystem/ServoSystem.ui index 9cf0abd..d2e83bd 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.ui +++ b/App/ToolsUI/ServoSystem/ServoSystem.ui @@ -6,8 +6,8 @@ 0 0 - 1574 - 782 + 1556 + 841 @@ -761,7 +761,7 @@ - 发射曳光管 + 点亮曳光管 @@ -823,7 +823,14 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - + + + + 56V电源 + + + + Qt::Vertical @@ -850,13 +857,6 @@ - - - - 56V电源 - - - @@ -871,6 +871,13 @@ + + + + 曳光管 + + + diff --git a/App/ToolsUI/ServoSystem/inital.png b/App/ToolsUI/ServoSystem/inital.png new file mode 100644 index 0000000..c340803 Binary files /dev/null and b/App/ToolsUI/ServoSystem/inital.png differ diff --git a/App/ToolsUI/ServoSystem/warning.png b/App/ToolsUI/ServoSystem/warning.png new file mode 100644 index 0000000..6993ea1 Binary files /dev/null and b/App/ToolsUI/ServoSystem/warning.png differ diff --git a/App/mainwindow.cpp b/App/mainwindow.cpp index d1d9bf2..2045010 100644 --- a/App/mainwindow.cpp +++ b/App/mainwindow.cpp @@ -1515,6 +1515,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 QString::number(vehicle.ccmstate.fuel_level * 10.0 / 65536.0f,'f',1)); toolsui->servosystem->setBUMState(&vehicle.bmustate); + toolsui->servosystem->setCCMState(&vehicle.ccmstate); //在这里设置 toolsui->servosystem->setServoState(&vehicle.servo_output_raw); @@ -1530,7 +1531,31 @@ void MainWindow::updateUI()//事件驱动式更新数据 toolsui->servosystem->setCheckState(1,v28_Low || v56_Low); toolsui->servosystem->setCheckState(2,v28_Low); toolsui->servosystem->setCheckState(3,v56_Low); - toolsui->servosystem->setCheckState(4,0); + + //两秒检测一次，如果两秒内，数据变化，说明在加热 + static qint64 echo_time = 0; + static uint8_t echo_seq_old = 0; + if((QDateTime::currentMSecsSinceEpoch() - echo_time) >= 3000) + { + if(vehicle.ccmstate.echo_seq != echo_seq_old) + { + toolsui->servosystem->setCheckState(4,1);//空速管加热 + healthui->setState(7,HealthUI::state::success);//AIR + + echo_seq_old = vehicle.ccmstate.echo_seq; + + } + else + { + toolsui->servosystem->setCheckState(4,0);//空速管不加热 + healthui->setState(7,HealthUI::state::inital);//AIR + + } + + + } + echo_time = QDateTime::currentMSecsSinceEpoch(); + @@ -1559,7 +1584,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 // 22 23 24 25 26 27 28 29 // 5525D 5803A 5607A 4525D atteck slide 解码 通讯 - healthui->setState(7,getBit(health,29)?(getBit(health,28)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//AIR + //healthui->setState(7,getBit(health,29)?(getBit(health,28)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//AIR healthui->setState(8,getBit(health,5)?(getBit(health,11)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//FL diff --git a/MavLinkNode/MAVLINKNODE_zh_CN.qm b/MavLinkNode/MAVLINKNODE_zh_CN.qm new file mode 100644 index 0000000..f4f5c8d Binary files /dev/null and b/MavLinkNode/MAVLINKNODE_zh_CN.qm differ diff --git a/MavLinkNode/MAVLINKNODE_zh_CN.ts b/MavLinkNode/MAVLINKNODE_zh_CN.ts new file mode 100644 index 0000000..cbaf4ff --- /dev/null +++ b/MavLinkNode/MAVLINKNODE_zh_CN.ts @@ -0,0 +1,41 @@ + + + + + MavLinkNode + + + 出现新的设备,识别号为 %1 + + + + + MissionProcess + + + this mission group is empty + 本航线为空 + + + + ParameterProcess + + + 收到参数 %1 %2 %3 + + + + + Replay + + + Error + + + + + %1 + + + + diff --git a/MavLinkNode/MavLinkNode.pro b/MavLinkNode/MavLinkNode.pro index cb3399f..cd916dd 100644 --- a/MavLinkNode/MavLinkNode.pro +++ b/MavLinkNode/MavLinkNode.pro @@ -130,7 +130,7 @@ unix { system(cp $$src_dir $$dst_dir -arf ) } - +TRANSLATIONS += MAVLINKNODE_zh_CN.ts diff --git a/opmap/MAP_zh_CN.qm b/opmap/MAP_zh_CN.qm index ccf83eb..bab6b7f 100644 Binary files a/opmap/MAP_zh_CN.qm and b/opmap/MAP_zh_CN.qm differ diff --git a/opmap/MAP_zh_CN.ts b/opmap/MAP_zh_CN.ts index d8ecedd..b632493 100644 --- a/opmap/MAP_zh_CN.ts +++ b/opmap/MAP_zh_CN.ts @@ -93,67 +93,72 @@ Please first select the area of the map to rip with <CTRL>+Left mouse clic 停止缓存地图 - + Load Geo Fence File :%1 导入围栏文件：%1 - + Load Mission File:Group %1,%2 导入航线文件：第%1组航线，%2 - + Save Fence File:%1 保存围栏文件：%1 - + Save Mission File:Group %1,%2 保存航线文件：第%1组航线，%2 - + please load fence first 请先导入围栏 - + start upload fence,total:%1 开始上传围栏，总数%1 - + please load mission first 请先导入航线 - + start upload mission %1,total %2 开始上传航线%1，总数%2 - + + upload Mission + 上传航点 + + + upload fail %1 上传失败 %1 - + recieve fence polygon inclusion: %1 接收到多边形安控区 ：%1 - + recieve fence polygon exclusion: %1 接收到多边形禁飞区 ：%1 - + recieve fence circle inclusion: %1 接收到圆形安控区 ：%1 - + recieve fence circle exclusion: %1 接收到圆形禁飞区 ：%1 @@ -162,7 +167,7 @@ Please first select the area of the map to rip with <CTRL>+Left mouse clic 围栏 - + recieve way point group:%1 seq:%2 收到航点：第%1组，第%2点 @@ -244,6 +249,10 @@ Ma:%2 + + + + Ma: %1 马赫：%1 @@ -255,28 +264,28 @@ Ma:%2 - + onAB 开加力 - + offAB 关加力 - + unknow 未知指令 - + @@ -284,15 +293,15 @@ Ma:%2 - - - - + + + + Speed: %1m/s 速度：%1m/s - + Height: %1m %2 高度：%1m diff --git a/opmap/mapwidget/opmapwidget.cpp b/opmap/mapwidget/opmapwidget.cpp index e20a7ef..0726c98 100644 --- a/opmap/mapwidget/opmapwidget.cpp +++ b/opmap/mapwidget/opmapwidget.cpp @@ -1409,6 +1409,8 @@ void OPMapWidget::WPDeleteAll() delete w; } } + + fenceCount = 1; } @@ -2970,7 +2972,7 @@ void OPMapWidget::WPGroup(int value) if(flag == true) { QString str; - str.append("upload Mission"); + str.append(tr("upload Mission")); str.append(QString::number(seq)); emit showMessage(str); }