diff --git a/qtviewer_planetosm/main.cpp b/qtviewer_planetosm/main.cpp index da4184f3397f9f8468a0f0cf92cab20949892c30..76f1e36f660680647eb89ef4e43ad879248da929 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 6f1dd800df236739703e1a5662bc26b0ba053126..a887852019889b892daf378cb7b2970106c4eea9 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 89db3d80caf4752ed40e42c14b8f0819ee59f774..0330e9c47f2cefe44769df85088636909b897226 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 218e08a2f9caed834e2ef71edf17107454fdd95f..11a40cec197660d475c2fb7b31e8f802e983c309 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 66e4c7884f85b209bdab3adcdee7e38d757007cc..a5a562458f4162928894012a07dc3c88ab4136e1 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 bcb84ea5d9f5c56ffffb7c14d3937bd0cde0a52a..e02bfda5f212041c801b28c38f6fc26143dd822a 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 d3d810a4744c84c48df0a60b47b7ed47142f0c69..6bd2b6eec3cb0da64e42ab230c040e6fb8a525b5 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 459740c52069236045e57fc8d82c1d1bfb2e8431..62acc40727ba99368c74fc9b9f36957d68113db4 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 7038c0da4bf18dba176fcef5b4e7846762127010..8c3802980be57216c85ef74279a771abde4bec36 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 830637353feab3382dda76a720c7aa0e935da154..70b01d6c10cad79f0fb59c84f1f4cad2d54dbb83 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 5b07b2a924a0138d9c9d962607f96d7c6011e0c5..fa4dca587b8d475834df138e4942d38c8aac1d26 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 a4191e8c856f806e69a8c5cd2a0170bb537a81a0..895492ebc1eb70524828515a4171d70edb50bdd5 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 4cb15bde65c673a51265fdaac2bb3a8c9ab543f0..959c50179d4b2a9cbf5967566e29953944b9bbc2 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 fc3f914f88702dfcff24231ca0f2e150a757c0bc..fa1927eac02dc4ec4e983942fc8638c65a286dd2 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 2433c521539e04bbf960cb0139f80ccf5a26f160..3d5c6b933896ad2dcba3a79cc822a04de4abe292 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 ab1a2a8d060e80657f878b9b55a7030aa77e3468..69bcd47ed7092afe7bd62ba99280bc080594a052 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 52fdaf1a77c1814fe6c2bd245bbaf9e035037077..7e1e305b6377d6148cc425348b0e0e80cbc0bdaf 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 20f3ca57bac2cea89bd5b8dfd1e33ba6970766d5..31e391242d8352b68f9fa39d18dc3b676a42d917 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 4f68f037d16549a55f7c04566bbbec21b4071748..4c5afd66cb66f4f3f09acb0e78ce039e136a10c9 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