diff --git a/dll.cpp b/dll.cpp index 5af41ee..a361d53 100644 --- a/dll.cpp +++ b/dll.cpp @@ -37,11 +37,14 @@ extern "C"{ string pathSpatialCFG_taktil = "Projekte/OpenVibe_THN-p300-bci-main/p300-tactile/cfg/p300-spatial-filter.cfg"; string PATH_DEFAULT_taktil = "Projekte/OpenVibe_THN-p300-bci-main/p300-tactile/datasets"; + string PATH_FILES_ConfigFile = "Projekte/OpenVibe_THN-p300-bci-main/cfg/OV_TACTILE_PANDA.conf"; + //Befehle //------------------------------------------------------------------------------------------------------------------------------------- string command = "bash"; string nogui = "--no-gui"; string play = "--play"; + string config = "--config"; char* getCommandPS(){ @@ -56,7 +59,7 @@ extern "C"{ char* getCommandFreespellingTaktil() { string s = ""; - s = s.append(command).append(" ").append(PATH_OV).append(" ").append( play).append(" ").append(PATH_FILES_taktil).append(filefreeSpellingTaktil).append(" ").append(nogui); + s = s.append(command).append(" ").append(PATH_OV).append(" ").append(config).append(" ").append(PATH_FILES_ConfigFile).append(" ").append( play).append(" ").append(PATH_FILES_taktil).append(filefreeSpellingTaktil).append(" ").append(nogui); char char_array[s.length()+1]; strcpy(char_array, s.c_str()); char* s_convert = char_array; @@ -66,7 +69,7 @@ extern "C"{ char* getCommandFreespellingVisuell() { string s = ""; - s = s.append(command).append(" ").append(PATH_OV).append(" ").append( play).append(" ").append(PATH_FILES_Visual).append(filefreeSpellingVisuell).append(" ").append(nogui); + s = s.append(command).append(" ").append(PATH_OV).append(" ").append(config).append(" ").append(PATH_FILES_ConfigFile).append(" ").append( play).append(" ").append(PATH_FILES_Visual).append(filefreeSpellingVisuell).append(" ").append(nogui); char char_array[s.length()+1]; strcpy(char_array, s.c_str()); char* s_convert = char_array; @@ -76,7 +79,7 @@ extern "C"{ char* getCommandCopyspellingTaktil() { string s = ""; - s = s.append(command).append(" ").append(PATH_OV).append(" ").append( play).append(" ").append(PATH_FILES_taktil).append(fileCopySpellingTaktil).append(" ").append(nogui); + s = s.append(command).append(" ").append(PATH_OV).append(" ").append(config).append(" ").append(PATH_FILES_ConfigFile).append(" ").append( play).append(" ").append(PATH_FILES_taktil).append(fileCopySpellingTaktil).append(" ").append(nogui); char char_array[s.length()+1]; strcpy(char_array, s.c_str()); char* s_convert = char_array; @@ -86,7 +89,7 @@ extern "C"{ char* getCommandCopyspellingVisuell() { string s = ""; - s = s.append(command).append(" ").append(PATH_OV).append(" ").append( play).append(" ").append(PATH_FILES_Visual).append(fileCopySpellingVisuell).append(" ").append(nogui); + s = s.append(command).append(" ").append(PATH_OV).append(" ").append(config).append(" ").append(PATH_FILES_ConfigFile).append(" ").append( play).append(" ").append(PATH_FILES_Visual).append(fileCopySpellingVisuell).append(" ").append(nogui); char char_array[s.length()+1]; strcpy(char_array, s.c_str()); char* s_convert = char_array; @@ -96,7 +99,7 @@ extern "C"{ char* getCommandXDawn_taktil() { string s = ""; - s = s.append(command).append(" ").append(PATH_OV).append(" ").append( play).append(" ").append(PATH_FILES_taktil).append(fileXDawnTrainingTaktil).append(" ").append(nogui); + s = s.append(command).append(" ").append(PATH_OV).append(" ").append(config).append(" ").append(PATH_FILES_ConfigFile).append(" ").append( play).append(" ").append(PATH_FILES_taktil).append(fileXDawnTrainingTaktil).append(" ").append(nogui); char char_array[s.length()+1]; strcpy(char_array, s.c_str()); char* s_convert = char_array; @@ -106,7 +109,7 @@ extern "C"{ char* getCommandXDawn_visuell() { string s = ""; - s = s.append(command).append(" ").append(PATH_OV).append(" ").append( play).append(" ").append(PATH_FILES_Visual).append(fileXDawnTrainingVisuell).append(" ").append(nogui); + s = s.append(command).append(" ").append(PATH_OV).append(" ").append(config).append(" ").append(PATH_FILES_ConfigFile).append(" ").append( play).append(" ").append(PATH_FILES_Visual).append(fileXDawnTrainingVisuell).append(" ").append(nogui); char char_array[s.length()+1]; strcpy(char_array, s.c_str()); char* s_convert = char_array; @@ -116,7 +119,7 @@ extern "C"{ char* getCommandClassifier_visuell() { string s = ""; - s = s.append(command).append(" ").append(PATH_OV).append(" ").append( play).append(" ").append(PATH_FILES_Visual).append(fileClassifierTrainingVisuell).append(" ").append(nogui); + s = s.append(command).append(" ").append(PATH_OV).append(" ").append(config).append(" ").append(PATH_FILES_ConfigFile).append(" ").append( play).append(" ").append(PATH_FILES_Visual).append(fileClassifierTrainingVisuell).append(" ").append(nogui); char char_array[s.length()+1]; strcpy(char_array, s.c_str()); char* s_convert = char_array; @@ -126,7 +129,7 @@ extern "C"{ char* getCommandClassifier_taktil() { string s = ""; - s = s.append(command).append(" ").append(PATH_OV).append(" ").append( play).append(" ").append(PATH_FILES_taktil).append(fileClassifierTrainingTaktil).append(" ").append(nogui); + s = s.append(command).append(" ").append(PATH_OV).append(" ").append(config).append(" ").append(PATH_FILES_ConfigFile).append(" ").append( play).append(" ").append(PATH_FILES_taktil).append(fileClassifierTrainingTaktil).append(" ").append(nogui); char char_array[s.length()+1]; strcpy(char_array, s.c_str()); char* s_convert = char_array; diff --git a/dll.so b/dll.so old mode 100755 new mode 100644 index 89ecfa2..e85684e Binary files a/dll.so and b/dll.so differ diff --git a/start.sh b/start.sh old mode 100755 new mode 100644 index 58e2874..7b3d715 --- a/start.sh +++ b/start.sh @@ -1,7 +1,7 @@ #!/bin/bash -cd Desktop/BCIProjekt/ +cd Desktop/BCI/ > log.txt -./gui >> log.txt +./gui.sh >> log.txt