New graph adds

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 */node_modules/*
-*/localtest/*
+*/localtest/*
+*/logs/log_*

README.md

@@ -15,6 +15,26 @@ to get the development server running. That should pop up a webpage to:
 which will have the interface running.
 
 
+To *rebuild* the the package for production-ready
+-------------------------------------------------
+
+`npm run build`
+
+
+To run during session
+---------------------
+
+To run at `http://localhost:3000/` (note the different localhost port) for the gaming session, AFTER building, run:
+
+`npm run server`
+
+
+Logs
+----
+
+The server will always log to a new file every time it's run, named with the UNIX timestamp of when it started. They are under `../node/logs`.
+
+
 Notes
 =====
 

arduino/fsr_test/fsr_test.ino

@@ -7,7 +7,7 @@
   http://www.arduino.cc/en/Tutorial/AnalogReadSerial
 */
 // the setup routine runs once when you press reset:
-int dPIN[5] = {12,11,9,8,7};
+int dPIN[6] = {12,11,9,8,7,6};
 void setup() {
   // initialize serial communication at 9600 bits per second:
   Serial.begin(9600);
@@ -48,6 +48,10 @@ void loop() {
 //  }
 //  digitalWrite(dPIN[4],HIGH);
   int sensorValue4 = analogRead(A4);
+  delay(10);
+
+  int sensorValue5 = analogRead(A5);
+
   // print out the value you read:
   Serial.print(sensorValue0);
   Serial.print("\t\t");
@@ -57,6 +61,8 @@ void loop() {
   Serial.print("\t\t");
   Serial.print(sensorValue3);
   Serial.print("\t\t");
-  Serial.println(sensorValue4);
+  Serial.print(sensorValue4);
+  Serial.print("\t\t");
+  Serial.println(sensorValue5);
   delay(10);        // delay in between reads for stability
 }

matlab/align_interview.asv

@@ -0,0 +1,119 @@
+%interview_filename = 'interview-17.csv';
+
+%extract unique-timestamp interview data and timestamps
+%and compile concise array
+%name of interview file
+
+%trial_directory = get_trial_directory();
+%processed_directory = get_processed_directory();
+%processed_data = get_processed_data();
+
+trial_directory = get_trial_directory();
+processed_directory = get_processed_directory();
+processed_data = get_processed_data(processed_directory);
+
+% if (~exist('processed_directory'))
+%     waitfor(warndlg('Unknown processed data directory. Please select processed data directory.'));
+%     processed_directory = uigetdir(path,"Select directory to save processed data in.");
+% end
+% if ~exist('aligned_data')
+%         data_file = dir(fullfile(processed_directory,'processed_data.mat'));
+%     if ~isempty(data_file)
+%         data_name = data_file.name;
+%         data_path = data_file.folder;
+%     else
+%         waitfor(warndlg('Unable to automatically locate processed data file for this trial. Please find it manually. The file is usually called processed_data.mat and in the processed data directory. If the data from this trial has not been processed, please process data instead of running this script alone.'));
+%         [data_name, data_path] = uigetfile('*.mat','Find processed data .mat file');
+%         isdlg = 'No';
+%         while (data_name(1) == 0) && strcmp(questdlg('No processed data matlab file was opened. If the data from this trial has not been processed, please process data instead of running this script alone. Do you want to keep looking for this file yourself?',''),'Yes')
+%             [data_name, data_path] = uigetfile('*.mat','Find processed data .mat file');
+%         end
+%         if data_name(1) == 0
+%             waitfor(errordlg('Aborting data processing: no processed data file'));
+%             throw(MException('Custom:Custom','Failure: unable to find processed data file to add interview timestamps to'));
+%         end
+%     end
+% 
+%     if ~contains(data_name,pathsep)
+%         data_name = fullfile(data_path,data_name);
+%     end
+%     load (data_name);
+% end
+
+lavell = 
+
+dir(fullfile(trial_directory,'interview*.csv'));
+if ~isempty(interview_file)
+    interview_name = interview_file.name;
+    interview_path = interview_file.folder;
+else
+    waitfor(warndlg('Unable to automatically locate interview data for this trial. Please find it manually. The file is usually called intervew-[number].csv and in the main trial directory.'));
+    [interview_name, interview_path] = uigetfile('*.csv','Find inteview csv');
+    isdlg = 'No';
+    while (interview_name(1) == 0) && strcmp(questdlg('No interview csv was opened. Do you want to keep looking for this file yourself?',''),'Yes')
+       [interview_name, interview_path] = uigetfile('*.csv','Find interview csv');
+    end
+    if interview_name(1) == 0
+        waitfor(errordlg('Aborting data processing: no valid interview csv file'));
+        throw(MException('Custom:Custom','Failure: unable to find valid interview csv file'));
+    end
+end
+
+if ~contains(interview_name,pathsep)
+    interview_name = fullfile(interview_path,interview_name);
+end
+
+f = waitbar(0.5,'Importing interview data','Name','Data Processing');
+
+fid = fopen(interview_name, 'rt', 'n', 'UTF16LE');
+fread(fid, 2, '*uint8');   %adjust the 2 to fit the UTF encoding
+filecontent = fread(fid, [1 inf], '*char');
+datacell = textscan(filecontent, '%s%s%s%s%s%s', 'Delimiter', '	', 'HeaderLines', 1);
+a = size(datacell{1}); 
+num_markers = a(1);
+interview_comments = strings(num_markers);
+interview_ms_timestamps = zeros(num_markers,1);
+k = 1;
+l = 1;
+while k <= num_markers
+    if (~isempty(datacell{3}{k}) && ~(datacell{3}{k} == ""))
+        int_timestamp_strings = strsplit(datacell{3}{k}, ':');
+        mins = int_timestamp_strings(2);
+        secs = int_timestamp_strings(3);
+        frames = int_timestamp_strings(4);
+        int_timestamp = round((str2num(mins{1})*60*1000) + (str2num(secs{1})*1000) + (str2num(frames{1})*1000/30));
+        if ~(int_timestamp == 0)
+            interview_ms_timestamps(l) = int_timestamp;
+            interview_comments(l) = datacell{1}{l};
+            l = l+1;
+        end
+    end
+    k = k+1;
+end
+
+interview_ms_timestamps = interview_ms_timestamps(1:find(interview_ms_timestamps,1,'last'));
+interview_comments = interview_comments(1:length(interview_ms_timestamps));
+
+
+
+interview_ms_timestamps = round(interview_ms_timestamps - processed_data.scalars.sync_frame*1000 / processed_data.scalars.frame_rate);
+
+interview_table = table(interview_ms_timestamps, interview_comments.', 'VariableNames', {'timestamp_ms','label'});
+processed_data.interview = interview_table;
+% %align feeltrace data to master array
+% aligned_data(1).interview = [];
+% l = 1;
+% a = length(interview_ms_timestamps);
+% for k=1:length([aligned_data.timestamp_ms])
+%     if l > a
+%         break;
+%     end
+%     if interview_ms_timestamps(l) == aligned_data(k).timestamp_ms
+%         aligned_data(k).interview =interview_comments(l);
+%         l = l+1;
+%     else
+%         aligned_data(k).interview = [];
+%     end  
+% end
+
+save(fullfile(processed_directory, 'processed_data.mat'),'processed_data');

matlab/align_interview.m

@@ -0,0 +1,100 @@
+%interview_filename = 'interview-17.csv';
+
+%extract unique-timestamp interview data and timestamps
+%and compile concise array
+%name of interview file
+
+%trial_directory = get_trial_directory();
+%processed_directory = get_processed_directory();
+%processed_data = get_processed_data();
+
+load_globals;
+
+% if (~exist('processed_directory'))
+%     waitfor(warndlg('Unknown processed data directory. Please select processed data directory.'));
+%     processed_directory = uigetdir(path,"Select directory to save processed data in.");
+% end
+% if ~exist('aligned_data')
+%         data_file = dir(fullfile(processed_directory,'processed_data.mat'));
+%     if ~isempty(data_file)
+%         data_name = data_file.name;
+%         data_path = data_file.folder;
+%     else
+%         waitfor(warndlg('Unable to automatically locate processed data file for this trial. Please find it manually. The file is usually called processed_data.mat and in the processed data directory. If the data from this trial has not been processed, please process data instead of running this script alone.'));
+%         [data_name, data_path] = uigetfile('*.mat','Find processed data .mat file');
+%         isdlg = 'No';
+%         while (data_name(1) == 0) && strcmp(questdlg('No processed data matlab file was opened. If the data from this trial has not been processed, please process data instead of running this script alone. Do you want to keep looking for this file yourself?',''),'Yes')
+%             [data_name, data_path] = uigetfile('*.mat','Find processed data .mat file');
+%         end
+%         if data_name(1) == 0
+%             waitfor(errordlg('Aborting data processing: no processed data file'));
+%             throw(MException('Custom:Custom','Failure: unable to find processed data file to add interview timestamps to'));
+%         end
+%     end
+% 
+%     if ~contains(data_name,pathsep)
+%         data_name = fullfile(data_path,data_name);
+%     end
+%     load (data_name);
+% end
+
+interview_name = get_path_ui(pwd, 'interview*.csv', 'interview csv', 'The file is usually called intervew-[number].csv and in the main trial directory.', true);
+
+% if ~contains(interview_name,pathsep)
+%     interview_name = fullfile(interview_path,interview_name);
+% end
+
+%f = waitbar(0.5,'Importing interview data','Name','Data Processing');
+
+fid = fopen(interview_name, 'rt', 'n', 'UTF16LE');
+fread(fid, 2, '*uint8');   %adjust the 2 to fit the UTF encoding
+filecontent = fread(fid, [1 inf], '*char');
+datacell = textscan(filecontent, '%s%s%s%s%s%s', 'Delimiter', '	', 'HeaderLines', 1);
+a = size(datacell{1}); 
+num_markers = a(1);
+interview_comments = strings(num_markers);
+interview_ms_timestamps = zeros(num_markers,1);
+k = 1;
+l = 1;
+while k <= num_markers
+    if (~isempty(datacell{3}{k}) && ~(datacell{3}{k} == ""))
+        int_timestamp_strings = strsplit(datacell{3}{k}, ':');
+        mins = int_timestamp_strings(2);
+        secs = int_timestamp_strings(3);
+        frames = int_timestamp_strings(4);
+        int_timestamp = round((str2num(mins{1})*60*1000) + (str2num(secs{1})*1000) + (str2num(frames{1})*1000/30));
+        if ~(int_timestamp == 0)
+            interview_ms_timestamps(l) = int_timestamp;
+            interview_comments(l) = datacell{1}{l};
+            l = l+1;
+        end
+    end
+    k = k+1;
+end
+
+interview_ms_timestamps = interview_ms_timestamps(1:find(interview_ms_timestamps,1,'last'));
+interview_comments = interview_comments(1:length(interview_ms_timestamps));
+
+
+
+interview_ms_timestamps = round(interview_ms_timestamps - processed_data.scalars.sync_frame*1000 / processed_data.scalars.frame_rate);
+
+interview_table = table(interview_ms_timestamps, interview_comments.', 'VariableNames', {'timestamp_ms','label'});
+processed_data.interview = interview_table;
+% %align feeltrace data to master array
+% aligned_data(1).interview = [];
+% l = 1;
+% a = length(interview_ms_timestamps);
+% for k=1:length([aligned_data.timestamp_ms])
+%     if l > a
+%         break;
+%     end
+%     if interview_ms_timestamps(l) == aligned_data(k).timestamp_ms
+%         aligned_data(k).interview =interview_comments(l);
+%         l = l+1;
+%     else
+%         aligned_data(k).interview = [];
+%     end  
+% end
+
+%save(fullfile(processed_directory, 'processed_data.mat'),'processed_data');