bp/BPLabs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes post robyn pilot test

Browse Source
This commit is contained in:
Sam Perry
2019-02-02 15:14:29 +00:00
parent 35317ee223
commit b1a99fcafe
8 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.py
+2 -2
View File
@@ -41,7 +41,7 @@ def url_ok(url, port):
def create_new_window():
webview.create_window("Participant view",
"http://127.0.0.1:23948/participant_home",
width=1000, height=700, min_size=(1000, 500), debug=True)
width=1000, height=900, min_size=(1000, 900), debug=True)
if __name__ == '__main__':
@@ -67,5 +67,5 @@ if __name__ == '__main__':
# Create browser window for user interaction with GUI
webview.create_window("BPLabs",
"http://127.0.0.1:23948/home",
width=1000, height=700, min_size=(1000, 500), debug=True)
width=1000, height=900, min_size=(1000, 900), debug=True)
matrix_test_thread.py
-1
View File
@@ -410,7 +410,6 @@ class MatTestThread(BaseThread):
backup_path = os.path.join(self.participant.data_paths[self.test_name],
'finalised_backup.pkl')
copy2(self.backupFilepath, backup_path)
set_trace()
self.finalised = True
class AdaptiveTrack():
static/style.css
+11 -1
View File
@@ -42,15 +42,17 @@
bottom: 0;
background-color: white; /* Black background with opacity */
z-index: 14; /* Specify a stack order in case you're using a different order for other elements */
font-size: 20pt;
}
.mat_grid > button {
.mat-button {
display: block;
text-decoration: none;
text-align: center;
align-items: stretch;
border-radius: 0px;
vertical-align: middle;
font-size: 24pt;
}
.mat_submit > button {
@@ -61,6 +63,7 @@
border-radius: 0px;
width: 100%;
height: 10%;
font-size: 24pt;
}
.mat_grid {
@@ -88,6 +91,13 @@
height:100%;
}
.center_matrix {
display: block;
margin-left: auto;
margin-right: auto;
width:45%;
}
#eeg_test_table td {
text-align: center;
}
templates/eeg_mat_train_run.html
+2
View File
@@ -210,6 +210,8 @@
<p>When the sentences have all been played, you will be
provided with a grid to fill in the blanks. Press the "submit"
button when you have made your choice</p>
<img src="/static/matrix_screen.png" class="center_matrix">
<br>
<button type="button" href="#" id="instr_continue" class="Btn Btn-primary">Continue</button>
</div>
</div>
templates/index.html
+1 -1
View File
@@ -4,7 +4,7 @@
<head>
<script type="text/javascript" src="/static/bower_components/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="/static/bower_components/highcharts/highcharts.js"></script>
<script type="text/javascript" src="/static/bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="/static/bower_components/bootstrap/dist/js/bootstrap.bundle.js"></script>
<script type="text/javascript" src="/static/bower_components/socket.io-client/dist/socket.io.js"></script>
<script type="text/javascript" src="/static/bower_components/bootstrap-waitingfor/build/bootstrap-waitingfor.js"></script>
templates/mat_test_run.html
+2 -1
View File
@@ -11,6 +11,8 @@
each column. If you can't hear a word, take a guess. When you
have made your selection, press submit to continue to the next
sentence.</p>
<img src="/static/matrix_screen.png" class="center_matrix">
<br>
<button type="button" href="#" id="instr_continue" class="Btn Btn-primary">Continue</button>
</div>
</div>
@@ -253,7 +255,6 @@
hideInstructions();
part_ready = true;
socket.emit("part_ready")
on()
});
socket.on('display_instructions', function(msg) {
templates/participant_home.html
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="card-body">
<h1>{{ title }}</h1>
{% for p in paragraph %}
<p>{{ p }}</p>
<p style="font-size:20pt">{{ p }}</p>
{% endfor %}
</div>
</div>
templates/participant_index.html
+1 -1
View File
@@ -5,7 +5,7 @@
<head>
<script type="text/javascript" src="/static/bower_components/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="/static/bower_components/highcharts/highcharts.js"></script>
<script type="text/javascript" src="/static/bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="/static/bower_components/bootstrap/dist/js/bootstrap.bundle.js"></script>
<script type="text/javascript" src="/static/bower_components/socket.io-client/dist/socket.io.js"></script>
<script type="text/javascript" src="/static/bower_components/bootstrap-waitingfor/build/bootstrap-waitingfor.js"></script>