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

b

Browse Source
This commit is contained in:
hm
2021-05-13 09:17:59 +08:00
parent 35098e2a5c
commit b38e0abc8b
12 changed files with 166 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/CommandBox/CommandBox.cpp
+14 -4
View File
@@ -205,10 +205,20 @@ void CommandBox::commandAccepted(bool flag,uint16_t command,uint8_t result)
if(string.size() > 0) if(string.size() > 0)
{ {
QTextToSpeech *tts = new QTextToSpeech(); QVariant flag;
tts->say(string); Config *cfg = new Config();
tts->deleteLater();
emit showMessage(string); cfg->getTTS(&flag);
if(flag.toBool())
{
QTextToSpeech *tts = new QTextToSpeech();
tts->say(string);
tts->deleteLater();
}
emit showMessage(string);
} }
} }
App/CommandBox/CommandBox.h
+1 -1
View File
@@ -16,7 +16,7 @@
#include "CommandEditor.h" #include "CommandEditor.h"
#include "QtTextToSpeech/QtTextToSpeech" #include "QtTextToSpeech/QtTextToSpeech"
#include "mavlink.h" #include "mavlink.h"
#include "Config/Config.h"
#include "ToolsUI/ToolsWidget.h" #include "ToolsUI/ToolsWidget.h"
namespace Ui { namespace Ui {
App/CommandUI/CommandUI.cpp
+12 -3
View File
@@ -656,9 +656,18 @@ void CommandUI::commandAccepted(bool flag,uint16_t command,uint8_t result)
{ {
if(string.size() > 0) if(string.size() > 0)
{ {
QTextToSpeech *tts = new QTextToSpeech(); QVariant flag;
tts->say(string); Config *cfg = new Config();
tts->deleteLater();
cfg->getTTS(&flag);
if(flag.toBool())
{
QTextToSpeech *tts = new QTextToSpeech();
tts->say(string);
tts->deleteLater();
}
emit showMessage(string); emit showMessage(string);
} }
App/Config/Config.cpp
+16
View File
@@ -257,3 +257,19 @@ void Config::setBeep(QVariant value)
setJsonObject("Warnning",obj); setJsonObject("Warnning",obj);
} }
void Config::getTTS(QVariant *value)
{
QJsonObject obj = getJsonObject("Sound");
*value = obj.value("tts").toBool();
}
void Config::setTTS(QVariant value)
{
QJsonObject obj;
obj["tts"] = value.toBool();
setJsonObject("Sound",obj);
}
App/Config/Config.h
+3
View File
@@ -65,6 +65,9 @@ public slots:
void getBeep(QVariant *value); void getBeep(QVariant *value);
void setBeep(QVariant value); void setBeep(QVariant value);
void getTTS(QVariant *value);
void setTTS(QVariant value);
private slots: private slots:
void loadJson(const QString& jsonFilename); void loadJson(const QString& jsonFilename);
App/Setting/Index0/Global/GlobalSetting.cpp
+26 -1
View File
@@ -17,6 +17,9 @@ GlobalSetting::GlobalSetting(QWidget *parent) :
ui->comboBox_Beep->addItem(tr("开"),true); ui->comboBox_Beep->addItem(tr("开"),true);
ui->comboBox_Beep->addItem(tr("关"),false); ui->comboBox_Beep->addItem(tr("关"),false);
ui->comboBox_TTS->addItem(tr("开"),true);
ui->comboBox_TTS->addItem(tr("关"),false);
Config *cfg = new Config(); Config *cfg = new Config();
@@ -29,6 +32,9 @@ GlobalSetting::GlobalSetting(QWidget *parent) :
ui->comboBox_Beep->setCurrentIndex(ui->comboBox_Beep->findData(beep.toBool())); ui->comboBox_Beep->setCurrentIndex(ui->comboBox_Beep->findData(beep.toBool()));
QVariant tts;
cfg->getTTS(&tts);
ui->comboBox_TTS->setCurrentIndex(ui->comboBox_TTS->findData(beep.toBool()));
emit setGCSID(id.toInt());//设置全局ID emit setGCSID(id.toInt());//设置全局ID
@@ -222,5 +228,24 @@ void GlobalSetting::on_pushButton_Beep_clicked()
delete cfg; delete cfg;
emit showMessage((state.toBool())?(tr("声音开启")):(tr("声音关闭"))); emit showMessage((state.toBool())?(tr("心跳声音开启")):(tr("心跳声音关闭")));
}
void GlobalSetting::on_pushButton_TTS_clicked()
{
QVariant state;
state = ui->comboBox_TTS->currentData();
emit setTTS(state.toBool());
Config *cfg = new Config();
cfg->setTTS(state);
cfg->deleteLater();
delete cfg;
emit showMessage((state.toBool())?(tr("语音提示开启")):(tr("语音提示关闭")));
} }
App/Setting/Index0/Global/GlobalSetting.h
+4
View File
@@ -36,6 +36,8 @@ private slots:
void on_pushButton_Beep_clicked(); void on_pushButton_Beep_clicked();
void on_pushButton_TTS_clicked();
signals: signals:
void showMessage(const QString &message,int TimeOut = 0); void showMessage(const QString &message,int TimeOut = 0);
@@ -50,6 +52,8 @@ signals:
void setBeep(QVariant beep); void setBeep(QVariant beep);
void setTTS(QVariant flag);
private: private:
Ui::GlobalSetting *ui; Ui::GlobalSetting *ui;
}; };
App/Setting/Index0/Global/GlobalSetting.ui
+47 -11
View File
@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>533</width> <width>738</width>
<height>454</height> <height>472</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -139,10 +139,10 @@
<string>ID设置</string> <string>ID设置</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>设置地面站ID号</string> <string>心跳声</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -156,6 +156,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBox_Beep"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>地面站ID号</string>
</property>
</widget>
</item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QPushButton" name="pushButton_Beep"> <widget class="QPushButton" name="pushButton_Beep">
<property name="text"> <property name="text">
@@ -163,13 +173,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="2">
<widget class="QComboBox" name="comboBox_Beep"/> <widget class="QPushButton" name="pushButton_TTS">
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>心跳声开关</string> <string>Set</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBox_TTS"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>提示声</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -219,8 +236,27 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QQuickWidget" name="quickWidget">
<property name="resizeMode">
<enum>QQuickWidget::SizeRootObjectToView</enum>
</property>
<property name="source">
<url>
<string>qrc:/App/qml/base.qml</string>
</url>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>QQuickWidget</class>
<extends>QWidget</extends>
<header location="global">QtQuickWidgets/QQuickWidget</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>
App/Setting/Index1/ParameterInspector/ParameterInspector.cpp
+1
View File
@@ -274,6 +274,7 @@ void ParameterInspector::clearview(void)
for (vehicle_ite=vehicles.begin(); vehicle_ite!=vehicles.end();++vehicle_ite) for (vehicle_ite=vehicles.begin(); vehicle_ite!=vehicles.end();++vehicle_ite)
{ {
vehicle_ite.value().clear(); vehicle_ite.value().clear();
//delete vehicle_ite.value(); //delete vehicle_ite.value();
//vehicle_ite.value() = NULL; //vehicle_ite.value() = NULL;
App/Setting/Index1/ParameterInspector/ParameterInspector.ui.autosave
-264
View File
@@ -1,264 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ParameterInspector</class>
<widget class="QWidget" name="ParameterInspector">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>768</width>
<height>580</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1" rowspan="2">
<layout class="QGridLayout" name="gridLayout">
<item row="4" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="maximumSize">
<size>
<width>180</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="CancelpushButton">
<property name="minimumSize">
<size>
<width>120</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QPushButton" name="pushButton_id">
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QPushButton" name="pushButton_value">
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="pushButton_Save">
<property name="minimumSize">
<size>
<width>120</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="WriteButton">
<property name="minimumSize">
<size>
<width>120</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>75</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>write</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="pushButton_Load">
<property name="minimumSize">
<size>
<width>120</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Load</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLineEdit" name="lineEdit">
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QSplitter" name="splitter_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="layoutWidget">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_system">
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="clearButton">
<property name="minimumSize">
<size>
<width>120</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Clear</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ReadButton">
<property name="minimumSize">
<size>
<width>120</width>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>read</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="1" column="0">
<widget class="QTreeWidget" name="treeWidget">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="columnCount">
<number>1</number>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>50</number>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>200</number>
</attribute>
<attribute name="headerHighlightSections">
<bool>false</bool>
</attribute>
<attribute name="headerShowSortIndicator" stdset="0">
<bool>false</bool>
</attribute>
<attribute name="headerStretchLastSection">
<bool>true</bool>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>0</number>
</property>
<property name="textDirection">
<enum>QProgressBar::BottomToTop</enum>
</property>
<property name="format">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
App/mainwindow.cpp
+39 -5
View File
@@ -541,12 +541,16 @@ MainWindow::MainWindow(QWidget *parent)
connect(setting->index0->globalsetting,&GlobalSetting::setBeep, connect(setting->index0->globalsetting,&GlobalSetting::setBeep,
this,&MainWindow::setBeep,Qt::DirectConnection); this,&MainWindow::setBeep,Qt::DirectConnection);
connect(setting->index0->globalsetting,&GlobalSetting::setTTS,
this,&MainWindow::setTTS,Qt::DirectConnection);
//设置地面站ID //设置地面站ID
setting->index0->globalsetting->getGCSID(); setting->index0->globalsetting->getGCSID();
setting->index0->globalsetting->getServo(); setting->index0->globalsetting->getServo();
setting->index0->globalsetting->getHeartBeat(); setting->index0->globalsetting->getHeartBeat();
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@@ -583,10 +587,15 @@ MainWindow::~MainWindow()
void MainWindow::setBeep(QVariant state) void MainWindow::setBeep(QVariant state)
{ {
isEnableBeep = state.toBool(); isEnableBeep = state.toBool();
qDebug() << state;
} }
void MainWindow::setTTS(QVariant state)
{
isEnableTTS = state.toBool();
qDebug() << isEnableTTS;
}
void MainWindow::closeEvent(QCloseEvent *event) void MainWindow::closeEvent(QCloseEvent *event)
{ {
@@ -949,7 +958,14 @@ void MainWindow::setCommunicationLostState(bool flag)
if(last != flag) if(last != flag)
{ {
showMessage(tr("Communication Lost"),3000); showMessage(tr("Communication Lost"),3000);
tts->say(tr("Communication Lost"));
if(isEnableTTS)
{
if(tts)
{
tts->say(tr("Communication Lost"));
}
}
} }
healthui->setFailure(); healthui->setFailure();
@@ -960,7 +976,13 @@ void MainWindow::setCommunicationLostState(bool flag)
if(last != flag) if(last != flag)
{ {
showMessage(tr("Communication Regain"),3000); showMessage(tr("Communication Regain"),3000);
tts->say(tr("Communication Regain")); if(isEnableTTS)
{
if(tts)
{
tts->say(tr("Communication Regain"));
}
}
} }
} }
@@ -1306,13 +1328,25 @@ void MainWindow::updateUI()//事件驱动式更新数据
//这里会一直生成一个，导致无法释放 //这里会一直生成一个，导致无法释放
if(isStateChanged == true) if(isStateChanged == true)
{ {
tts->say(arm_str); if(isEnableTTS)
{
if(tts)
{
tts->say(arm_str);
}
}
} }
if(isCustomChanged == true) if(isCustomChanged == true)
{ {
mode_str.append(tr("flight mode")); mode_str.append(tr("flight mode"));
tts->say(mode_str); if(isEnableTTS)
{
if(tts)
{
tts->say(mode_str);
}
}
} }
//经纬度大于正常值，将舍弃 //经纬度大于正常值，将舍弃
App/mainwindow.h
+3
View File
@@ -77,6 +77,8 @@ public slots:
void setBeep(QVariant state); void setBeep(QVariant state);
void beep(int sysid); void beep(int sysid);
void setTTS(QVariant state);
void setServoOffset(QVariant la,QVariant ra, void setServoOffset(QVariant la,QVariant ra,
QVariant le,QVariant re, QVariant le,QVariant re,
@@ -157,6 +159,7 @@ protected:
bool isEngineStartUp = false; bool isEngineStartUp = false;
bool isEnableBeep = true; bool isEnableBeep = true;
bool isEnableTTS = true;
float m_la = 0; float m_la = 0;
float m_ra = 0; float m_ra = 0;