diff --git a/.gitsubprojects b/.gitsubprojects index 081049d2ac4d776724b992e46e77c334cc15e292..a1fd289f2a1190da44f107373acbea6f2a7dfc76 100644 --- a/.gitsubprojects +++ b/.gitsubprojects @@ -6,4 +6,4 @@ git_subproject(neurolots https://github.com/gmrvvis/neurolots.git f8ea6d1e) git_subproject(ReTo https://github.com/gmrvvis/ReTo.git 211c49a) git_subproject(acuterecorder https://github.com/vg-lab/AcuteRecorder.git 0b84c2b1) -#git_subproject( SimIL https://github.com/gmrvvis/SimIL.git 78f316c0) +#git_subproject(SimIL https://github.com/gmrvvis/SimIL.git 24fcc1e1) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f41f15656ca08e9132f2fe7376ba55f80465913..512f309c11536b32b3a8ea231e31ae518a265ae6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # cmake_minimum_required(VERSION 3.1 FATAL_ERROR) -project(NeuroTessMesh VERSION 0.4.3) +project(NeuroTessMesh VERSION 0.4.4) set(NeuroTessMesh_VERSION_ABI 1) # Disable in source building diff --git a/neurotessmesh/LoaderThread.cpp b/neurotessmesh/LoaderThread.cpp index b711616d46d1b5dba9769a77c6e0b9f22c5e2324..0c4d3a118a6c5e9bd9f6a166b3b48e58278dd243 100644 --- a/neurotessmesh/LoaderThread.cpp +++ b/neurotessmesh/LoaderThread.cpp @@ -22,16 +22,16 @@ #include "LoaderThread.h" -// deps +// NSOL #include <memory> #include <nsol/nsol.h> +// SimIL #ifdef NEUROTESSMESH_USE_SIMIL - #include <simil/simil.h> - #endif +// Eigen #include <Eigen/Geometry> #include <Eigen/Eigen> @@ -42,6 +42,9 @@ #include <QProgressBar> #include <QIcon> +// C++ +#include <memory> + using namespace neurotessmesh; LoaderThread::LoaderThread( const std::string& arg1 , const std::string& arg2 ,