Skip to content

Commit 1fc60ae

Browse files
ddelpianoddelpiano
authored
Merge pull request #718 from MetaCell/feature/netpyne-139
Feature/netpyne 139
2 parents 74d640c + a6167f3 commit 1fc60ae

2 files changed

Lines changed: 217 additions & 31 deletions

File tree

‎webapp/components/topbar/dialogs/ImportCellParams.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ class ImportCellParams extends React.Component {
114114
>
115115
<Box mb={1}>
116116
<TextField
117+
id="importCellParamsRuleLabel"
117118
variant="filled"
118119
value={label}
119120
fullWidth
@@ -124,6 +125,7 @@ class ImportCellParams extends React.Component {
124125

125126
<NetPyNEField id="netParams.importCellParams.cellName" className={classes.textField}>
126127
<TextField
128+
id="importCellParamsCellName"
127129
variant="filled"
128130
fullWidth
129131
value={cellName}
@@ -200,6 +202,7 @@ class ImportCellParams extends React.Component {
200202
<Grid item>
201203
<NetPyNEField id="netParams.importCellParams.compileMod">
202204
<Checkbox
205+
id="importCellParamsCompileMod"
203206
fullWidth
204207
noBackground
205208
checked={compileMod}

‎webapp/redux/reducers/data/tutorial2_steps.js‎

Lines changed: 214 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,47 +23,84 @@ const tutorial2_steps = [
2323
</div>
2424
)
2525
},
26+
// Import cell values modification
2627
{
27-
target: '#importCellParamsFileName',
28+
target: '#importCellParamsRuleLabel',
29+
title: (
30+
<div>Cell Creation</div>
31+
),
32+
content: (
33+
<div>
34+
<p>Change the cell rule label to "PTcell"</p>
35+
</div>
36+
)
37+
},
38+
{
39+
target: '#importCellParamsCellName',
40+
title: (
41+
<div>Cell Creation</div>
42+
),
43+
content: (
44+
<div>
45+
<p>Change the template/cell name to "PTcell"</p>
46+
</div>
47+
)
48+
},
49+
{
50+
target: '.fa-folder',
2851
title: (
2952
<div>Cell Creation</div>
3053
),
3154
content: (
3255
<div>
3356
<p>Click on the folder icon to select the template:</p>
34-
<p> NetPyNE tutorials &gt; netpyne_workspace-master</p>
57+
<p> NetPyNE-UI &gt; workspace</p>
3558
<p> &gt; cells &gt; PTcells.hoc</p>
3659
</div>
3760
)
3861
},
39-
// {
40-
// target: '#TreeContainerCutting_component',
41-
// content: (
42-
// <div>
43-
// <p>Select "NetPyNE tutorials &gt; netpyne_workspace-master &gt; cells &gt; PTcells.hoc".</p>
44-
// </div>
45-
// )
46-
// },
4762
{
48-
target: '#importCellParamsModFolder',
63+
target: '#browserAccept',
64+
content: (
65+
<div>
66+
<p>Select "NetPyNE-UI &gt; workspace &gt; cells &gt; PTcells.hoc"</p>
67+
<p>and click on "Select"</p>
68+
</div>
69+
)
70+
},
71+
{
72+
target: '.fa-folder',
4973
title: (
5074
<div>Cell Creation</div>
5175
),
5276
content: (
5377
<div>
5478
<p>Click on the folder icon to select the folder containing the "mod" file:</p>
55-
<p>"NetPyNE tutorials &gt; netpyne_workspace-master &gt; mod</p>
79+
<p>"NetPyNE-UI &gt; workspace &gt; mod</p>
80+
</div>
81+
),
82+
collectionIndex: 1
83+
},
84+
{
85+
target: '#browserAccept',
86+
content: (
87+
<div>
88+
<p>Select "NetPyNE-UI &gt; workspace &gt; mod"</p>
89+
<p>and click on "Select"</p>
90+
</div>
91+
)
92+
},
93+
{
94+
target: '#importCellParamsCompileMod',
95+
title: (
96+
<div>Cell Creation</div>
97+
),
98+
content: (
99+
<div>
100+
<p>Activate the compilation of mod files</p>
56101
</div>
57102
)
58103
},
59-
// {
60-
// target: '#TreeContainerCutting_component',
61-
// content: (
62-
// <div>
63-
// <p>Select "NetPyNE tutorials &gt; netpyne_workspace-master &gt; mod".</p>
64-
// </div>
65-
// )
66-
// },
67104
{
68105
target: '#appBarPerformActionButton',
69106
title: (
@@ -108,62 +145,208 @@ const tutorial2_steps = [
108145
</div>
109146
)
110147
},
148+
// New cell import
149+
{
150+
target: '#selectCellButton',
151+
title: (
152+
<div>Cell Creation</div>
153+
),
154+
content: (
155+
<div>
156+
<p>We will create first a new cell using a cell template.</p>
157+
<p>Click on the "+" to create a new cell.</p>
158+
</div>
159+
)
160+
},
161+
{
162+
target: '#fromTemplateCellTemplate',
163+
title: (
164+
<div>Cell Creation</div>
165+
),
166+
content: (
167+
<div>
168+
<p>Select "Import cell template from file..."</p>
169+
</div>
170+
)
171+
},
172+
// Template cell parameter modification
173+
{
174+
target: '#importCellParamsRuleLabel',
175+
title: (
176+
<div>Cell Creation</div>
177+
),
178+
content: (
179+
<div>
180+
<p>Change the cell rule label to "SRI"</p>
181+
</div>
182+
)
183+
},
184+
{
185+
target: '#importCellParamsCellName',
186+
title: (
187+
<div>Cell Creation</div>
188+
),
189+
content: (
190+
<div>
191+
<p>Change the template/cell name to "SRI"</p>
192+
</div>
193+
)
194+
},
111195
{
112-
target: '#importCellParamsFileName',
196+
target: '.fa-folder',
113197
title: (
114198
<div>Cell Creation</div>
115199
),
116200
content: (
117201
<div>
118-
<p>Click on the folder icon to select the template.</p>
202+
<p>Click on the folder icon to select the template:</p>
203+
<p> NetPyNE-UI &gt; workspace</p>
204+
<p> &gt; cells &gt; PTcells.hoc</p>
119205
</div>
120206
)
121207
},
122208
{
123-
target: '#TreeContainerCutting_component',
209+
target: '#browserAccept',
210+
content: (
211+
<div>
212+
<p>Select "NetPyNE-UI &gt; workspace &gt; cells &gt; SRI.hoc"</p>
213+
<p>and click on "Select"</p>
214+
</div>
215+
)
216+
},
217+
{
218+
target: '.fa-folder',
124219
title: (
125220
<div>Cell Creation</div>
126221
),
127222
content: (
128223
<div>
129-
<p>Select "NetPyNE tutorials &gt; netpyne_workspace-master &gt; cells &gt; SRI.hoc".</p>
224+
<p>Click on the folder icon to select the folder containing the "mod" file:</p>
225+
<p>"NetPyNE-UI &gt; workspace &gt; mod</p>
226+
</div>
227+
),
228+
collectionIndex: 1
229+
},
230+
{
231+
target: '#browserAccept',
232+
content: (
233+
<div>
234+
<p>Select "NetPyNE-UI &gt; workspace &gt; mod"</p>
235+
<p>and click on "Select"</p>
130236
</div>
131237
)
132238
},
133239
{
134-
target: '#importCellParamsModFolder',
240+
target: '#importCellParamsCompileMod',
135241
title: (
136242
<div>Cell Creation</div>
137243
),
138244
content: (
139245
<div>
140-
<p>Click on the folder icon to select the folder containing the "mod" file.</p>
246+
<p>Activate the compilation of mod files</p>
141247
</div>
142248
)
143249
},
144250
{
145-
target: '#TreeContainerCutting_component',
251+
target: '#appBarPerformActionButton',
146252
title: (
147253
<div>Cell Creation</div>
148254
),
149255
content: (
150256
<div>
151-
<p>Select, as for the last created cell:</p>
152-
<p>"NetPyNE tutorials &gt; netpyne_workspace-master &gt; mod".</p>
257+
<p>Click on "Import" to import the cell template.</p>
153258
</div>
154259
)
155260
},
261+
// New cell population
156262
{
157263
target: 'img[src*="popParams"]',
158264
title: (
159-
<div>Population Update</div>
265+
<div>Population Creation</div>
266+
),
267+
content: (
268+
<div>
269+
<p>Click on "Populations" to create new cells populations.</p>
270+
</div>
271+
)
272+
}, //newPopulationButton
273+
{
274+
target: '#newPopulationButton',
275+
title: (
276+
<div>Population Creation</div>
160277
),
161278
content: (
162279
<div>
163-
<p>Click on "Populations" to change cells populations.</p>
280+
<p>Create a new population for PTcell</p>
164281
</div>
165282
)
166283
},
284+
{
285+
target: 'div.MuiBox-root.scrollbar.scrollchild > div.MuiBox-root > div',
286+
title: (
287+
<div>Population Creation</div>
288+
),
289+
content: (
290+
<p>Change the population name to "E"</p>
291+
)
292+
},
293+
{
294+
target: 'div[id^="netParamspopParams"][id$="cellType"]',
295+
title: (
296+
<div>Population Creation</div>
297+
),
298+
content: (
299+
<p>Select "PTcell"</p>
300+
)
301+
}, //netParamspopParamsPopulation0numCells
302+
{
303+
target: 'input[id^="netParamspopParams"][id$="numCells"]',
304+
title: (
305+
<div>Population Creation</div>
306+
),
307+
content: (
308+
<p>Enter 2 as number of cells</p>
309+
)
310+
},
311+
{
312+
target: '#newPopulationButton',
313+
title: (
314+
<div>Population Creation</div>
315+
),
316+
content: (
317+
<div>
318+
<p>Create a new population for SRI</p>
319+
</div>
320+
)
321+
},
322+
{
323+
target: 'div.MuiBox-root.scrollbar.scrollchild > div.MuiBox-root > div',
324+
title: (
325+
<div>Population Creation</div>
326+
),
327+
content: (
328+
<p>Change the population name to "I"</p>
329+
)
330+
},
331+
{
332+
target: 'div[id^="netParamspopParams"][id$="cellType"]',
333+
title: (
334+
<div>Population Creation</div>
335+
),
336+
content: (
337+
<p>Select "SRI"</p>
338+
)
339+
}, //netParamspopParamsPopulation0numCells
340+
{
341+
target: 'input[id^="netParamspopParams"][id$="numCells"]',
342+
title: (
343+
<div>Population Creation</div>
344+
),
345+
content: (
346+
<p>Enter 2 as number of cells</p>
347+
)
348+
},
349+
// Network creation
167350
{
168351
target: '.MuiGrid-item .MuiButton-root:nth-last-child(2)',
169352
title: (

0 commit comments

Comments
 (0)