Merge pull request #7 from labstreaminglayer/BIDS

BIDS formatting.

Author: cboulay

.appveyor.yml

@@ -8,13 +8,10 @@ environment:
   CMakeArgs: ""
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      VCVER: 14.1
       QTCOMPILER: msvc2017_64
       QTVER: 5.11
-      ARCH: x64
-      DEPLOYNAME: Win64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804
-      DEPLOYNAME: Linux64-bionic
+    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604
+      DEPLOYNAME: Linux64-xenial
 install:
 - cmd: appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip -FileName ninja.zip
 - cmd: appveyor DownloadFile %LSLDIST_URL%/%lslversion%/liblsl-%lslversion%-Win64.7z -FileName liblsl_x64.7z
@@ -27,7 +24,7 @@ install:
 - sh: dpkg -x lsl.deb LSL
 - sh: sudo apt update && sudo apt install -y qtbase5-dev
 build_script:
-- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio %VCVER%\VC\vcvarsall.bat" %ARCH%
+- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
 - mkdir build
 - cd build
 - cmd: cmake -G Ninja -DQt5_DIR=C:/Qt/%QTVER%/%QTCOMPILER%/lib/cmake/Qt5 -DBOOST_ROOT=C:/Libraries/boost_1_67_0 -DLSL_INSTALL_ROOT=LSL/ %CMakeArgs% ../

CMakeLists.txt

@@ -96,7 +96,7 @@ installLSLApp(${PROJECT_NAME})
 installLSLApp(LabRecorderCLI)
 installLSLApp(testxdfwriter)
 installLSLAuxFiles(${PROJECT_NAME}
-	default_config.cfg
+	${PROJECT_NAME}.cfg
 )
 
 LSLGenerateCPackConfig()

LabRecorder.cfg

@@ -0,0 +1,50 @@
+; === Storage Location ===
+; the default file name can be something like C:\\Recordings\\untitled.xdf, but can also contain
+; placeholders. Two placeholder formats are supported: Legacy and BIDS.
+;
+; Legacy may contain a running number (incremented per experiment session) called %n, and a 
+; placeholder for a "block" label %b (if the config script provides a list of block names that 
+; consitute a session.
+; The syntax is as in: StorageLocation = "C:\\Recordings\\subject%n\\block_%b.xdf"
+;
+; For BIDS, the path may contain %p for participant label, %s for session label,
+; %b for task label (same as block in Legacy), %a for name of acquisition parameter set, and %r index.
+; The BIDS syntax is: path/to/CurrentStudy/sub-%p/ses-%s/eeg/sub-%p_ses-%s_task-%b[_acq-%a]_run-%r_eeg.xdf
+;
+; If StorageLocation is not provided then the default is QStandardPaths::DocumentsLocation/CurrentStudy/exp%n/untitled.xdf
+
+;StorageLocation=C:/Recordings/CurrentStudy/exp%n/untitled.xdf
+
+; === Study Root ===
+; You can optionally provide only the study root folder and it will be used to build a file name automatically.
+; The default filename builder is Legacy (see above).
+; StudyRoot=C:/Recordings/CurrentStudy
+
+; === Block Names ===
+; This is optionally a list of blocks that make up a recording session. The blocks are displayed in 
+; a list box where the experiment can select a block before pressing record. If used, the blocks 
+; may serve as a reminder of where they are in the experiment, but more practically, can be 
+; used to determine the file name of the recording. Power users can define scriptable actions 
+; associated with selecting a block or pressing Start/Stop for a given block (e.g., for remote 
+; control).
+; The syntax is as in: SessionBlocks = "Training","PreBaseline","MainSection","PostBaseline"
+
+SessionBlocks="T1", "T2", "T3"
+
+; === Required Streams ===
+; This is optionally a list of streams that are required for the recording; 
+; a warning is issued if one of the streams is not present when the record button is pressed
+; The syntax is as in: RequiredStreams = "BioSemi (MyHostname)","PhaseSpace (MyHostname)","Eyelink (AnotherHostname)"
+; where the format is identical to what the LabRecorder displays in the "Record from streams" list.
+
+;RequiredStreams="RequiredExample (PC)"
+
+; === Online Sync ===
+; A list of sync settings. Each setting follows the following format: "SrcStreamName (SrcHostName) post_FLAG"
+; where post_FLAG is described here: https://github.com/sccn/liblsl/blob/master/src/common.h#L77-L89
+; Note that it is not necessary to set any flags for correct storage because all of the post-processing synchronization
+; can be achieved during file import using either the Matlab or Python importers.
+; Examples:
+;     OnlineSync="ActiChamp-0 (DM-Laptop) post_ALL", "LiveAmpSN-054211-0237 (User-PC) post_ALL"
+;     OnlineSync=["ActiChamp-0 (User-PC)" post_ALL]
+OnlineSync="SendDataC (Testpc) post_ALL", "Test (Testpc) post_clocksync"

LabRecorder_BIDS.cfg

@@ -0,0 +1,2 @@
+; BIDS config, files are saved in the specified StudyRoot
+StudyRoot=C:/Recordings/CurrentStudy

LabRecorder_Legacy.cfg

@@ -0,0 +1,3 @@
+; Legacy config, the StudyRoot and TemplatePath are extracted automatically
+; from the StorageLocation
+StorageLocation = "C:/Recordings/CurrentStudy/expi_%n/blockvar_%b.xdf"

default_config.cfg

@@ -4,14 +4,13 @@
 int main(int argc, char *argv[]) {
 
 	// determine the startup config file...
-	const char *config_file = "default_config.cfg";
+	const char *config_file = nullptr;
 	for (int k = 1; k < argc; k++)
 		if (std::string(argv[k]) == "-c" || std::string(argv[k]) == "--config")
 			config_file = argv[k + 1];
 
 	QApplication a(argc, argv);
 	MainWindow w(nullptr, config_file);
 	w.show();
-
 	return a.exec();
 }