diff --git a/.gitignore b/.gitignore index bc3c7649664756b2ade9f77884e233df210c51e0..28c3bf0dbdb0fb025f6aaaeaf2428651691653b5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,22 @@ doc/latex .ciscript ci.* jambs* +acuterecorder* +Brion* +FiReS* +HighFive* +Keyv* +Lexis* +Lunchbox* +MVDTool* +ReTo* +Servus* +ZeroBuf* +ZeroEQ* +gmrvlex* +httpxx* +neurolots* +nsol* +vmmlib* nlrender/Shaders.h diff --git a/.gitsubprojects b/.gitsubprojects index 70e741d5bdcc37179b1ef17f7631eec2c3818512..7d295a83c6ccdd283faa1ddaad991a3546763cfd 100644 --- a/.gitsubprojects +++ b/.gitsubprojects @@ -4,4 +4,4 @@ # git_subproject(Lexis https://github.com/HBPVis/Lexis.git 617eedb) # git_subproject(gmrvlex git@gitlab.gmrv.es:nsviz/gmrvlex.git c20b194) git_subproject(neurolots https://github.com/gmrvvis/neurolots.git 2a1cfeb9) -git_subproject( acuterecorder https://github.com/vg-lab/AcuteRecorder.git 3fe7d5ba) +git_subproject( acuterecorder https://github.com/vg-lab/AcuteRecorder.git 81a16150) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05fb8820fff43bac5ab9afaed00e20afd5f28023..15cc02cc7010183db08edce8845aa3997071d8dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # cmake_minimum_required(VERSION 3.1 FATAL_ERROR) -project(neurotessmesh VERSION 0.2.0) +project(neurotessmesh VERSION 0.2.1) set(neurotessmesh_VERSION_ABI 1) # Disable in source building diff --git a/neurotessmesh/MainWindow.cpp b/neurotessmesh/MainWindow.cpp index 6abbe8b60ffdf21592af8fa3e3309934f1aa37e1..068b80045149696263943224c2a5c531505df0f9 100644 --- a/neurotessmesh/MainWindow.cpp +++ b/neurotessmesh/MainWindow.cpp @@ -312,8 +312,15 @@ void MainWindow::showAbout( void ) tr( ")" ) + tr ( "</li> " ) + #endif + tr( "<li>AcuteRecorder " ) + + tr( acuterecorder::Version::getString().c_str( )) + + tr( " (" ) + + tr( std::to_string( acuterecorder::Version::getRevision( )).c_str( )) + + tr( ")" ) + + tr ( "</li> " ) + + tr ( "</ul>" ) + - tr( "<br>GMRV - Universidad Rey Juan Carlos<br>" + tr( "<br>VG-Lab - Universidad Rey Juan Carlos<br>" "<a href=www.vg-lab.es>www.vg-lab.es</a><br>" "<a href='mailto:dev@vg-lab.es'>dev@vg-lab.es</a><br><br>" "<br>(C) 2015-2022. Universidad Rey Juan Carlos<br><br>"