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

changed map config

Browse Source
This commit is contained in:
hm
2022-09-07 09:52:12 +08:00
parent 0dd0866b39
commit d5dbdc2d7d
9 changed files with 101 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/Setting/Index1/ParameterInspector/ParameterInspector.cpp
+1 -1
View File
@@ -730,7 +730,7 @@ void ParameterInspector::on_pushButton_Load_clicked()
void ParameterInspector::ParamsEncode(QString fileName)
{
QString Vehicle_Id = 1;
QString Vehicle_Id = "1";
QByteArray ParamsString;
App/ToolsUI/ECU/ECU.cpp
+4 -4
View File
@@ -640,10 +640,10 @@ void ECU::setBat(quint16 value[10])
ui->label_BAT_CH1->setText(QString::number(value[0]*0.001,'f',1));
ui->label_BAT_CH2->setText(QString::number(value[1]*0.001,'f',1));
ui->label_BAT_CH3->setText(QString::number(value[2]*0.001,'f',1));
ui->label_BAT_CH4->setText(QString::number(value[3]*0.001,'f',1));
ui->label_BAT_CH5->setText(QString::number(value[4]*0.001,'f',1));
ui->label_BAT_CH6->setText(QString::number(value[5]*0.001,'f',1));
ui->label_BAT_CH7->setText(QString::number(value[6]*0.001,'f',1));
ui->label_BAT_CH4->setText(QString::number(value[3]*0.01,'f',1));
ui->label_BAT_CH5->setText(QString::number(value[4]*0.01,'f',1));
ui->label_BAT_CH6->setText(QString::number(value[5]*0.01,'f',1));
ui->label_BAT_CH7->setText(QString::number(value[6]*0.01,'f',1));
ui->label_BAT_CH8->setText(QString::number((value[7]*0.001 - 0.1981)/9.245,'f',1));//temp
ui->label_BAT_CH9->setText(QString::number((value[8]*0.001 - 0.27806)/0.00475,'f',1));//oil
ui->label_BAT_CH10->setText(QString::number(value[9]*0.001,'f',1));
App/main.cpp
+26 -1
View File
@@ -18,7 +18,7 @@
//include
#include "dlink.h"
#include "QProcess"
@@ -165,6 +165,25 @@ int main(int argc, char *argv[])
RegisterType();
QProcess *process = new QProcess();
QString str = QApplication::applicationDirPath();
str += "/geoserver/httpserver.exe";
//process->start(str);
/*if(process->startDetached(str))
{
qInfo() << "start up geo server success";
}
else
{
qInfo() << "start up geo server failure";
}
*/
qDebug() << str;
MainWindow w;//这一步已经全部初始化完成
w.setWindowTitle(QString("GCS Qt%1 %2").arg(QT_VERSION_STR).arg(APP_VERSION));//with version
@@ -177,6 +196,12 @@ int main(int argc, char *argv[])
w.show();
return a.exec();
if(process)
process->close();
delete process;
process = 0;
}
App/mainwindow.cpp
+28 -25
View File
@@ -152,6 +152,10 @@ double act_pwm2deg(double pwm, double mm_max, const double para[4])
/* x_hat_deg_out = (tmp1 + tmp2 + tmp3)/3; */
}
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
{
@@ -1339,37 +1343,36 @@ void MainWindow::update_servo_output_raw(int sysid,mavlink_servo_output_raw_t se
if(sysid == 1)
{
/*
ste_fix[4] = {54,0,0,0};
vtl_fix[4] = {-44.000,78.170,0,0};
vtr_fix[4] = {-44.000,79.602,0,0};
dal_fix[4] = {0.100,24.680,-2.838,-3.955};
dar_fix[4] = {0.000,24.689,-1.822,-3.083};
drl_fix[4] = {0.000,27.389,-0.997,-11.835};
drr_fix[4] = {0.000,25.704,-1.837,-5.163};
del_fix[4] = {0.200,34.585,-0.560,-5.357};
der_fix[4] = {0.600,34.457,-0.136,-5.332};
dspl_fix[4] = {-31.200,40.227,13.496,-7.114};
dspr_fix[4] = {-30.200,34.055,21.966,-10.409};
*/
ste_fix = new double[4]{1E-09,-9E-08,-0.0207,+5.1113};
vtl_fix = new double[4]{5E-10,-2E-06,+0.0178,+37.655};
vtr_fix = new double[4]{5E-10,-2E-06,+0.0178,+37.705};
dal_fix = new double[4]{-3E-09,-3E-06,-0.0343,+0.2415};
dar_fix = new double[4]{-2E-09,-2E-06,-0.0340,+0.0294};
drl_fix = new double[4]{-3E-09,-9E-07,-0.0334,-0.0413};
drr_fix = new double[4]{-3E-09,-1E-06,-0.0334,-0.0183};
del_fix = new double[4]{-1E-09,+2E-07,-0.0265,+0.2180};
der_fix = new double[4]{-1E-09,+2E-07,-0.0266,+0.1588};
dspl_fix = new double[4]{-5E-10,-2E-07,-0.0207,-39.091};
dspr_fix = new double[4]{-5E-10,-7E-08,-0.0207,-38.312};*/
}
else if(sysid == 2)
{
/*
ste_fix = new double[4]{1E-09,-9E-08,-0.0207,+5.1113};
vtl_fix = new double[4]{5E-10,-2E-06,+0.0178,+37.655};
vtr_fix = new double[4]{5E-10,-2E-06,+0.0178,+37.705};
ste_fix[4] = {54,0,0,0};
vtl_fix[4] = {-44.000,78.170,0,0};
vtr_fix[4] = {-44.000,79.602,0,0};
dal_fix[4] = {0.100,24.680,-2.838,-3.955};
dar_fix[4] = {0.000,24.689,-1.822,-3.083};
drl_fix[4] = {0.000,27.389,-0.997,-11.835};
drr_fix[4] = {0.000,25.704,-1.837,-5.163};
del_fix[4] = {0.200,34.585,-0.560,-5.357};
der_fix[4] = {0.600,34.457,-0.136,-5.332};
dspl_fix[4] = {-31.200,40.227,13.496,-7.114};
dspr_fix[4] = {-30.200,34.055,21.966,-10.409};
dal_fix = new double[4]{-3E-09,-3E-06,-0.0343,+0.2415};
dar_fix = new double[4]{-2E-09,-2E-06,-0.0340,+0.0294};
drl_fix = new double[4]{-3E-09,-9E-07,-0.0334,-0.0413};
drr_fix = new double[4]{-3E-09,-1E-06,-0.0334,-0.0183};
del_fix = new double[4]{-1E-09,+2E-07,-0.0265,+0.2180};
der_fix = new double[4]{-1E-09,+2E-07,-0.0266,+0.1588};
dspl_fix = new double[4]{-5E-10,-2E-07,-0.0207,-39.091};
dspr_fix = new double[4]{-5E-10,-7E-08,-0.0207,-38.312};
*/
}
else
opmap/core/opmaps.cpp
+14 -3
View File
@@ -117,7 +117,7 @@ QByteArray OPMaps::GetImageFrom(const MapType::Types &type, const Point &pos, co
qDebug() << "opmaps before make image url" << time.elapsed();
#endif
QString url = MakeImageUrl(type, pos, zoom, LanguageStr);
//qDebug() << "url" << url;
qDebug() << "url" << url << type << zoom;
#ifdef DEBUG_TIMINGS
qDebug() << "opmaps after make image url" << time.elapsed();
#endif // url "http://vec02.maps.yandex.ru/tiles?l=map&v=2.10.2&x=7&y=5&z=3" string
@@ -132,7 +132,8 @@ QByteArray OPMaps::GetImageFrom(const MapType::Types &type, const Point &pos, co
case MapType::GoogleTerrain:
case MapType::GoogleHybrid:
{
qheader.setRawHeader("Referrer", "http://maps.google.com/");
qheader.setRawHeader("Referrer", "https://www.google.com/maps/");
//qheader.setRawHeader("Referrer","https://www.google.com/maps?output=classic/");
}
break;
@@ -217,6 +218,10 @@ QByteArray OPMaps::GetImageFrom(const MapType::Types &type, const Point &pos, co
default:
break;
}
reply = network.get(qheader);
tT.start(Timeout);
q.exec();
@@ -232,6 +237,12 @@ QByteArray OPMaps::GetImageFrom(const MapType::Types &type, const Point &pos, co
errorvars.lock();
++diag.networkerrors;
errorvars.unlock();
#ifdef DEBUG_GMAPS
qDebug() << "Try get image withou abort or error:" << reply->errorString();
#endif // DEBUG_URLFACTORY
reply->deleteLater();
return ret;
}
@@ -247,7 +258,7 @@ QByteArray OPMaps::GetImageFrom(const MapType::Types &type, const Point &pos, co
return ret;
}
#ifdef DEBUG_GMAPS
qDebug() << "Received Tile from the Internet";
qDebug() << "Received Tile from the Internet" << " size:" << ret.size();
#endif // DEBUG_GMAPS
errorvars.lock();
++diag.tilesFromNet;
opmap/core/opmaps.h
+1 -1
View File
@@ -53,7 +53,7 @@ class OPMAPCORESHARED_EXPORT OPMaps : public MemoryCache, public AllLayersOfType
class OPMaps : public MemoryCache, public AllLayersOfType, public UrlFactory {
#endif
#define DEBUG_GMAPS 1
public: ~OPMaps();
opmap/core/providerstrings.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ ProviderStrings::ProviderStrings()
{
// Google version strings
VersionGoogleMap = "h@249000000";
VersionGoogleSatellite = "865";
VersionGoogleSatellite = "930";
VersionGoogleLabels = "h@221000000";
VersionGoogleTerrain = "t@132,r@249000000";
SecGoogleWord = "Galileo";
opmap/core/urlfactory.cpp
+25 -17
View File
@@ -26,7 +26,7 @@
*/
#include "urlfactory.h"
#include <QRegExp>
#define DEBUG_URLFACTORY
namespace core {
const double UrlFactory::EarthRadiusKm = 6378.137; // WGS-84
@@ -37,12 +37,15 @@ UrlFactory::UrlFactory()
/// timeout for map connections
/// </summary>
Proxy.setType(QNetworkProxy::NoProxy);
Proxy.setType(QNetworkProxy::HttpProxy);
//QNetworkProxy( QNetworkProxy::HttpProxy, host, port );
/// <summary>
/// Gets or sets the value of the User-agent HTTP header.
/// </summary>
UserAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.7) Gecko/20091221 Firefox/3.5.7";
//UserAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.7) Gecko/20091221 Firefox/3.5.7";
UserAgent = "Mozilla/5.0 (PC; U; Intel; Linux; en) AppleWebKit/420+ (KHTML, like Gecko)";
Timeout = 5 * 1000;
CorrectGoogleVersions = true;
@@ -51,7 +54,10 @@ UrlFactory::UrlFactory()
UsePlacemarkCache = true;
}
UrlFactory::~UrlFactory()
{}
{
}
QString UrlFactory::TileXYToQuadKey(const int &tileX, const int &tileY, const int &levelOfDetail) const
{
QString quadKey;
@@ -108,8 +114,8 @@ void UrlFactory::TryCorrectGoogleVersions()
#ifdef DEBUG_URLFACTORY
qDebug() << "Correct GoogleVersion";
#endif // DEBUG_URLFACTORY
// setIsCorrectGoogleVersions(true);
QString url = "https://maps.google.com/maps?output=classic";
//setIsCorrectGoogleVersions(true);
QString url = "https://www.google.com/maps/";
qheader.setUrl(QUrl(url));
qheader.setRawHeader("User-Agent", UserAgent);
@@ -186,7 +192,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
QString sec2 = ""; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2);
TryCorrectGoogleVersions();
return QString("http://%1%2.google.com/%3/lyrs=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleMap).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
return QString("https://%1%2.google.com/%3/lyrs=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleMap).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
}
break;
case MapType::GoogleSatellite:
@@ -197,8 +203,10 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
QString sec2 = ""; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2);
TryCorrectGoogleVersions();
return QString("http://%1%2.google.com/%3/v=%4?x=%5&y=%6&z=%7").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleSatellite).arg(pos.X()).arg(pos.Y()).arg(zoom);
//https://khms0.google.com/kh/v=865?x=15&y=5&z=4
//qDebug() << "VersionGoogleSatellite" << VersionGoogleSatellite;
//return QString("https://%1%2.google.com/%3/v=%4?x=%5&y=%6&z=%7").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleSatellite).arg(pos.X()).arg(pos.Y()).arg(zoom);
return QString("http://mt%1.google.com/vt/lyrs=s&hl=zh-CN&gl=CN&src=app&x=%2&y=%3&z=%4").arg(server).arg(GetServerNum(pos, 4)).arg(pos.X()).arg(pos.Y()).arg(zoom);;
//https://khms0.google.com/kh/v=865?x=15&y=5&z=4
}
break;
case MapType::GoogleLabels:
@@ -210,7 +218,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
GetSecGoogleWords(pos, sec1, sec2);
TryCorrectGoogleVersions();
return QString("http://%1%2.google.com/%3/lyrs=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabels).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
return QString("https://%1%2.google.com/%3/lyrs=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabels).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
}
break;
case MapType::GoogleTerrain:
@@ -221,7 +229,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
QString sec2 = ""; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2);
TryCorrectGoogleVersions();
return QString("http://%1%2.google.com/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleTerrain).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
return QString("https://%1%2.google.com/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleTerrain).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
}
break;
case MapType::GoogleMapChina:
@@ -234,7 +242,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
TryCorrectGoogleVersions();
// http://mt0.google.cn/vt/v=w2.101&hl=zh-CN&gl=cn&x=12&y=6&z=4&s=Ga
return QString("http://%1%2.google.cn/%3/lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleMapChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
return QString("https://%1%2.google.cn/%3/lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleMapChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
}
break;
case MapType::GoogleSatelliteChina:
@@ -247,7 +255,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
TryCorrectGoogleVersions();
// http://khm0.google.cn/kh/v=46&x=12&y=6&z=4&s=Ga
return QString("http://%1%2.google.cn/%3/lyrs=%4&gl=cn&x=%5%6&y=%7&z=%8&s=%9").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleSatelliteChina).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
return QString("https://%1%2.google.cn/%3/lyrs=%4&gl=cn&x=%5%6&y=%7&z=%8&s=%9").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleSatelliteChina).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
}
break;
case MapType::GoogleLabelsChina:
@@ -260,7 +268,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
TryCorrectGoogleVersions();
// http://mt0.google.cn/vt/v=w2t.110&hl=zh-CN&gl=cn&x=12&y=6&z=4&s=Ga
return QString("http://%1%2.google.cn/%3/imgtp=png32&lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabelsChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
return QString("https://%1%2.google.cn/%3/imgtp=png32&lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabelsChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
}
break;
case MapType::GoogleTerrainChina:
@@ -273,7 +281,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
TryCorrectGoogleVersions();
// http://mt0.google.cn/vt/v=w2p.110&hl=zh-CN&gl=cn&x=12&y=6&z=4&s=Ga
return QString("http://%1%2.google.com/%3/lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleTerrainChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
return QString("https://%1%2.google.com/%3/lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleTerrainChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
}
break;
case MapType::GoogleMapKorea:
@@ -525,11 +533,11 @@ QString UrlFactory::MakeGeocoderUrl(QString keywords)
{
QString key = keywords.replace(' ', '+');
return QString("http://maps.google.com/maps/geo?q=%1&output=csv&key=%2").arg(key).arg(GoogleMapsAPIKey);
return QString("https://maps.google.com/maps/geo?q=%1&output=csv&key=%2").arg(key).arg(GoogleMapsAPIKey);
}
QString UrlFactory::MakeReverseGeocoderUrl(internals::PointLatLng &pt, const QString &language)
{
return QString("http://maps.google.com/maps/geo?hl=%1&ll=%2,%3&output=csv&key=%4").arg(language).arg(QString::number(pt.Lat())).arg(QString::number(pt.Lng())).arg(GoogleMapsAPIKey);
return QString("https://maps.google.com/maps/geo?hl=%1&ll=%2,%3&output=csv&key=%4").arg(language).arg(QString::number(pt.Lat())).arg(QString::number(pt.Lng())).arg(GoogleMapsAPIKey);
}
internals::PointLatLng UrlFactory::GetLatLngFromGeodecoder(const QString &keywords, GeoCoderStatusCode::Types &status)
{
opmap/internals/core.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ void Core::run()
else if (tl == MapType::geoserver)
{
img = OPMaps::Instance()->GetImageFrom(tl, Point(task.Pos.X(), maxOfTiles.Height() - task.Pos.Y()), task.Zoom);
qDebug() << "Y:" <<maxOfTiles.Height() << task.Pos.Y();
//qDebug() << "Y:" <<maxOfTiles.Height() << task.Pos.Y();
}
else { // ok
#ifdef DEBUG_CORE