diff --git a/CMakeLists.txt b/CMakeLists.txt index 13b46bd..6a9ff91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,6 @@ if(ENABLE_TEST) COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/gdal_data ${PROJECT_BINARY_DIR}/src/gdal_data COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/gdal_data ${PROJECT_BINARY_DIR}/test/gdal_data COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/data ${PROJECT_BINARY_DIR}/test/data) - else() add_custom_target(CopyResources ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/proj_data ${PROJECT_BINARY_DIR}/src/proj_data diff --git a/README.md b/README.md index b6937a3..d8a2065 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,7 @@ 3. 本人本身是对Qt比较熟悉的,就萌生了这个想法,用C++和Qt,从新梳理整个框架,刚好今年春节一个人,秉着学习想法,使用纯C++(加了Qt)重写了该工程,新的工程基于C++ 17标准重写,使用了Qt5.15,主要作者本身写C++大部分时候都是基于Qt,对Qt也稍微了解,同时也借助Qt很好的跨平台特性,性能没有变化,并且也便于调试学习。 1. 整个工程开源,但是鉴于Qt一些限制,该程序采用LGPL协议。 2. 后续会与作者同步保持更新,后期希望可以加入自己一些特色功能。 - -[Download Windows Pre-build](https://github.com/scially/Cesium3DTilesConverter/releases/download/V1.0/Cesium3DTilesConverter.zip) - + # 简介 3DTiles 转换工具集, 快速将OSGB、Shp、GDB等格式转为Cesium 3DTiles, 方便搭建三维平台。 @@ -34,7 +32,7 @@ Converter.exe --format --input --output [OPTIONS] ```sh # from osgb dataset -Converter.exe --format osgb -input E:\osgb_path --output E:\out_path --yUpAxis true +Converter.exe --format osgb -input --output --yUpAxis true # from single shp file Converter.exe --format gdal --input --output --field height --layer diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 92b2ab2..c2b42a0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -63,7 +63,10 @@ target_link_libraries(Core Qt5::Core Qt5::Xml) - -add_executable(Converter "main.cpp") +add_executable(Converter main.cpp) target_link_libraries(Converter Core) +add_custom_command(TARGET Converter POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ $ + COMMAND ${CMAKE_COMMAND} -E copy $ $) + diff --git a/src/OSGBConvertJob.cpp b/src/OSGBConvertJob.cpp index 9be1735..456b03f 100644 --- a/src/OSGBConvertJob.cpp +++ b/src/OSGBConvertJob.cpp @@ -10,11 +10,14 @@ namespace scially { void OSGBConvertJob::run() { // 解析XML中的坐标 ModelMetadata metadata; - metadata.parse(input + "/metadata.xml"); - double lon, lat; - metadata.getCoordinate(lon, lat); - + try{ + metadata.parse(input + "/metadata.xml"); + metadata.getCoordinate(lon, lat); + }catch (const TilesConvertException& e){ + qCritical() << e.what(); + return; + } // 遍历Data QDir dataDir(input + "/Data"); diff --git a/src/main.cpp b/src/main.cpp index 0a76cca..71d1e47 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -77,7 +77,6 @@ int main(int argc, char** argv){ scially::ShpConvertJob shpConvert(input, layerName, output, fieldName); shpConvert.run(); - } else{ qCritical() << "Only support OSGB and GDAL format";