From 5a3ad8d638c9884f1aca63e3c55cebc05dac90d8 Mon Sep 17 00:00:00 2001 From: goldenhawking Date: Fri, 22 May 2015 22:01:59 +0800 Subject: [PATCH] turn gb2312 2 utf8 --- qtviewer_planetosm/main.cpp | 2 +- qtviewer_planetosm/osm_frame_widget.cpp | 12 ++++----- qtviewer_planetosm/osm_frame_widget.h | 2 +- .../osmtiles/cProjectionMercator.cpp | 2 +- .../osmtiles/cProjectionMercator.h | 2 +- qtviewer_planetosm/osmtiles/layer_browser.cpp | 2 +- qtviewer_planetosm/osmtiles/layer_browser.h | 2 +- qtviewer_planetosm/osmtiles/layer_interface.h | 2 +- qtviewer_planetosm/osmtiles/layer_tiles.cpp | 2 +- qtviewer_planetosm/osmtiles/layer_tiles.h | 2 +- .../osmtiles/layer_tiles_page.cpp | 2 +- .../osmtiles/layer_tiles_page.h | 2 +- qtviewer_planetosm/osmtiles/tilesviewer.cpp | 26 +++++++++---------- qtviewer_planetosm/osmtiles/tilesviewer.h | 2 +- qtviewer_planetosm/osmtiles/urlDownloader.cpp | 2 +- qtviewer_planetosm/osmtiles/urlDownloader.h | 2 +- .../osmtiles/viewer_interface.h | 2 +- qtvplugin_grid/qtvplugin_grid.cpp | 8 +++--- qtvplugin_grid/qtvplugin_grid.h | 2 +- 19 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qtviewer_planetosm/main.cpp b/qtviewer_planetosm/main.cpp index da4184f..76f1e36 100644 --- a/qtviewer_planetosm/main.cpp +++ b/qtviewer_planetosm/main.cpp @@ -1,4 +1,4 @@ -#include "osm_frame_widget.h" +#include "osm_frame_widget.h" #include int main(int argc, char *argv[]) diff --git a/qtviewer_planetosm/osm_frame_widget.cpp b/qtviewer_planetosm/osm_frame_widget.cpp index 6f1dd80..a887852 100644 --- a/qtviewer_planetosm/osm_frame_widget.cpp +++ b/qtviewer_planetosm/osm_frame_widget.cpp @@ -1,4 +1,4 @@ -#include "osm_frame_widget.h" +#include "osm_frame_widget.h" #include "ui_osm_frame_widget.h" #include #include @@ -88,15 +88,15 @@ void osm_frame_widget::EnumPlugins() QStringList filters; filters << "*.dll"; pluginsDir.setNameFilters(filters); - //ļ + //查找文件 foreach (QString fileName, pluginsDir.entryList(QDir::Files)) { QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName)); - QObject *plugin = pluginLoader.instance();//ԵPlugin + QObject *plugin = pluginLoader.instance();//尝试调入Plugin if (plugin) { - layer_interface * pPlugin= qobject_cast(plugin);//̬ת - if (pPlugin)//ӿ + layer_interface * pPlugin= qobject_cast(plugin);//动态类型转换 + if (pPlugin)//具有这个接口 { - //ͼ + //加入图层 AppendLayer(pPlugin); } } diff --git a/qtviewer_planetosm/osm_frame_widget.h b/qtviewer_planetosm/osm_frame_widget.h index 89db3d8..0330e9c 100644 --- a/qtviewer_planetosm/osm_frame_widget.h +++ b/qtviewer_planetosm/osm_frame_widget.h @@ -1,4 +1,4 @@ -#ifndef OSM_FRAME_WIDGET_H +#ifndef OSM_FRAME_WIDGET_H #define OSM_FRAME_WIDGET_H #include diff --git a/qtviewer_planetosm/osmtiles/cProjectionMercator.cpp b/qtviewer_planetosm/osmtiles/cProjectionMercator.cpp index 218e08a..11a40ce 100644 --- a/qtviewer_planetosm/osmtiles/cProjectionMercator.cpp +++ b/qtviewer_planetosm/osmtiles/cProjectionMercator.cpp @@ -1,3 +1,3 @@ -#include "cProjectionMercator.h" +#include "cProjectionMercator.h" const double cProjectionMercator::R=6378137; const double cProjectionMercator::pi=3.1415926535897932384626433832795; \ No newline at end of file diff --git a/qtviewer_planetosm/osmtiles/cProjectionMercator.h b/qtviewer_planetosm/osmtiles/cProjectionMercator.h index 66e4c78..a5a5624 100644 --- a/qtviewer_planetosm/osmtiles/cProjectionMercator.h +++ b/qtviewer_planetosm/osmtiles/cProjectionMercator.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include class cProjectionMercator diff --git a/qtviewer_planetosm/osmtiles/layer_browser.cpp b/qtviewer_planetosm/osmtiles/layer_browser.cpp index bcb84ea..e02bfda 100644 --- a/qtviewer_planetosm/osmtiles/layer_browser.cpp +++ b/qtviewer_planetosm/osmtiles/layer_browser.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/qtviewer_planetosm/osmtiles/layer_browser.h b/qtviewer_planetosm/osmtiles/layer_browser.h index d3d810a..6bd2b6e 100644 --- a/qtviewer_planetosm/osmtiles/layer_browser.h +++ b/qtviewer_planetosm/osmtiles/layer_browser.h @@ -1,4 +1,4 @@ -#ifndef LAYER_BROSWER_H +#ifndef LAYER_BROSWER_H #define LAYER_BROSWER_H #include diff --git a/qtviewer_planetosm/osmtiles/layer_interface.h b/qtviewer_planetosm/osmtiles/layer_interface.h index 459740c..62acc40 100644 --- a/qtviewer_planetosm/osmtiles/layer_interface.h +++ b/qtviewer_planetosm/osmtiles/layer_interface.h @@ -1,4 +1,4 @@ -#ifndef LAYER_BASE_H +#ifndef LAYER_BASE_H #define LAYER_BASE_H #include #include diff --git a/qtviewer_planetosm/osmtiles/layer_tiles.cpp b/qtviewer_planetosm/osmtiles/layer_tiles.cpp index 7038c0d..8c38029 100644 --- a/qtviewer_planetosm/osmtiles/layer_tiles.cpp +++ b/qtviewer_planetosm/osmtiles/layer_tiles.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/qtviewer_planetosm/osmtiles/layer_tiles.h b/qtviewer_planetosm/osmtiles/layer_tiles.h index 8306373..70b01d6 100644 --- a/qtviewer_planetosm/osmtiles/layer_tiles.h +++ b/qtviewer_planetosm/osmtiles/layer_tiles.h @@ -1,4 +1,4 @@ -#ifndef LAYER_TILES_H +#ifndef LAYER_TILES_H #define LAYER_TILES_H #include diff --git a/qtviewer_planetosm/osmtiles/layer_tiles_page.cpp b/qtviewer_planetosm/osmtiles/layer_tiles_page.cpp index 5b07b2a..fa4dca5 100644 --- a/qtviewer_planetosm/osmtiles/layer_tiles_page.cpp +++ b/qtviewer_planetosm/osmtiles/layer_tiles_page.cpp @@ -1,4 +1,4 @@ -#include "layer_tiles_page.h" +#include "layer_tiles_page.h" #include "ui_layer_tiles_page.h" #include "layer_tiles.h" #include diff --git a/qtviewer_planetosm/osmtiles/layer_tiles_page.h b/qtviewer_planetosm/osmtiles/layer_tiles_page.h index a4191e8..895492e 100644 --- a/qtviewer_planetosm/osmtiles/layer_tiles_page.h +++ b/qtviewer_planetosm/osmtiles/layer_tiles_page.h @@ -1,4 +1,4 @@ -#ifndef LAYER_TILES_PAGE_H +#ifndef LAYER_TILES_PAGE_H #define LAYER_TILES_PAGE_H #include diff --git a/qtviewer_planetosm/osmtiles/tilesviewer.cpp b/qtviewer_planetosm/osmtiles/tilesviewer.cpp index 4cb15bd..959c501 100644 --- a/qtviewer_planetosm/osmtiles/tilesviewer.cpp +++ b/qtviewer_planetosm/osmtiles/tilesviewer.cpp @@ -1,4 +1,4 @@ -#include +#include #include "tilesviewer.h" #include #include @@ -307,11 +307,11 @@ void tilesviewer::DragView(int nOffsetX,int nOffsetY) //set center LLA void tilesviewer::setCenterLLA(double lat, double lon) { - //īͶӰ + //到墨卡托投影 double dMx = cProjectionMercator(lat,lon).ToMercator().m_x; double dMy = cProjectionMercator(lat,lon).ToMercator().m_y; - //޷ͼƬڵİٷֱ + //计算巨幅图片内的百分比 double dCtX = dMx/(cProjectionMercator::pi*cProjectionMercator::R*2); double dCtY = -dMy/(cProjectionMercator::pi*cProjectionMercator::R*2); @@ -342,11 +342,11 @@ void tilesviewer::setCenterLLA(double lat, double lon) //set center LLA, not emit centerChanged void tilesviewer::setBrCenterLLA(double lat, double lon) { - //īͶӰ + //到墨卡托投影 double dMx = cProjectionMercator(lat,lon).ToMercator().m_x; double dMy = cProjectionMercator(lat,lon).ToMercator().m_y; - //޷ͼƬڵİٷֱ + //计算巨幅图片内的百分比 double dCtX = dMx/(cProjectionMercator::pi*cProjectionMercator::R*2); double dCtY = -dMy/(cProjectionMercator::pi*cProjectionMercator::R*2); @@ -378,26 +378,26 @@ bool tilesviewer::oTVP_LLA2DP(double lat,double lon,qint32 * pX,qint32 *pY) if (!pX||!pY) return false; - //īͶӰ + //到墨卡托投影 double dMx = cProjectionMercator(lat,lon).ToMercator().m_x; double dMy = cProjectionMercator(lat,lon).ToMercator().m_y; - //޷ͼƬڵİٷֱ + //计算巨幅图片内的百分比 double dperx = dMx/(cProjectionMercator::pi*cProjectionMercator::R*2); double dpery = -dMy/(cProjectionMercator::pi*cProjectionMercator::R*2); double dCurrImgSize = pow(2.0,m_nLevel)*256; - //Ҫתĵľ޷ͼ + //计算要转换的点的巨幅图像坐标 double dTarX = dperx * dCurrImgSize + dCurrImgSize/2; double dTarY = dpery * dCurrImgSize + dCurrImgSize/2; - //㵱ǰĵľ޷ͼ + //计算当前中心点的巨幅图像坐标 double dCurrX = dCurrImgSize*m_dCenterX+dCurrImgSize/2; double dCurrY = dCurrImgSize*m_dCenterY+dCurrImgSize/2; - //㵱ǰĵȫ + //计算当前中心的全局坐标 double nOffsetLT_x = (dCurrX-width()/2.0); double nOffsetLT_y = (dCurrY-height()/2.0); - //жǷӵ + //判断是否在视点内 *pX = dTarX - nOffsetLT_x+.5; *pY = dTarY - nOffsetLT_y+.5; @@ -411,8 +411,8 @@ bool tilesviewer::oTVP_DP2LLA(qint32 X,qint32 Y,double * plat,double * plon) { if (!plat||!plon) return false; - //ʾγ - //ǰͼ + //显示经纬度 + //当前缩放图幅的像素数 double dCurrImgSize = pow(2.0,m_nLevel)*256; int dx = X-(width()/2+.5); int dy = Y-(height()/2+.5); diff --git a/qtviewer_planetosm/osmtiles/tilesviewer.h b/qtviewer_planetosm/osmtiles/tilesviewer.h index fc3f914..fa1927e 100644 --- a/qtviewer_planetosm/osmtiles/tilesviewer.h +++ b/qtviewer_planetosm/osmtiles/tilesviewer.h @@ -1,4 +1,4 @@ -#ifndef TILESVIEWER_H +#ifndef TILESVIEWER_H #define TILESVIEWER_H #include diff --git a/qtviewer_planetosm/osmtiles/urlDownloader.cpp b/qtviewer_planetosm/osmtiles/urlDownloader.cpp index 2433c52..3d5c6b9 100644 --- a/qtviewer_planetosm/osmtiles/urlDownloader.cpp +++ b/qtviewer_planetosm/osmtiles/urlDownloader.cpp @@ -1,4 +1,4 @@ -#include "urlDownloader.h" +#include "urlDownloader.h" #include #include #include diff --git a/qtviewer_planetosm/osmtiles/urlDownloader.h b/qtviewer_planetosm/osmtiles/urlDownloader.h index ab1a2a8..69bcd47 100644 --- a/qtviewer_planetosm/osmtiles/urlDownloader.h +++ b/qtviewer_planetosm/osmtiles/urlDownloader.h @@ -1,4 +1,4 @@ -#ifndef URLDOWNLOADER_H +#ifndef URLDOWNLOADER_H #define URLDOWNLOADER_H #include #include diff --git a/qtviewer_planetosm/osmtiles/viewer_interface.h b/qtviewer_planetosm/osmtiles/viewer_interface.h index 52fdaf1..7e1e305 100644 --- a/qtviewer_planetosm/osmtiles/viewer_interface.h +++ b/qtviewer_planetosm/osmtiles/viewer_interface.h @@ -1,4 +1,4 @@ -#ifndef VIEWER_INTERFACE_H +#ifndef VIEWER_INTERFACE_H #define VIEWER_INTERFACE_H #define OSMViewInterface_iid "org.goldenhawkingStudio.OSMViewer_iid.ViewerInterface" class viewer_interface{ diff --git a/qtvplugin_grid/qtvplugin_grid.cpp b/qtvplugin_grid/qtvplugin_grid.cpp index 20f3ca5..31e3912 100644 --- a/qtvplugin_grid/qtvplugin_grid.cpp +++ b/qtvplugin_grid/qtvplugin_grid.cpp @@ -1,4 +1,4 @@ -#include "qtvplugin_grid.h" +#include "qtvplugin_grid.h" #include "ui_qtvplugin_grid.h" #include #include @@ -46,7 +46,7 @@ void qtvplugin_grid::cb_paintEvent( QPainter * pImage ) if (!m_pVi || m_bVisible==false) return ; QRect rect = m_pVi->windowRect(); - //ȷǰӵLLA + //首先确定当前视点的LLA double lat_top,lon_left; double lat_bottom,lon_right; m_pVi->oTVP_DP2LLA( @@ -92,7 +92,7 @@ void qtvplugin_grid::cb_paintEvent( QPainter * pImage ) if (false==m_pVi->oTVP_LLA2DP(lat_bottom,lon,&DP_right,&DP_bottom)) continue; pImage->drawLine(DP_left,DP_top,DP_right,DP_bottom); - //ػ + //回环 int nLon = lon; while (nLon<-180) nLon+=360; @@ -129,7 +129,7 @@ void qtvplugin_grid::cb_paintEvent( QPainter * pImage ) if (false==m_pVi->oTVP_LLA2DP(lat_bottom,lon,&DP_right,&DP_bottom)) continue; pImage->drawLine(DP_left,DP_top,DP_right,DP_bottom); - //ػ + //回环 float dLon = lon; while (dLon<-180) dLon+=360; diff --git a/qtvplugin_grid/qtvplugin_grid.h b/qtvplugin_grid/qtvplugin_grid.h index 4f68f03..4c5afd6 100644 --- a/qtvplugin_grid/qtvplugin_grid.h +++ b/qtvplugin_grid/qtvplugin_grid.h @@ -1,4 +1,4 @@ -#ifndef QTVPLUGIN_GRID_H +#ifndef QTVPLUGIN_GRID_H #define QTVPLUGIN_GRID_H #include -- GitLab