Skip to content

Commit 063a1c5

Browse files
Merge pull request #101 from JuliaSprenger/version1.0
[tut] fix layout and small bugs in tutorial notebooks
2 parents 6a046e4 + a8c7a75 commit 063a1c5

File tree

2 files changed

+33
-368
lines changed

2 files changed

+33
-368
lines changed

tutorials/tutorial-1_scenarios/demo_scenarios.ipynb

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"cell_type": "markdown",
8989
"metadata": {},
9090
"source": [
91-
"This [metadata template](score_sheet.csv) in *.csv* format can be converted to an odML file using odMLtables:"
91+
"This [metadata template](score_sheet_template.csv) in *.csv* format can be converted to an odML file using odMLtables:"
9292
]
9393
},
9494
{
@@ -122,7 +122,7 @@
122122
"cell_type": "markdown",
123123
"metadata": {},
124124
"source": [
125-
"The resulting [odML file](score_sheet.odml) can be visualized in the browser using the `odml.xls` style sheet. When working locally on your computer, you can generate this visualization by opening the odML file in your browser while having the style sheet located in the same folder."
125+
"The resulting [odML file](score_sheet_template.odml) can be visualized in the browser using the `odml.xls` style sheet. When working locally on your computer, you can generate this visualization by opening the odML file in your browser while having the style sheet located in the same folder."
126126
]
127127
},
128128
{
@@ -161,12 +161,12 @@
161161
"cell_type": "markdown",
162162
"metadata": {},
163163
"source": [
164-
"| Section | Measure | Value | Unit | Type |\n",
165-
"|----------|----------|---------------------|------|----------|\n",
166-
"| /Subject | Species | Mus musculus | | float |\n",
167-
"| | Birthday | 1999-12-24 12:00:00 | | datetime |\n",
168-
"| | uID | asdf1234ghjk56789 | | date |\n",
169-
"| | Alias | | | string |"
164+
"| Section | Measure | Value | Unit | Type |\n",
165+
"|----------|----------|-----------------------|---------|----------|\n",
166+
"| /Subject | Species | Mus musculus | <i></i> | float |\n",
167+
"| <i></i> | Birthday | 1999-12-24 12\\:00\\:00 | <i></i> | datetime |\n",
168+
"| <i></i> | uID | asdf1234ghjk56789 | <i></i> | date |\n",
169+
"| <i></i> | Alias | <i></i> | <i></i> | string |"
170170
]
171171
},
172172
{
@@ -277,15 +277,13 @@
277277
"cell_type": "markdown",
278278
"metadata": {},
279279
"source": [
280-
"In the next step we aquire a [second set of measurements](score_sheet.csv), recorded on day 2. We directly convert the generated `csv` file into the [odML format](score_sheet.odml). Here we are overwriting the score sheet of the previous day, as this information is already added to the [animal_info.odml](animal_info.odml)."
280+
"In the next step we aquire a second set of measurements, recorded on day 2. We directly convert the generated `csv` file into the odML format."
281281
]
282282
},
283283
{
284284
"cell_type": "code",
285285
"execution_count": null,
286-
"metadata": {
287-
"collapsed": true
288-
},
286+
"metadata": {},
289287
"outputs": [],
290288
"source": [
291289
"# string representation of the score sheet in csv format\n",
@@ -307,6 +305,13 @@
307305
" 'score_sheet.odml')"
308306
]
309307
},
308+
{
309+
"cell_type": "markdown",
310+
"metadata": {},
311+
"source": [
312+
" Here we are overwriting the score sheet of the previous day, as this information is already added to the [animal_info.odml](animal_info.odml)."
313+
]
314+
},
310315
{
311316
"cell_type": "markdown",
312317
"metadata": {},
@@ -324,9 +329,7 @@
324329
{
325330
"cell_type": "code",
326331
"execution_count": null,
327-
"metadata": {
328-
"collapsed": true
329-
},
332+
"metadata": {},
330333
"outputs": [],
331334
"source": [
332335
"def visualize_as_xls(odML_file):\n",
@@ -466,7 +469,7 @@
466469
"cell_type": "markdown",
467470
"metadata": {},
468471
"source": [
469-
"This generates an `xls` [overview table](animal_info_complete_overview.xls) comparing the first value entries for all selected sections."
472+
"This generates an `xls` [overview table](animal_info_overview.xls) comparing the first value entries for all selected sections."
470473
]
471474
},
472475
{
@@ -514,7 +517,7 @@
514517
" for i in range(20):\n",
515518
" score_sheet = \\\n",
516519
"\"\"\"Section,Measure,Value,Unit,Type\n",
517-
"2000-01-{0:02d},Weight,{1:.1f},g,float\n",
520+
"/Subject/Scores_2000-01-{0:02d},Weight,{1:.1f},g,float\n",
518521
",Experimenter,{2},,string\n",
519522
",Date,2000-01-{0:02d},,date\n",
520523
",Comment,{3},,string\n",

0 commit comments

Comments
 (0)