diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp index 4e25efb715d9bc1fc32ef976ead01bc66d200a3e..f94d410c84a172d216eeeaa48706454756c9f411 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp +++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp @@ -283,15 +283,15 @@ bool XmlGmlInterface::write() pointTag.setAttribute("id", QString::number(i)); pointTag.setAttribute( "x", - QString::number((*(*points)[i])[0], 'g', + QString::number((*(*points)[i])[0], 'f', std::numeric_limits<double>::digits10)); pointTag.setAttribute( "y", - QString::number((*(*points)[i])[1], 'g', + QString::number((*(*points)[i])[1], 'f', std::numeric_limits<double>::digits10)); pointTag.setAttribute( "z", - QString::number((*(*points)[i])[2], 'g', + QString::number((*(*points)[i])[2], 'f', std::numeric_limits<double>::digits10)); std::string const& point_name(pnt_vec->getItemNameByID(i)); diff --git a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp index 54b13ac800f3ca2b2e6fdb57fe72b2b8c37ef76c..933c4d095cc291d6a6d12f73b6a882d8437cc8f1 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp +++ b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp @@ -242,9 +242,12 @@ bool XmlStnInterface::write() QString stationType = (isBorehole) ? "borehole" : "station"; QDomElement stationTag = doc.createElement(stationType); stationTag.setAttribute( "id", QString::number(i) ); - stationTag.setAttribute( "x", QString::number((*(*stations)[i])[0], 'f') ); - stationTag.setAttribute( "y", QString::number((*(*stations)[i])[1], 'f') ); - stationTag.setAttribute( "z", QString::number((*(*stations)[i])[2], 'f') ); + stationTag.setAttribute( "x", QString::number((*(*stations)[i])[0], 'f', + std::numeric_limits<double>::digits10)); + stationTag.setAttribute( "y", QString::number((*(*stations)[i])[1], 'f', + std::numeric_limits<double>::digits10)); + stationTag.setAttribute( "z", QString::number((*(*stations)[i])[2], 'f', + std::numeric_limits<double>::digits10)); stationsTag.appendChild(stationTag); QDomElement stationNameTag = doc.createElement("name"); diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index ef08a8478204e27cee18a9f769a87de92fb871aa..cef9377cbf9b41a9b603f8ed61f96dbf3a7c51cd 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -102,6 +102,10 @@ set(CONAN_IMPORTS "") if(APPLE) set(CONAN_IMPORTS ${CONAN_IMPORTS} "lib, *.dylib* -> ./bin") endif() +if(MSVC) + set(CONAN_IMPORTS ${CONAN_IMPORTS} "bin, *.dll* -> ./bin") + set(CONAN_IMPORTS ${CONAN_IMPORTS} "plugins/platforms, *.dll* -> ./bin/platforms") +endif() conan_cmake_run( BASIC_SETUP