Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
colorEagleStdio
qplanetosm
提交
071051f7
qplanetosm
项目概览
colorEagleStdio
/
qplanetosm
通知
118
Star
10
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
qplanetosm
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
071051f7
编写于
4月 28, 2022
作者:
D
dev@dev.com
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Qt6 Need extra pre-compile commands to fit differences .
上级
5b22f549
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
29 addition
and
2 deletion
+29
-2
qtviewer_planetosm/main.cpp
qtviewer_planetosm/main.cpp
+7
-0
qtviewer_planetosm/osmtiles/tilesviewer.cpp
qtviewer_planetosm/osmtiles/tilesviewer.cpp
+4
-0
qtviewer_planetosm/osmtiles/urlDownloader.cpp
qtviewer_planetosm/osmtiles/urlDownloader.cpp
+4
-0
qtvplugin_geomarker/qtvplugin_geomarker.cpp
qtvplugin_geomarker/qtvplugin_geomarker.cpp
+13
-1
qtvplugin_geomarker/qtvplugin_geomarker_uimethods.cpp
qtvplugin_geomarker/qtvplugin_geomarker_uimethods.cpp
+1
-1
未找到文件。
qtviewer_planetosm/main.cpp
浏览文件 @
071051f7
...
...
@@ -20,9 +20,16 @@ int main(int argc, char *argv[])
QTranslator
qtTranslator
;
#if QT_VERSION>=0x060000
if
(
qtTranslator
.
load
(
"qt_"
+
QLocale
::
system
().
name
(),
QLibraryInfo
::
path
(
QLibraryInfo
::
TranslationsPath
)))
app
.
installTranslator
(
&
qtTranslator
);
#else
if
(
qtTranslator
.
load
(
"qt_"
+
QLocale
::
system
().
name
(),
QLibraryInfo
::
location
(
QLibraryInfo
::
TranslationsPath
)))
app
.
installTranslator
(
&
qtTranslator
);
#endif
QTranslator
appTranslator
;
QString
strTransLocalFile
=
...
...
qtviewer_planetosm/osmtiles/tilesviewer.cpp
浏览文件 @
071051f7
...
...
@@ -467,7 +467,11 @@ namespace QTVOSM{
if
(
needUpdate
)
this
->
update
();
double
lat
,
lon
;
#if QT_VERSION>=0x060000
CV_DP2LLA
(
event
->
position
().
x
(),
event
->
position
().
y
(),
&
lat
,
&
lon
);
#else
CV_DP2LLA
(
event
->
x
(),
event
->
y
(),
&
lat
,
&
lon
);
#endif
//! 1. source=MAIN_MAP, destin = ALL, msg = MOUSE_MOVE
if
(
this
->
isEnabled
())
...
...
qtviewer_planetosm/osmtiles/urlDownloader.cpp
浏览文件 @
071051f7
...
...
@@ -32,7 +32,11 @@ namespace QTVOSM{
{
const
tag_download_tasks
&
tk
=
m_map_pendingTasks
[
rply
];
QVariant
vaurl
=
rply
->
attribute
(
QNetworkRequest
::
RedirectionTargetAttribute
);
#if QT_VERSION>=0x060000
if
(
vaurl
.
typeId
()
==
QMetaType
::
QUrl
)
#else
if
(
vaurl
.
type
()
==
QVariant
::
Url
)
#endif
{
QUrl
urlRd
=
vaurl
.
toUrl
();
if
(
urlRd
.
isRelative
())
...
...
qtvplugin_geomarker/qtvplugin_geomarker.cpp
浏览文件 @
071051f7
...
...
@@ -542,7 +542,11 @@ bool qtvplugin_geomarker::cb_mouseDoubleClickEvent(QMouseEvent * e)
while
(
wx
>
winsz
-
1
)
wx
-=
winsz
;
QPointF
mouse_scene_pt
(
wx
,
wy
);
#if QT_VERSION>=0x060000
QPoint
mouse_screen_pt
=
e
->
globalPosition
().
toPoint
();
#else
QPoint
mouse_screen_pt
=
e
->
globalPos
();
#endif
Qt
::
MouseButton
mouse_button
=
e
->
button
();
QWidget
*
pwig
=
dynamic_cast
<
QWidget
*>
(
m_pVi
);
if
(
m_bVisible
&&
pwig
&&
too_many_items
()
==
false
)
...
...
@@ -590,7 +594,11 @@ bool qtvplugin_geomarker::cb_mousePressEvent(QMouseEvent * e)
while
(
wx
>
winsz
-
1
)
wx
-=
winsz
;
QPointF
mouse_scene_pt
(
wx
,
wy
);
#if QT_VERSION>=0x060000
QPoint
mouse_screen_pt
=
e
->
globalPosition
().
toPoint
();
#else
QPoint
mouse_screen_pt
=
e
->
globalPos
();
#endif
Qt
::
MouseButton
mouse_button
=
e
->
button
();
QWidget
*
pwig
=
dynamic_cast
<
QWidget
*>
(
m_pVi
);
if
(
m_bVisible
&&
pwig
&&
too_many_items
()
==
false
)
...
...
@@ -646,7 +654,11 @@ bool qtvplugin_geomarker::cb_mouseMoveEvent ( QMouseEvent * e )
while
(
wx
<
0
)
wx
+=
winsz
;
while
(
wx
>
winsz
-
1
)
wx
-=
winsz
;
QPointF
mouse_scene_pt
(
wx
,
wy
);
#if QT_VERSION>=0x060000
QPoint
mouse_screen_pt
=
e
->
globalPosition
().
toPoint
();
#else
QPoint
mouse_screen_pt
=
e
->
globalPos
();
#endif
Qt
::
MouseButton
mouse_button
=
e
->
button
();
QWidget
*
pwig
=
dynamic_cast
<
QWidget
*>
(
m_pVi
);
if
(
m_bVisible
&&
pwig
&&
too_many_items
()
==
false
)
...
...
@@ -750,7 +762,7 @@ bool qtvplugin_geomarker::cb_mouseReleaseEvent ( QMouseEvent * e )
*/
QColor
qtvplugin_geomarker
::
string2color
(
const
QString
&
s
)
{
#if QT_VERSION >= 0x05
15
00
#if QT_VERSION >= 0x05
0F
00
QStringList
lst
=
s
.
split
(
","
,
Qt
::
SkipEmptyParts
);
#else
QStringList
lst
=
s
.
split
(
","
,
QString
::
SkipEmptyParts
);
...
...
qtvplugin_geomarker/qtvplugin_geomarker_uimethods.cpp
浏览文件 @
071051f7
...
...
@@ -480,7 +480,7 @@ void qtvplugin_geomarker::on_pushButton_QTV_update_clicked()
strPlainTexts
.
remove
(
'\r'
);
strPlainTexts
.
remove
(
'\015'
);
strPlainTexts
.
remove
(
'\012'
);
#if QT_VERSION >= 0x05
15
00
#if QT_VERSION >= 0x05
0F
00
QStringList
lst
=
strPlainTexts
.
split
(
QRegularExpression
(
"[,;]"
),
Qt
::
SkipEmptyParts
);
#else
QStringList
lst
=
strPlainTexts
.
split
(
QRegularExpression
(
"[,;]"
),
QString
::
SkipEmptyParts
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录