diff --git a/App/HealthUI/HealthUI.ui b/App/HealthUI/HealthUI.ui index 66f2856..affbc57 100644 --- a/App/HealthUI/HealthUI.ui +++ b/App/HealthUI/HealthUI.ui @@ -92,7 +92,7 @@ background-color: rgb(205, 205, 205); - 开伞 + 空速管加热 Qt::AlignCenter @@ -105,7 +105,7 @@ background-color: rgb(205, 205, 205); - 上行失效 + 开气囊舱 Qt::AlignCenter @@ -118,7 +118,7 @@ background-color: rgb(205, 205, 205); - 开气囊 + 伞舱门开 Qt::AlignCenter @@ -137,7 +137,7 @@ background-color: rgb(205, 205, 205); - 内置记录仪 + 记录打开 Qt::AlignCenter @@ -150,7 +150,7 @@ background-color: rgb(205, 205, 205); - 内置写入 + 记录写入 Qt::AlignCenter @@ -169,7 +169,7 @@ background-color: rgb(205, 205, 205); - 开加力 + 停车 Qt::AlignCenter @@ -182,7 +182,7 @@ background-color: rgb(205, 205, 205); - 外置写入 + INS解算正常 Qt::AlignCenter @@ -201,7 +201,7 @@ background-color: rgb(205, 205, 205); - 选择SBG + 抛伞 Qt::AlignCenter @@ -214,7 +214,7 @@ background-color: rgb(205, 205, 205); - 记录打开 + 充气 Qt::AlignCenter @@ -227,7 +227,7 @@ background-color: rgb(205, 205, 205); - 外置记录仪 + 连接INS Qt::AlignCenter @@ -240,7 +240,7 @@ background-color: rgb(205, 205, 205); - 充气 + 上行失效 Qt::AlignCenter @@ -253,7 +253,7 @@ background-color: rgb(205, 205, 205); - 抛伞 + 安控区内 Qt::AlignCenter @@ -272,7 +272,7 @@ background-color: rgb(205, 205, 205); - 停车 + 关加力 Qt::AlignCenter @@ -285,7 +285,7 @@ background-color: rgb(205, 205, 205); - 伞舱 + 开伞舱 Qt::AlignCenter @@ -298,7 +298,7 @@ background-color: rgb(205, 205, 205); - 安控区内 + SBG解算正常 Qt::AlignCenter @@ -338,7 +338,7 @@ background-color: rgb(205, 205, 205); - 空速管加热 + 油位计 Qt::AlignCenter @@ -357,7 +357,7 @@ background-color: rgb(205, 205, 205); - 内置惯导 + INS Qt::AlignCenter @@ -385,7 +385,7 @@ 0 - 数据链 + ECU Qt::AlignCenter @@ -449,7 +449,7 @@ background-color: rgb(205, 205, 205); - 综控 + 综合控制器 Qt::AlignCenter @@ -462,7 +462,7 @@ background-color: rgb(205, 205, 205); - ECU + 机载电池 Qt::AlignCenter @@ -501,7 +501,7 @@ background-color: rgb(205, 205, 205); - 机载电源 + 数据链 Qt::AlignCenter @@ -527,7 +527,7 @@ background-color: rgb(205, 205, 205); - 油位 + Qt::AlignCenter @@ -540,7 +540,7 @@ background-color: rgb(205, 205, 205); - 内部GPS + Qt::AlignCenter @@ -553,7 +553,7 @@ background-color: rgb(205, 205, 205); - 外部GPS + Qt::AlignCenter diff --git a/App/StatusUI/StatusUI.ui b/App/StatusUI/StatusUI.ui index ab2e9b2..c50b10a 100644 --- a/App/StatusUI/StatusUI.ui +++ b/App/StatusUI/StatusUI.ui @@ -807,7 +807,7 @@ color: rgb(0, 128, 0); - 电池 + 机载电池 @@ -815,7 +815,7 @@ color: rgb(0, 128, 0); - 机载电源[V/A] + 28V输出[V/A] @@ -860,7 +860,7 @@ color: rgb(0, 128, 0); - 舵机电源[V/A] + 56V输出[V/A] diff --git a/App/ToolsUI/Senser/Senser.cpp b/App/ToolsUI/Senser/Senser.cpp index 813fbdc..02ccd66 100644 --- a/App/ToolsUI/Senser/Senser.cpp +++ b/App/ToolsUI/Senser/Senser.cpp @@ -126,6 +126,10 @@ Senser::Senser(QWidget *parent) : ui->listView_Data->hide(); + + ui->label_2_dynamic->hide(); + ui->label_2_static->hide(); + } Senser::~Senser() diff --git a/App/ToolsUI/Senser/Senser.ui b/App/ToolsUI/Senser/Senser.ui index ea83f65..e38628d 100644 --- a/App/ToolsUI/Senser/Senser.ui +++ b/App/ToolsUI/Senser/Senser.ui @@ -220,7 +220,7 @@ 8 - + @@ -250,96 +250,7 @@ - - - - - 150 - 20 - - - - - 16777215 - 20 - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - - 150 - 20 - - - - - 16777215 - 20 - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - 真空速[m/s] - - - - - - - 表速[m/s] - - - - + @@ -364,14 +275,101 @@ - + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + + 黑体 + + + + 气压高度[m] + + + + 动压[hPa] - + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + @@ -397,54 +395,24 @@ - - - - 黑体 - - + - 气压高度[m] + 表速[m/s] - - + + - 静压[hPa] - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter + 马赫数 - + - 0 + 150 20 @@ -465,36 +433,42 @@ - - + + - 120 - 0 + 150 + 20 + + + 16777215 + 20 + + + + background-color: rgb(189, 189, 189); + - 内部大气机 + 0 Qt::AlignCenter - - + + - 外部大气机 - - - Qt::AlignCenter + 真空速[m/s] - - + + - 马赫数 + 静压[hPa] @@ -534,7 +508,7 @@ - 内部惯导 + INS Qt::AlignCenter @@ -1172,7 +1146,7 @@ - 外部惯导 + SBG Qt::AlignCenter diff --git a/App/ToolsUI/ServoSystem/ServoSystem.cpp b/App/ToolsUI/ServoSystem/ServoSystem.cpp index f509e06..0966181 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.cpp +++ b/App/ToolsUI/ServoSystem/ServoSystem.cpp @@ -112,7 +112,7 @@ ServoSystem::ServoSystem(QWidget *parent) : //use_ext_ins参数名称 - ui->comboBox_IMU->addItem("内置惯导",0); + ui->comboBox_IMU->addItem("INS",0); ui->comboBox_IMU->addItem("SBG",1); ui->comboBox_IMU->setCurrentIndex(0); @@ -138,7 +138,7 @@ ServoSystem::ServoSystem(QWidget *parent) : //ui->pushButton_AirHeatOn->hide(); //ui->pushButton_HeatOn3->hide(); //ui->pushButton_HeatOn4->hide(); - + ui->pushButton_IAS_SEL_2->hide();//隐藏选中外置大气 m_ra = 0; diff --git a/App/ToolsUI/ServoSystem/ServoSystem.ui b/App/ToolsUI/ServoSystem/ServoSystem.ui index 6dc76cf..d6f1f51 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.ui +++ b/App/ToolsUI/ServoSystem/ServoSystem.ui @@ -127,7 +127,7 @@ - 内置大气机 + 大气机空速 @@ -137,7 +137,7 @@ - 电源指令 + 载荷供电指令 @@ -874,7 +874,7 @@ - 电源 + 机载电池 Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter diff --git a/App/main.cpp b/App/main.cpp index 28872aa..b9e95f4 100644 --- a/App/main.cpp +++ b/App/main.cpp @@ -84,6 +84,61 @@ void CheckDirs(const QString &path, const QStringList &dirs) { } } +void makeDir(void) +{ + //构建语言文件夹 + QDir *Languagedir = new QDir; + if(!Languagedir->exists("./Language")) + { + qDebug() << "make dir Language"; + Languagedir->mkdir("./Language");//如果文件夹不存在就新建 + } + + //构建日志目录 + QDir *logdir = new QDir; + if(!logdir->exists("./log")) + { + qDebug() << "make dir log"; + logdir->mkdir("./log");//如果文件夹不存在就新建 + } + + //构建Tlog目录 + QDir *Tlogdir = new QDir; + if(!Tlogdir->exists("./log/tlog")) + { + qDebug() << "make dir tlog"; + Tlogdir->mkdir("./log/tlog");//如果文件夹不存在就新建 + } + + //构建CSV目录 + QDir *csvlog = new QDir; + if(!csvlog->exists("./log/csv")) + { + qDebug() << "make dir csv"; + csvlog->mkdir("./log/csv");//如果文件夹不存在就新建 + } + + //构建文本日志目录 + QDir *textlog = new QDir; + if(!textlog->exists("./log/textlog")) + { + qDebug() << "make dir textlog"; + textlog->mkdir("./log/textlog");//如果文件夹不存在就新建 + } + + //构建Other目录 + QDir *Otherdir = new QDir; + if(!Otherdir->exists("./log/other")) + { + qDebug() << "make dir other"; + Otherdir->mkdir("./log/other");//如果文件夹不存在就新建 + } + + +} + + + QStringList getFiles(const QString &filePath,const QString &fileSuffix) { QStringList list; @@ -95,9 +150,11 @@ QStringList getFiles(const QString &filePath,const QString &fileSuffix) QStringList filelist = Dir.entryList(QDir::Files); //获取所有文件 foreach (QFileInfo file, filelist) //遍历只加载.txt到文件列表 { - if(file.fileName().split(".").back() == fileSuffix) //判断进行再次确认是.fileSuffix + //qDebug() << file.absolutePath() << file.fileName(); + + if(file.suffix() == fileSuffix) //判断进行再次确认是.fileSuffix { - list.push_back(file.absoluteFilePath()); + list.push_back(filePath + file.fileName()); } } @@ -105,7 +162,6 @@ QStringList getFiles(const QString &filePath,const QString &fileSuffix) } - void LoadLang(QApplication *a) { QTranslator * qtTranslator = new QTranslator{}; @@ -121,7 +177,7 @@ void LoadLang(QApplication *a) } //导入全部的翻译文件 - QStringList filelist = getFiles("./","qm"); + QStringList filelist = getFiles("./Language/","qm"); foreach (QString lang, filelist) { QTranslator * Translator = new QTranslator{}; @@ -141,14 +197,7 @@ void LoadLang(QApplication *a) void RegisterType(void) { - - //qmlRegisterModule("Drivers.LinkUI",1,0); - - //qmlRegisterType("Drivers.LinkUI",1,0,"LinkUI"); - - qDebug() << "register qml type"; - } @@ -156,9 +205,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); -// QTranslator translator; -// translator.load("./GCS_zh_CN.qm"); -// a.installTranslator(&translator); + makeDir(); QString strLibPath(QDir::toNativeSeparators(QApplication::applicationDirPath()) + QDir::separator() + "plugins"); @@ -174,15 +221,6 @@ int main(int argc, char *argv[]) RegisterType(); - - QStringList l = QStyleFactory::keys(); - - foreach (QString s, l) { - qDebug() << s; - } - //QApplication::setStyle(QStyleFactory::create("fusion")); - - MainWindow w;//这一步已经全部初始化完成 w.setWindowTitle(QString("KB3A GCS Qt%1 %2").arg(QT_VERSION_STR).arg(APP_VERSION));//with version diff --git a/App/mainwindow.cpp b/App/mainwindow.cpp index 2182791..e6db1e8 100644 --- a/App/mainwindow.cpp +++ b/App/mainwindow.cpp @@ -46,47 +46,6 @@ float to360deg(float raw) MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { - //构建日志目录 - QDir *logdir = new QDir; - if(!logdir->exists("./log")) - { - qDebug() << "make dir log"; - logdir->mkdir("./log");//如果文件夹不存在就新建 - } - - //构建Tlog目录 - QDir *Tlogdir = new QDir; - if(!Tlogdir->exists("./log/tlog")) - { - qDebug() << "make dir tlog"; - Tlogdir->mkdir("./log/tlog");//如果文件夹不存在就新建 - } - - //构建CSV目录 - QDir *csvlog = new QDir; - if(!csvlog->exists("./log/csv")) - { - qDebug() << "make dir csv"; - csvlog->mkdir("./log/csv");//如果文件夹不存在就新建 - } - - //构建文本日志目录 - QDir *textlog = new QDir; - if(!textlog->exists("./log/textlog")) - { - qDebug() << "make dir textlog"; - textlog->mkdir("./log/textlog");//如果文件夹不存在就新建 - } - - //构建Other目录 - QDir *Otherdir = new QDir; - if(!Otherdir->exists("./log/other")) - { - qDebug() << "make dir other"; - Otherdir->mkdir("./log/other");//如果文件夹不存在就新建 - } - - setFocusPolicy(Qt::StrongFocus); setAttribute(Qt::WA_AcceptTouchEvents); @@ -1580,14 +1539,14 @@ void MainWindow::updateUI()//事件驱动式更新数据 { echo_count = 3; toolsui->servosystem->setCheckState(4,1);//空速管加热 - healthui->setState(7,HealthUI::state::success);//AIR + healthui->setState(22,HealthUI::state::success);//AIR } echo_seq_old = vehicle.ccmstate.echo_seq; } else { toolsui->servosystem->setCheckState(4,0);//空速管不加热 - healthui->setState(7,HealthUI::state::inital);//AIR + healthui->setState(22,HealthUI::state::inital);//AIR echo_count = 0; } @@ -1614,21 +1573,19 @@ void MainWindow::updateUI()//事件驱动式更新数据 if(isCommunicationLost == false) { - healthui->setState(1,getBit(health,6)?(getBit(health,0)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//IMU + healthui->setState(1,getBit(health,6)?(getBit(health,0)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//INS healthui->setState(2,getBit(health,7)?(getBit(health,1)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//SBG - healthui->setState(4,getBit(health,8)?(getBit(health,2)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//BMU - healthui->setState(3,getBit(health,9)?(getBit(health,3)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//ECU + healthui->setState(3,getBit(health,9)?(getBit(health,3)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//BMU + healthui->setState(4,(dlink->mavlinknode->isCommunicationLost)?(HealthUI::state::failure):(HealthUI::state::success));//DLINK healthui->setState(5,getBit(health,10)?(getBit(health,4)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//CCM - healthui->setState(6,(dlink->mavlinknode->isCommunicationLost)?(HealthUI::state::failure):(HealthUI::state::success));//DLINK + + healthui->setState(6,getBit(health,8)?(getBit(health,2)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//ECU // 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(8,getBit(health,5)?(getBit(health,11)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//FL - - - - + //healthui->setState(7,getBit(health,29)?(getBit(health,28)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//空速管加热 + healthui->setState(7,getBit(health,5)?(getBit(health,11)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//FuelLevel + //8,9,10位为空 toolsui->servosystem->setCheckState(6,getBit(health,22)?(HealthUI::state::failure):(HealthUI::state::success)); toolsui->servosystem->setCheckState(7,getBit(health,23)?(HealthUI::state::failure):(HealthUI::state::success)); @@ -1672,89 +1629,100 @@ void MainWindow::updateUI()//事件驱动式更新数据 healthui->setState(15,getBit(health,15)?(getBit(servoHealt,2)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//RU - //19~24 - - if(((vehicle.turbinstate.SysState & 0x000F) == 0x04) || - ((vehicle.turbinstate.SysState & 0x000F) == 0x00)) - { - healthui->setState(21,HealthUI::state::failure);//停车 - } - else - { - healthui->setState(21,HealthUI::state::inital);//停车 - } - - //healthui->setState(21,((vehicle.turbinstate.SysState & 0x000F) == 0x04)?(HealthUI::state::failure):(HealthUI::state::inital));//停车 - healthui->setState(22,getBit(health,18)?(HealthUI::state::failure):(HealthUI::state::inital));//开伞 - healthui->setState(23,getBit(health,19)?(HealthUI::state::failure):(HealthUI::state::inital));//开气囊 - healthui->setState(24,getBit(health,20)?(HealthUI::state::failure):(HealthUI::state::inital));//充气 - healthui->setState(25,getBit(health,21)?(HealthUI::state::failure):(HealthUI::state::inital));//抛伞 - - //healthui->setState(26,((vehicle.turbinstate.SysState & 0x000F) >= 0x0d)?(HealthUI::state::success):(HealthUI::state::inital));//开加力 - + //21~25 if((vehicle.turbinstate.SysState & 0x000F) >= 0x0d) { uint8_t sta = vehicle.turbinstate.SysState & 0x000F; switch (sta) { case 0x0d: - healthui->setValueState(26,tr("开加力")); + healthui->setValueState(21,tr("开加力")); break; case 0x0e: - healthui->setValueState(26,tr("半加力")); + healthui->setValueState(21,tr("半加力")); break; case 0x0f: - healthui->setValueState(26,tr("全加力")); + healthui->setValueState(21,tr("全加力")); break; default: - healthui->setValueState(26,tr("关加力")); + healthui->setValueState(21,tr("关加力")); break; } - healthui->setState(26,HealthUI::state::success);//开加力 + healthui->setState(21,HealthUI::state::success);//开加力 } else { - healthui->setState(26,HealthUI::state::inital);//开加力 - healthui->setValueState(26,tr("关加力")); + healthui->setState(21,HealthUI::state::inital);//开加力 + healthui->setValueState(21,tr("关加力")); } + //空速管加热在上面 + + if(getBit(enable,6))//从0开始，获取第6位 { - healthui->setState(27,HealthUI::state::failure);//伞舱 - healthui->setValueState(27,tr("伞舱开")); + healthui->setState(23,HealthUI::state::failure);//伞舱 + healthui->setValueState(23,tr("伞舱门开")); } else { - healthui->setState(27,HealthUI::state::success);//伞舱 - healthui->setValueState(27,tr("伞舱关")); + healthui->setState(23,HealthUI::state::success);//伞舱 + healthui->setValueState(23,tr("伞舱门闭")); } - //healthui->setState(26,(((vehicle.servo_output_raw.servo6_raw - 1000)/10) > 110)?(HealthUI::state::success):(HealthUI::state::inital));//开加力 + healthui->setState(24,getBit(health,31)?(HealthUI::state::inital):(HealthUI::state::failure));//上行失效 + + healthui->setState(25,getBit(enable,7)?(HealthUI::state::success):(HealthUI::state::failure));//安控区 + healthui->setValueState(25,getBit(enable,7)?(tr("安控区内")):(tr("安控区外")));//安控区 + + + if(((vehicle.turbinstate.SysState & 0x000F) == 0x04) || + ((vehicle.turbinstate.SysState & 0x000F) == 0x00)) + { + healthui->setState(26,HealthUI::state::failure);//停车 + } + else + { + healthui->setState(26,HealthUI::state::inital);//不停车 + } + + healthui->setState(27,getBit(health,18)?(HealthUI::state::failure):(HealthUI::state::inital));//开伞舱 + healthui->setState(28,getBit(health,19)?(HealthUI::state::failure):(HealthUI::state::inital));//开气囊 + healthui->setState(29,getBit(health,20)?(HealthUI::state::failure):(HealthUI::state::inital));//充气 + healthui->setState(30,getBit(health,21)?(HealthUI::state::failure):(HealthUI::state::inital));//抛伞 + + + healthui->setState(31,getBit(health,30)?(HealthUI::state::success):(HealthUI::state::inital));//记录打开 + healthui->setState(32,getBit(enable,5)?(HealthUI::state::success):(HealthUI::state::inital));//内置写入 + + healthui->setState(33,getBit(health,12)?(HealthUI::state::warning):(HealthUI::state::success));//惯导选中 + healthui->setValueState(33,getBit(health,12)?(tr("连接INS")):(tr("连接SBG")));//sel + switch (vehicle.ins1.sys_status & 0x0F) { default: case 0: { - healthui->setState(9,HealthUI::state::success); - healthui->setValueState(9,tr("INS解算正常")); + healthui->setState(34,HealthUI::state::success); + healthui->setValueState(34,tr("INS解算正常")); }break; case 1: { - healthui->setState(9,HealthUI::state::failure); - healthui->setValueState(9,tr("INS星数不足")); + healthui->setState(34,HealthUI::state::failure); + healthui->setValueState(34,tr("INS星数不足")); }break; case 2: { - healthui->setState(9,HealthUI::state::failure); - healthui->setValueState(9,tr("INS内部错误")); + healthui->setState(34,HealthUI::state::failure); + healthui->setValueState(34,tr("INS内部错误")); }break; case 3: { - healthui->setState(9,HealthUI::state::failure); - healthui->setValueState(9,tr("INS速度超限")); + healthui->setState(34,HealthUI::state::failure); + healthui->setValueState(34,tr("INS速度超限")); }break; } @@ -1762,44 +1730,28 @@ void MainWindow::updateUI()//事件驱动式更新数据 default: case 0: { - healthui->setState(10,HealthUI::state::success); - healthui->setValueState(10,tr("SBG解算正常")); + healthui->setState(35,HealthUI::state::success); + healthui->setValueState(35,tr("SBG解算正常")); }break; case 1: { - healthui->setState(10,HealthUI::state::failure); - healthui->setValueState(10,tr("SBG星数不足")); + healthui->setState(35,HealthUI::state::failure); + healthui->setValueState(35,tr("SBG星数不足")); }break; case 2: { - healthui->setState(10,HealthUI::state::failure); - healthui->setValueState(10,tr("SBG内部错误")); + healthui->setState(35,HealthUI::state::failure); + healthui->setValueState(35,tr("SBG内部错误")); }break; case 3: { - healthui->setState(10,HealthUI::state::failure); - healthui->setValueState(10,tr("SBG速度超限")); + healthui->setState(35,HealthUI::state::failure); + healthui->setValueState(35,tr("SBG速度超限")); }break; } - healthui->setState(28,getBit(health,31)?(HealthUI::state::inital):(HealthUI::state::failure));//上行有效 - healthui->setState(29,getBit(health,30)?(HealthUI::state::success):(HealthUI::state::inital)); - //healthui->setValueState(29,getBit(health,30)?(tr("记录已打开")):(tr("")));//sel - - healthui->setState(30,getBit(health,12)?(HealthUI::state::warning):(HealthUI::state::success));//sel - healthui->setValueState(30,getBit(health,12)?(tr("连接内置惯导")):(tr("连接SBG")));//sel - - - //31-40 - healthui->setState(31,getBit(enable,4)?(getBit(enable,3)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//内置记录 - healthui->setState(32,getBit(enable,5)?(HealthUI::state::success):(HealthUI::state::failure));//内置写入 - healthui->setState(33,getBit(enable,1)?(getBit(enable,0)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//外置记录 - healthui->setState(34,getBit(enable,2)?(HealthUI::state::success):(HealthUI::state::failure));//外置写入 - - healthui->setState(35,getBit(enable,7)?(HealthUI::state::success):(HealthUI::state::failure));//sel - healthui->setValueState(35,getBit(enable,7)?(tr("安控区内")):(tr("安控区外")));//sel diff --git a/opmap/mapwidget/opmapwidget.cpp b/opmap/mapwidget/opmapwidget.cpp index 218f7da..f320ab4 100644 --- a/opmap/mapwidget/opmapwidget.cpp +++ b/opmap/mapwidget/opmapwidget.cpp @@ -2420,7 +2420,11 @@ void OPMapWidget::WPLoad(QString path)//带文件目录参数 else if(currentGroup >= 3) { - emit showMessage(tr("Load Mission File:Group %1,%2").arg(QString::number(currentGroup)).arg(path)); + int GrouNumber = currentGroup - 2; + if(GrouNumber > 0) + { + emit showMessage(tr("Load Mission File:Group %1,%2").arg(QString::number(GrouNumber)).arg(path)); + } //清除所有 //删除一个组 foreach(QGraphicsItem * i, map->childItems()) { @@ -2591,7 +2595,11 @@ void OPMapWidget::WPSave(QString path)//带文件目录参数 } else if(currentGroup >= 3) { - emit showMessage(tr("Save Mission File:Group %1,%2").arg(QString::number(currentGroup)).arg(path)); + int GrouNumber = currentGroup - 2; + if(GrouNumber > 0) + { + emit showMessage(tr("Save Mission File:Group %1,%2").arg(QString::number(GrouNumber)).arg(path)); + } QJsonArray items; @@ -2848,7 +2856,15 @@ void OPMapWidget::WPUpload(void) } - emit showMessage(tr("start upload mission %1,total %2").arg(currentGroup).arg(list.size())); + int GrouNumber = currentGroup - 2; + + if(GrouNumber > 0) + { + emit showMessage(tr("start upload mission %1,total %2").arg(GrouNumber).arg(list.size())); + } + + + //选择当前ID号