Skip to content

Commit b7e23dd

Browse files
glopesdevglopesdev
committed
Ensure current sync quad state is always displayed
1 parent 7ebe8a2 commit b7e23dd

File tree

2 files changed

+65
-57
lines changed

2 files changed

+65
-57
lines changed

‎src/workflows/Extensions/LogExperiment.bonsai

+7-50
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,6 @@
7676
<Expression xsi:type="rx:PublishSubject">
7777
<Name>Tick</Name>
7878
</Expression>
79-
<Expression xsi:type="WorkflowInput">
80-
<Name>Source1</Name>
81-
</Expression>
82-
<Expression xsi:type="Combinator">
83-
<Combinator xsi:type="gl:UpdateViewportState">
84-
<gl:X>0</gl:X>
85-
<gl:Y>0</gl:Y>
86-
<gl:Width>1</gl:Width>
87-
<gl:Height>1</gl:Height>
88-
</Combinator>
89-
</Expression>
90-
<Expression xsi:type="IncludeWorkflow" Path="BonVision:Environment.OrthographicView.bonsai">
91-
<Left>0</Left>
92-
<Right>1</Right>
93-
<Bottom>0</Bottom>
94-
<Top>1</Top>
95-
</Expression>
9679
<Expression xsi:type="ExternalizedMapping">
9780
<Property Name="Seed" />
9881
<Property Name="P" />
@@ -182,26 +165,6 @@
182165
<Expression xsi:type="MulticastSubject">
183166
<Name>HarpSync</Name>
184167
</Expression>
185-
<Expression xsi:type="PropertyMapping">
186-
<PropertyMappings>
187-
<Property Name="ColorR" />
188-
<Property Name="ColorG" />
189-
<Property Name="ColorB" />
190-
</PropertyMappings>
191-
</Expression>
192-
<Expression xsi:type="IncludeWorkflow" Path="BonVision:Primitives.DrawQuad.bonsai">
193-
<ExtentX>0.1</ExtentX>
194-
<ExtentY>0.3</ExtentY>
195-
<LocationX>0</LocationX>
196-
<LocationY>0</LocationY>
197-
<Layer>0</Layer>
198-
<Angle>0</Angle>
199-
<ColorR>1</ColorR>
200-
<ColorG>1</ColorG>
201-
<ColorB>1</ColorB>
202-
<ColorA>1</ColorA>
203-
</Expression>
204-
<Expression xsi:type="WorkflowOutput" />
205168
<Expression xsi:type="SubscribeSubject">
206169
<Name>Request</Name>
207170
</Expression>
@@ -272,29 +235,23 @@ Item1 as Response)</scr:Expression>
272235
<Edge From="12" To="13" Label="Source1" />
273236
<Edge From="13" To="14" Label="Source1" />
274237
<Edge From="15" To="16" Label="Source1" />
275-
<Edge From="16" To="17" Label="Source1" />
276-
<Edge From="17" To="26" Label="Source1" />
238+
<Edge From="16" To="18" Label="Source1" />
239+
<Edge From="17" To="18" Label="Source2" />
277240
<Edge From="18" To="19" Label="Source1" />
278-
<Edge From="19" To="21" Label="Source1" />
279-
<Edge From="20" To="21" Label="Source2" />
280-
<Edge From="21" To="22" Label="Source1" />
241+
<Edge From="19" To="20" Label="Source1" />
242+
<Edge From="20" To="21" Label="Source1" />
281243
<Edge From="22" To="23" Label="Source1" />
282244
<Edge From="23" To="24" Label="Source1" />
283-
<Edge From="24" To="25" Label="Source1" />
284-
<Edge From="25" To="26" Label="Source2" />
285-
<Edge From="26" To="27" Label="Source1" />
245+
<Edge From="25" To="26" Label="Source1" />
246+
<Edge From="26" To="28" Label="Source1" />
247+
<Edge From="27" To="28" Label="Source2" />
286248
<Edge From="28" To="29" Label="Source1" />
287249
<Edge From="29" To="30" Label="Source1" />
288250
<Edge From="31" To="32" Label="Source1" />
289251
<Edge From="32" To="34" Label="Source1" />
290252
<Edge From="33" To="34" Label="Source2" />
291253
<Edge From="34" To="35" Label="Source1" />
292254
<Edge From="35" To="36" Label="Source1" />
293-
<Edge From="37" To="38" Label="Source1" />
294-
<Edge From="38" To="40" Label="Source1" />
295-
<Edge From="39" To="40" Label="Source2" />
296-
<Edge From="40" To="41" Label="Source1" />
297-
<Edge From="41" To="42" Label="Source1" />
298255
</Edges>
299256
</Workflow>
300257
</WorkflowBuilder>

‎src/workflows/ranson-rig.bonsai

+58-7
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,6 @@ Item2.Index as TrialID)</scr:Expression>
243243
<Expression xsi:type="Combinator">
244244
<Combinator xsi:type="rx:SubscribeWhen" />
245245
</Expression>
246-
<Expression xsi:type="SubscribeSubject">
247-
<Name>PostRender</Name>
248-
</Expression>
249246
<Expression xsi:type="IncludeWorkflow" Path="Extensions\LogExperiment.bonsai">
250247
<Seed>0</Seed>
251248
<P>1</P>
@@ -289,9 +286,8 @@ Item2.Index as TrialID)</scr:Expression>
289286
<Edge From="29" To="30" Label="Source1" />
290287
<Edge From="31" To="33" Label="Source1" />
291288
<Edge From="32" To="33" Label="Source2" />
292-
<Edge From="34" To="35" Label="Source1" />
293-
<Edge From="35" To="37" Label="Source1" />
294-
<Edge From="36" To="37" Label="Source2" />
289+
<Edge From="34" To="36" Label="Source1" />
290+
<Edge From="35" To="36" Label="Source2" />
295291
</Edges>
296292
</Workflow>
297293
</Expression>
@@ -404,6 +400,61 @@ Item2.Index as TrialID)</scr:Expression>
404400
</Edges>
405401
</Workflow>
406402
</Expression>
403+
<Expression xsi:type="GroupWorkflow">
404+
<Name>SyncQuad</Name>
405+
<Workflow>
406+
<Nodes>
407+
<Expression xsi:type="SubscribeSubject">
408+
<Name>PostRender</Name>
409+
</Expression>
410+
<Expression xsi:type="Combinator">
411+
<Combinator xsi:type="gl:UpdateViewportState">
412+
<gl:X>0</gl:X>
413+
<gl:Y>0</gl:Y>
414+
<gl:Width>1</gl:Width>
415+
<gl:Height>1</gl:Height>
416+
</Combinator>
417+
</Expression>
418+
<Expression xsi:type="IncludeWorkflow" Path="BonVision:Environment.OrthographicView.bonsai">
419+
<Left>0</Left>
420+
<Right>1</Right>
421+
<Bottom>0</Bottom>
422+
<Top>1</Top>
423+
</Expression>
424+
<Expression xsi:type="SubscribeSubject">
425+
<Name>HarpSync</Name>
426+
</Expression>
427+
<Expression xsi:type="PropertyMapping">
428+
<PropertyMappings>
429+
<Property Name="ColorR" />
430+
<Property Name="ColorG" />
431+
<Property Name="ColorB" />
432+
</PropertyMappings>
433+
</Expression>
434+
<Expression xsi:type="IncludeWorkflow" Path="BonVision:Primitives.DrawQuad.bonsai">
435+
<ExtentX>0.1</ExtentX>
436+
<ExtentY>0.3</ExtentY>
437+
<LocationX>0</LocationX>
438+
<LocationY>0</LocationY>
439+
<Layer>0</Layer>
440+
<Angle>0</Angle>
441+
<ColorR>0</ColorR>
442+
<ColorG>0</ColorG>
443+
<ColorB>0</ColorB>
444+
<ColorA>1</ColorA>
445+
</Expression>
446+
<Expression xsi:type="WorkflowOutput" />
447+
</Nodes>
448+
<Edges>
449+
<Edge From="0" To="1" Label="Source1" />
450+
<Edge From="1" To="2" Label="Source1" />
451+
<Edge From="2" To="5" Label="Source1" />
452+
<Edge From="3" To="4" Label="Source1" />
453+
<Edge From="4" To="5" Label="Source2" />
454+
<Edge From="5" To="6" Label="Source1" />
455+
</Edges>
456+
</Workflow>
457+
</Expression>
407458
<Expression xsi:type="SubscribeSubject">
408459
<Name>Request</Name>
409460
</Expression>
@@ -421,7 +472,7 @@ Item2.Index as TrialID)</scr:Expression>
421472
<Edge From="2" To="3" Label="Source1" />
422473
<Edge From="3" To="4" Label="Source1" />
423474
<Edge From="4" To="5" Label="Source1" />
424-
<Edge From="10" To="11" Label="Source1" />
475+
<Edge From="11" To="12" Label="Source1" />
425476
</Edges>
426477
</Workflow>
427478
</Expression>

0 commit comments

Comments
 (0)