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

调整地图配置

Browse Source
This commit is contained in:
zhangxusong
2022-09-09 15:55:16 +08:00
parent ddcde70bd3
commit 7e6c5a9b42
10 changed files with 618 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/Setting/Index0/Global/GlobalSetting.cpp
+28 -1
View File
@@ -1,4 +1,4 @@
#include "GlobalSetting.h"
#include "GlobalSetting.h"
#include "ui_GlobalSetting.h"
GlobalSetting::GlobalSetting(QWidget *parent) :
@@ -511,6 +511,16 @@ void GlobalSetting::setVirtualMargin(void)
}
void GlobalSetting::setMapSource(QStringList const &sources)
{
while(ui->comboMapSource->count() )
{
ui->comboMapSource->removeItem(0);
}
ui->comboMapSource->addItems(sources);
}
void GlobalSetting::on_pushButton_readVirtualMargin_clicked()
{
getVirtualMargin();
@@ -545,3 +555,20 @@ void GlobalSetting::on_pushButton_InfoExport_clicked()
emit showMessage((state.toBool())?(tr("信息输出开启")):(tr("信息输出关闭")));
}
void GlobalSetting::on_comboMapSource_currentIndexChanged(int index)
{
Config *config = new Config();
QVariant value(index);
config->setMapType(value);
delete config;
emit setMapTypes(value);
}
void GlobalSetting::on_btnRectRange_clicked()
{
emit dumpToMap();
}
App/Setting/Index0/Global/GlobalSetting.h
+9 -1
View File
@@ -1,4 +1,4 @@
#ifndef GLOBALSETTING_H
#ifndef GLOBALSETTING_H
#define GLOBALSETTING_H
#include <QWidget>
@@ -33,6 +33,7 @@ public:
void getExportInfo(void);
void getVirtualMargin(void);
void setVirtualMargin(void);
void setMapSource(QStringList const &sources); //设置地图源
@@ -63,6 +64,10 @@ private slots:
void on_pushButton_InfoExport_clicked();
void on_comboMapSource_currentIndexChanged(int index);
void on_btnRectRange_clicked();
signals:
void showMessage(const QString &message,int TimeOut = 0);
@@ -88,6 +93,9 @@ signals:
void setExportInfo(QVariant value,QVariant id);
void setMapTypes(QVariant const &value);
void dumpToMap();
private:
Ui::GlobalSetting *ui;
};
App/Setting/Index0/Global/GlobalSetting.ui
+537 -120
View File
@@ -6,15 +6,95 @@
<rect>
<x>0</x>
<y>0</y>
<width>738</width>
<height>605</height>
<width>1056</width>
<height>1075</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="2" column="0">
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>系统设置</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>提示声</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>地面站ID号</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QPushButton" name="pushButton_TTS">
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBox_InfoExport"/>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_setGCSID">
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="pushButton_Beep">
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>心跳声</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
<string>输出经纬高信息</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QPushButton" name="pushButton_InfoExport">
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QComboBox" name="comboBox_InfoID"/>
</item>
<item row="2" column="1" colspan="2">
<widget class="QComboBox" name="comboBox_TTS"/>
</item>
<item row="1" column="1" colspan="2">
<widget class="QComboBox" name="comboBox_Beep"/>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="comboBox_ID"/>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>舵机偏差</string>
@@ -354,102 +434,22 @@
</layout>
</widget>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>系统设置</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>提示声</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>地面站ID号</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QPushButton" name="pushButton_TTS">
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBox_InfoExport"/>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_setGCSID">
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="pushButton_Beep">
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>心跳声</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
<string>输出经纬高信息</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QPushButton" name="pushButton_InfoExport">
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QComboBox" name="comboBox_InfoID"/>
</item>
<item row="2" column="1" colspan="2">
<widget class="QComboBox" name="comboBox_TTS"/>
</item>
<item row="1" column="1" colspan="2">
<widget class="QComboBox" name="comboBox_Beep"/>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="comboBox_ID"/>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>上传心跳</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_HeartBeat_State"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<item row="2" column="0">
<widget class="QPushButton" name="pushButton_getHeartBeat">
<property name="text">
<string>频率</string>
<string>读取</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBox_HeartBeat_Frq"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
@@ -457,12 +457,8 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="pushButton_getHeartBeat">
<property name="text">
<string>读取</string>
</property>
</widget>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_HeartBeat_State"/>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_setHeartBeat">
@@ -471,26 +467,17 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBox_HeartBeat_Frq"/>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>频率</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>302</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1" rowspan="4">
<item row="0" column="2" rowspan="3">
<layout class="QGridLayout" name="gridLayout_2">
<item row="4" column="0">
<widget class="QPushButton" name="pushButton_readVirtualMargin">
@@ -510,13 +497,6 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QTextEdit" name="textEdit_Warning">
<property name="styleSheet">
<string notr="true">background-color: rgb(255, 180, 170);</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="pushButton_saveVirtualMargin">
<property name="text">
@@ -538,6 +518,13 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QTextEdit" name="textEdit_Warning">
<property name="styleSheet">
<string notr="true">background-color: rgb(255, 180, 170);</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QTextEdit" name="textEdit_Drop2">
<property name="styleSheet">
@@ -547,6 +534,436 @@
</item>
</layout>
</item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1" rowspan="3">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>地图设置</string>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="3" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>地图级别</string>
</property>
<layout class="QGridLayout" name="gridLayout_7">
<item row="2" column="1">
<widget class="QCheckBox" name="checkBox_7">
<property name="text">
<string>6</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QCheckBox" name="checkBox_5">
<property name="text">
<string>4</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QCheckBox" name="checkBox_23">
<property name="text">
<string>22</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QCheckBox" name="checkBox_14">
<property name="text">
<string>13</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="checkBox_22">
<property name="text">
<string>21</string>
</property>
</widget>
</item>
<item row="5" column="3">
<widget class="QCheckBox" name="checkBox_24">
<property name="text">
<string>23</string>
</property>
</widget>
</item>
<item row="4" column="4">
<widget class="QCheckBox" name="checkBox_20">
<property name="text">
<string>19</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="checkBox_6">
<property name="text">
<string>5</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="checkBox_3">
<property name="text">
<string>2</string>
</property>
</widget>
</item>
<item row="5" column="4">
<widget class="QCheckBox" name="checkBox_25">
<property name="text">
<string>24</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="checkBox_21">
<property name="text">
<string>20</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QCheckBox" name="checkBox_9">
<property name="text">
<string>8</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QCheckBox" name="checkBox_18">
<property name="text">
<string>17</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="checkBox_16">
<property name="text">
<string>15</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QCheckBox" name="checkBox_19">
<property name="text">
<string>18</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QCheckBox" name="checkBox_8">
<property name="text">
<string>7</string>
</property>
</widget>
</item>
<item row="3" column="4">
<widget class="QCheckBox" name="checkBox_15">
<property name="text">
<string>14</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="checkBox_2">
<property name="text">
<string>1</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="checkBox_12">
<property name="text">
<string>11</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QCheckBox" name="checkBox_13">
<property name="text">
<string>12</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QCheckBox" name="checkBox_4">
<property name="text">
<string>3</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="checkBox_11">
<property name="text">
<string>10</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QCheckBox" name="checkBox_10">
<property name="text">
<string>9</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="checkBox_17">
<property name="text">
<string>16</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_6">
<property name="title">
<string>区域选择</string>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox">
<property name="suffix">
<string>°</string>
</property>
<property name="minimum">
<double>-100000.000000000000000</double>
</property>
<property name="maximum">
<double>100000.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
<string>起点经度：</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_20">
<property name="text">
<string>起点纬度：</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_27">
<property name="text">
<string>终点经度：</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QPushButton" name="btnRectRange">
<property name="text">
<string>鼠标框选范围</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_2">
<property name="suffix">
<string>°</string>
</property>
<property name="minimum">
<double>-100000.000000000000000</double>
</property>
<property name="maximum">
<double>100000.000000000000000</double>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
<string>终点经度：</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_3">
<property name="minimum">
<double>-100000.000000000000000</double>
</property>
<property name="maximum">
<double>100000.000000000000000</double>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_4">
<property name="minimum">
<double>-100000.000000000000000</double>
</property>
<property name="maximum">
<double>100000.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>开始缓存</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_7">
<property name="title">
<string>代理</string>
</property>
<layout class="QGridLayout" name="gridLayout_9">
<item row="2" column="0">
<widget class="QLabel" name="label_24">
<property name="text">
<string>端口：</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit_2">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>25</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>地址：</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_2">
<item>
<property name="text">
<string>不使用代理</string>
</property>
</item>
<item>
<property name="text">
<string>HTTP代理</string>
</property>
</item>
<item>
<property name="text">
<string>SOCKS代理</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_25">
<property name="text">
<string>用户名：</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>25</height>
</size>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="lineEdit_4">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>25</height>
</size>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_22">
<property name="text">
<string>类型：</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_26">
<property name="text">
<string>密 码：</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_3">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>25</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_21">
<property name="text">
<string>地图源：</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboMapSource">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
App/Setting/Index0/Index0.cpp
+9 -9
View File
@@ -1,4 +1,4 @@
#include "Index0.h"
#include "Index0.h"
#include "ui_Index0.h"
@@ -19,7 +19,7 @@ Index0::Index0(QWidget *parent) :
//link
link = new LinkUI(this);
//mapsetting
mapsetting = new MapSettingUI(this);
// mapsetting = new MapSettingUI(this);
globalsetting = new GlobalSetting(this);
@@ -39,7 +39,7 @@ void Index0::resizeEvent(QResizeEvent *event)
Q_UNUSED(event)
link->setGeometry(ui->frame->geometry());
mapsetting->setGeometry(ui->frame->geometry());
// mapsetting->setGeometry(ui->frame->geometry());
globalsetting->setGeometry(ui->frame->geometry());
update();
}
@@ -52,8 +52,8 @@ void Index0::onTabIndexChanged(const int &index)//界面选择管理
else link->hide();
//地图设置
if(index == 1) mapsetting->show();
else mapsetting->hide();
// if(index == 1) mapsetting->show();
// else mapsetting->hide();
//全局设置
if(index == 2) globalsetting->show();
@@ -70,10 +70,10 @@ void Index0::on_pushButton_Link_clicked()
emit IndexChanged(0);
}
void Index0::on_pushButton_Map_clicked()
{
emit IndexChanged(1);
}
//void Index0::on_pushButton_Map_clicked()
//{
// emit IndexChanged(1);
//}
void Index0::on_pushButton_Global_clicked()
{
App/Setting/Index0/Index0.h
+3 -3
View File
@@ -1,4 +1,4 @@
#ifndef INDEX0_H
#ifndef INDEX0_H
#define INDEX0_H
#include <QWidget>
@@ -26,7 +26,7 @@ public:
void resizeEvent(QResizeEvent *event);
LinkUI *link = nullptr;
MapSettingUI *mapsetting = nullptr;
// MapSettingUI *mapsetting = nullptr;
GlobalSetting *globalsetting = nullptr;
@@ -37,7 +37,7 @@ private slots:
void on_pushButton_Link_clicked();
void on_pushButton_Map_clicked();
// void on_pushButton_Map_clicked();
void on_pushButton_Global_clicked();
App/Setting/Index0/Index0.ui
+15 -34
View File
@@ -28,8 +28,21 @@
</property>
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButton_Map">
<widget class="QPushButton" name="pushButton_Global">
<property name="minimumSize">
<size>
<width>120</width>
@@ -43,23 +56,10 @@
</size>
</property>
<property name="text">
<string>Map</string>
<string>Global</string>
</property>
</widget>
</item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="pushButton_Link">
<property name="minimumSize">
@@ -79,25 +79,6 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="pushButton_Global">
<property name="minimumSize">
<size>
<width>120</width>
<height>80</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>80</height>
</size>
</property>
<property name="text">
<string>Global</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="2">
App/Setting/Index0/MapSettingUI/MapSettingUI.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "MapSettingUI.h"
#include "MapSettingUI.h"
#include "ui_MapSettingUI.h"
MapSettingUI::MapSettingUI(QWidget *parent) :
App/mainwindow.cpp
+10 -7
View File
@@ -1,4 +1,4 @@
#include "mainwindow.h"
#include "mainwindow.h"
#include "QPushButton"
#include "QAction"
@@ -403,14 +403,17 @@ MainWindow::MainWindow(QWidget *parent)
//setting ----- map
connect(setting->index0->mapsetting,SIGNAL(getMapTypes()),
map,SLOT(getMapTypes()));
// connect(setting->index0->mapsetting,SIGNAL(getMapTypes()),
// map,SLOT(getMapTypes()));
connect(map,SIGNAL(MapTypes(QStringList)),
setting->index0->mapsetting,SLOT(MapTypes(QStringList)));
// connect(map,SIGNAL(MapTypes(QStringList)),
// setting->index0->mapsetting,SLOT(MapTypes(QStringList)));
connect(setting->index0->mapsetting,SIGNAL(setMapTypes(QVariant)),
map,SLOT(setMapTypes(QVariant)));
// connect(setting->index0->mapsetting,SIGNAL(setMapTypes(QVariant)),
// map,SLOT(setMapTypes(QVariant)));
setting->index0->globalsetting->setMapSource(map->getMapTypes() );
connect(setting->index0->globalsetting, SIGNAL(setMapTypes(QVariant)),
map, SLOT(setMapTypes(QVariant)) );
connect(setting->index0->globalsetting,&GlobalSetting::setServo,
opmap/mapwidget/opmapwidget.cpp
+4 -3
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file opmapwidget.cpp
@@ -3753,9 +3753,10 @@ void OPMapWidget::vehicleChanged(float param1,float param2,float param3,float pa
void OPMapWidget::getMapTypes(void)
QStringList const OPMapWidget::getMapTypes(void)
{
emit MapTypes(Helper::MapTypes());
return Helper::MapTypes();
// emit MapTypes(Helper::MapTypes());
}
void OPMapWidget::setMapTypes(QVariant value)
opmap/mapwidget/opmapwidget.h
+2 -2
View File
@@ -1,4 +1,4 @@
/**
/**
******************************************************************************
*
* @file opmapwidget.h
@@ -707,7 +707,7 @@ public slots:
void getMapTypes(void);
QStringList const getMapTypes(void);
void setMapTypes(QVariant value);