From d0bb24c716e4f35b2167b7ed35f96e03828a2c4b Mon Sep 17 00:00:00 2001
From: Felix de las Pozas <felixdelaspozas@gmail.com>
Date: Wed, 23 Mar 2022 19:39:39 +0100
Subject: [PATCH] Updated acuterecorder lib. Bump to version 0.2.1.
---
.gitignore | 17 +++++++++++++++++
.gitsubprojects | 2 +-
CMakeLists.txt | 2 +-
neurotessmesh/MainWindow.cpp | 9 ++++++++-
4 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index bc3c764..28c3bf0 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 70e741d..7d295a8 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 05fb882..15cc02c 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 6abbe8b..068b800 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>"
--
GitLab