发现了航点设置的bug
This commit is contained in:
@@ -147,8 +147,6 @@ win32|win64 {
|
||||
#编译HDMI版本,方便适配大屏显示
|
||||
DEFINES += BUILD_WITH_HDMI
|
||||
|
||||
|
||||
|
||||
TRANSLATIONS = GCS_zh_CN.ts
|
||||
|
||||
RESOURCES += \
|
||||
|
||||
@@ -244,7 +244,7 @@ void propertyui::rebuildUI(QString CMD)
|
||||
if(i->enumStrings().size() != 0)
|
||||
{
|
||||
param1_type = "QComboBox";
|
||||
ui->pushButton_Param1->setText(i->enumStrings().at(m_param1));
|
||||
ui->pushButton_Param1->setText(i->enumStrings().at((int)m_param1));//当前值大于index
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -261,7 +261,7 @@ void propertyui::rebuildUI(QString CMD)
|
||||
if(i->enumStrings().size() != 0)
|
||||
{
|
||||
param2_type = "QComboBox";
|
||||
ui->pushButton_Param2->setText(i->enumStrings().at(m_param2));
|
||||
ui->pushButton_Param2->setText(i->enumStrings().at((int)m_param2));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -278,7 +278,7 @@ void propertyui::rebuildUI(QString CMD)
|
||||
if(i->enumStrings().size() != 0)
|
||||
{
|
||||
param3_type = "QComboBox";
|
||||
ui->pushButton_Param3->setText(i->enumStrings().at(m_param3));
|
||||
ui->pushButton_Param3->setText(i->enumStrings().at((int)m_param3));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -295,7 +295,7 @@ void propertyui::rebuildUI(QString CMD)
|
||||
if(i->enumStrings().size() != 0)
|
||||
{
|
||||
param4_type = "QComboBox";
|
||||
ui->pushButton_Param4->setText(i->enumStrings().at(m_param4));
|
||||
ui->pushButton_Param4->setText(i->enumStrings().at((int)m_param4));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -312,7 +312,7 @@ void propertyui::rebuildUI(QString CMD)
|
||||
if(i->enumStrings().size() != 0)
|
||||
{
|
||||
param5_type = "QComboBox";
|
||||
ui->pushButton_Param5->setText(i->enumStrings().at(m_x));
|
||||
ui->pushButton_Param5->setText(i->enumStrings().at((int)m_x));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -329,7 +329,7 @@ void propertyui::rebuildUI(QString CMD)
|
||||
if(i->enumStrings().size() != 0)
|
||||
{
|
||||
param6_type = "QComboBox";
|
||||
ui->pushButton_Param6->setText(i->enumStrings().at(m_y));
|
||||
ui->pushButton_Param6->setText(i->enumStrings().at((int)m_y));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -346,7 +346,7 @@ void propertyui::rebuildUI(QString CMD)
|
||||
if(i->enumStrings().size() != 0)
|
||||
{
|
||||
param7_type = "QComboBox";
|
||||
ui->pushButton_Param7->setText(i->enumStrings().at(m_z));
|
||||
ui->pushButton_Param7->setText(i->enumStrings().at((int)m_z));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -365,8 +365,6 @@ void propertyui::WayPointPropertyUpdate(void)
|
||||
//设置高度
|
||||
m_z = ui->pushButton_Alt->text().toDouble();
|
||||
|
||||
|
||||
|
||||
for(QMap<int, MissionCmdParamInfo*>::const_iterator item = _paramInfoMap.begin();item != _paramInfoMap.end();item++)
|
||||
{
|
||||
MissionCmdParamInfo* i = item.value();
|
||||
@@ -459,7 +457,8 @@ void propertyui::WayPointPropertyUpdate(void)
|
||||
m_target_system,m_target_component,
|
||||
m_frame,m_current,m_autocontinue,m_mission_type);
|
||||
|
||||
qDebug() << m_param1
|
||||
qDebug() << "PropertyUpdate"
|
||||
<< m_param1
|
||||
<< m_param2
|
||||
<< m_param3
|
||||
<< m_param4
|
||||
@@ -518,7 +517,7 @@ void propertyui::setWayPointProperty(float param1,float param2,float param3,floa
|
||||
}
|
||||
}
|
||||
|
||||
qDebug() << "PROPERTY"
|
||||
qDebug() << " set PROPERTY"
|
||||
<< m_param1
|
||||
<< m_param2
|
||||
<< m_param3
|
||||
@@ -936,9 +935,9 @@ void propertyui::setFriendlyName(QVariant value)
|
||||
|
||||
//然后重置一下参数
|
||||
WayPointPropertyUpdate();
|
||||
|
||||
//更新界面
|
||||
rebuildUI(value.toString());
|
||||
|
||||
}
|
||||
|
||||
void propertyui::on_pushButton_friendlyName_clicked()
|
||||
|
||||
@@ -260,7 +260,6 @@ private slots:
|
||||
|
||||
void on_pushButton_Next_clicked();
|
||||
|
||||
|
||||
void WayPointPropertyUpdate(void);
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -144,9 +144,9 @@ int main(int argc, char *argv[])
|
||||
QApplication a(argc, argv);
|
||||
|
||||
|
||||
//a.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
|
||||
a.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
|
||||
|
||||
//QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF8"));
|
||||
QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF8"));
|
||||
|
||||
|
||||
LoadLang(&a);
|
||||
|
||||
Reference in New Issue
Block a user