Skip to content

Commit

Permalink
Merge pull request #298 from AllenNeuralDynamics/fix-stops-outside-re…
Browse files Browse the repository at this point in the history 
…ward-site

Ensure stops are only trigger site logic from within the site
  • Loading branch information
@bruno-f-cruz
bruno-f-cruz authored Sep 6, 2024
2 parents a317fd6 + 209fe1f commit 9367a3b
Showing 1 changed file with 25 additions and 15 deletions.
40 changes: 25 additions & 15 deletions src/Extensions/InstantiateSite.bonsai
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@
<Expression xsi:type="SubscribeSubject">
<Name>IsStopped</Name>
</Expression>
<Expression xsi:type="SubscribeSubject">
<Name>IsInSite</Name>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="rx:WithLatestFrom" />
</Expression>
<Expression xsi:type="rx:CreateObservable">
<Name>CheckStop</Name>
<Workflow>
Expand Down Expand Up @@ -190,13 +196,15 @@
<Name>Source1</Name>
</Expression>
<Expression xsi:type="MemberSelector">
<Selector>Value</Selector>
<Selector>Item2,Item1.Value</Selector>
</Expression>
<Expression xsi:type="BitwiseAnd" />
<Expression xsi:type="WorkflowOutput" />
</Nodes>
<Edges>
<Edge From="0" To="1" Label="Source1" />
<Edge From="1" To="2" Label="Source1" />
<Edge From="2" To="3" Label="Source1" />
</Edges>
</Workflow>
</Expression>
Expand Down Expand Up @@ -975,32 +983,34 @@ it.Item2 as EntryPosition)</scr:Expression>
<Edge From="0" To="1" Label="Source1" />
<Edge From="1" To="2" Label="Source1" />
<Edge From="2" To="3" Label="Source1" />
<Edge From="4" To="5" Label="Source1" />
<Edge From="5" To="6" Label="Source1" />
<Edge From="4" To="6" Label="Source1" />
<Edge From="5" To="6" Label="Source2" />
<Edge From="6" To="7" Label="Source1" />
<Edge From="7" To="9" Label="Source1" />
<Edge From="8" To="9" Label="Source2" />
<Edge From="9" To="10" Label="Source1" />
<Edge From="10" To="11" Label="Source1" />
<Edge From="7" To="8" Label="Source1" />
<Edge From="8" To="9" Label="Source1" />
<Edge From="9" To="11" Label="Source1" />
<Edge From="10" To="11" Label="Source2" />
<Edge From="11" To="12" Label="Source1" />
<Edge From="11" To="19" Label="Source1" />
<Edge From="12" To="13" Label="Source1" />
<Edge From="13" To="14" Label="Source1" />
<Edge From="13" To="17" Label="Source1" />
<Edge From="13" To="21" Label="Source1" />
<Edge From="14" To="15" Label="Source1" />
<Edge From="15" To="16" Label="Source1" />
<Edge From="16" To="26" Label="Source1" />
<Edge From="15" To="19" Label="Source1" />
<Edge From="16" To="17" Label="Source1" />
<Edge From="17" To="18" Label="Source1" />
<Edge From="18" To="21" Label="Source1" />
<Edge From="18" To="28" Label="Source1" />
<Edge From="19" To="20" Label="Source1" />
<Edge From="20" To="21" Label="Source2" />
<Edge From="20" To="23" Label="Source1" />
<Edge From="21" To="22" Label="Source1" />
<Edge From="22" To="23" Label="Source1" />
<Edge From="22" To="23" Label="Source2" />
<Edge From="23" To="24" Label="Source1" />
<Edge From="24" To="25" Label="Source1" />
<Edge From="25" To="26" Label="Source2" />
<Edge From="25" To="26" Label="Source1" />
<Edge From="26" To="27" Label="Source1" />
<Edge From="27" To="28" Label="Source1" />
<Edge From="27" To="28" Label="Source2" />
<Edge From="28" To="29" Label="Source1" />
<Edge From="29" To="30" Label="Source1" />
</Edges>
</Workflow>
</Expression>
Expand Down

0 comments on commit 9367a3b

Please sign in to comment.