Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rearrange control panel layout to include dummy patch activity #545

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Rearrange control panel layout to include dummy patch activity #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 79 additions & 65 deletions workflows/social/Extensions/ControlPanel.bonsai
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<Combinator xsi:type="dsp:SelectChannels">
<dsp:Channels>
<dsp:int>0</dsp:int>
<dsp:int>3</dsp:int>
<dsp:int>4</dsp:int>
</dsp:Channels>
</Combinator>
</Expression>
Expand All @@ -148,7 +148,7 @@
<Combinator xsi:type="dsp:SelectChannels">
<dsp:Channels>
<dsp:int>1</dsp:int>
<dsp:int>4</dsp:int>
<dsp:int>5</dsp:int>
</dsp:Channels>
</Combinator>
</Expression>
Expand All @@ -160,7 +160,7 @@
<Combinator xsi:type="dsp:SelectChannels">
<dsp:Channels>
<dsp:int>2</dsp:int>
<dsp:int>5</dsp:int>
<dsp:int>6</dsp:int>
</dsp:Channels>
</Combinator>
</Expression>
Expand Down Expand Up @@ -276,32 +276,6 @@
</viz:CellSpans>
</Expression>
<Expression xsi:type="VisualizerMapping" />
<Expression xsi:type="aeon-env:ExperimentProperties">
<aeon-env:HelpVisible>false</aeon-env:HelpVisible>
<aeon-env:ToolbarVisible>false</aeon-env:ToolbarVisible>
</Expression>
<Expression xsi:type="VisualizerMapping" />
<Expression xsi:type="SubscribeSubject">
<Name>VideoEvents</Name>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="aeon-env:ButtonSource">
<aeon-env:Text>Reload Environment</aeon-env:Text>
</Combinator>
</Expression>
<Expression xsi:type="MulticastSubject">
<Name>ReloadEnvironment</Name>
</Expression>
<Expression xsi:type="VisualizerMapping" />
<Expression xsi:type="viz:TableLayoutPanelBuilder">
<viz:Name>PatchStatistics</viz:Name>
<viz:ColumnCount>1</viz:ColumnCount>
<viz:RowCount>2</viz:RowCount>
<viz:ColumnStyles />
<viz:RowStyles />
<viz:CellSpans />
</Expression>
<Expression xsi:type="VisualizerMapping" />
<Expression xsi:type="SubscribeSubject">
<Name>RfidMeasurements</Name>
</Expression>
Expand All @@ -325,6 +299,18 @@
</Workflow>
</Expression>
<Expression xsi:type="VisualizerMapping" />
<Expression xsi:type="SubscribeSubject">
<Name>PatchState</Name>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="dsp:SelectChannels">
<dsp:Channels>
<dsp:int>3</dsp:int>
<dsp:int>7</dsp:int>
</dsp:Channels>
</Combinator>
</Expression>
<Expression xsi:type="VisualizerMapping" />
<Expression xsi:type="SubscribeSubject">
<Name>TimeSinceLastVisit</Name>
</Expression>
Expand Down Expand Up @@ -448,39 +434,56 @@
<Edge From="37" To="38" Label="Source1" />
<Edge From="38" To="39" Label="Source12" />
<Edge From="39" To="40" Label="Source1" />
<Edge From="40" To="63" Label="Source1" />
<Edge From="40" To="58" Label="Source1" />
<Edge From="41" To="42" Label="Source1" />
<Edge From="42" To="47" Label="Source1" />
<Edge From="42" To="43" Label="Source1" />
<Edge From="43" To="44" Label="Source1" />
<Edge From="44" To="45" Label="Source1" />
<Edge From="44" To="56" Label="Source1" />
<Edge From="45" To="46" Label="Source1" />
<Edge From="46" To="47" Label="Source2" />
<Edge From="47" To="48" Label="Source1" />
<Edge From="48" To="61" Label="Source1" />
<Edge From="46" To="47" Label="Source1" />
<Edge From="47" To="56" Label="Source2" />
<Edge From="48" To="49" Label="Source1" />
<Edge From="49" To="50" Label="Source1" />
<Edge From="50" To="51" Label="Source1" />
<Edge From="51" To="52" Label="Source1" />
<Edge From="52" To="61" Label="Source2" />
<Edge From="51" To="56" Label="Source3" />
<Edge From="52" To="53" Label="Source1" />
<Edge From="53" To="54" Label="Source1" />
<Edge From="54" To="55" Label="Source1" />
<Edge From="55" To="56" Label="Source1" />
<Edge From="56" To="61" Label="Source3" />
<Edge From="57" To="58" Label="Source1" />
<Edge From="55" To="56" Label="Source4" />
<Edge From="56" To="57" Label="Source1" />
<Edge From="57" To="58" Label="Source2" />
<Edge From="58" To="59" Label="Source1" />
<Edge From="59" To="60" Label="Source1" />
<Edge From="60" To="61" Label="Source4" />
<Edge From="61" To="62" Label="Source1" />
<Edge From="62" To="63" Label="Source2" />
<Edge From="63" To="64" Label="Source1" />
</Edges>
</Workflow>
</Expression>
<Expression xsi:type="GroupWorkflow">
<Name>SubjectActivity</Name>
<Workflow>
<Nodes>
<Expression xsi:type="aeon-env:ExperimentProperties">
<aeon-env:HelpVisible>false</aeon-env:HelpVisible>
<aeon-env:ToolbarVisible>false</aeon-env:ToolbarVisible>
</Expression>
<Expression xsi:type="VisualizerMapping" />
<Expression xsi:type="SubscribeSubject">
<Name>Heatmap</Name>
<Name>VideoEvents</Name>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="aeon-env:ButtonSource">
<aeon-env:Text>Reload Environment</aeon-env:Text>
</Combinator>
</Expression>
<Expression xsi:type="MulticastSubject">
<Name>ReloadEnvironment</Name>
</Expression>
<Expression xsi:type="VisualizerMapping" />
<Expression xsi:type="viz:TableLayoutPanelBuilder">
<viz:Name>Environment</viz:Name>
<viz:ColumnCount>1</viz:ColumnCount>
<viz:RowCount>2</viz:RowCount>
<viz:ColumnStyles />
<viz:RowStyles />
<viz:CellSpans />
</Expression>
<Expression xsi:type="VisualizerMapping" />
<Expression xsi:type="SubscribeSubject">
Expand Down Expand Up @@ -521,18 +524,24 @@
</Nodes>
<Edges>
<Edge From="0" To="1" Label="Source1" />
<Edge From="1" To="12" Label="Source1" />
<Edge From="1" To="6" Label="Source1" />
<Edge From="2" To="3" Label="Source1" />
<Edge From="3" To="7" Label="Source1" />
<Edge From="3" To="4" Label="Source1" />
<Edge From="4" To="5" Label="Source1" />
<Edge From="5" To="6" Label="Source1" />
<Edge From="6" To="7" Label="Source2" />
<Edge From="7" To="8" Label="Source1" />
<Edge From="5" To="6" Label="Source2" />
<Edge From="6" To="7" Label="Source1" />
<Edge From="7" To="18" Label="Source1" />
<Edge From="8" To="9" Label="Source1" />
<Edge From="9" To="12" Label="Source2" />
<Edge From="9" To="13" Label="Source1" />
<Edge From="10" To="11" Label="Source1" />
<Edge From="11" To="12" Label="Source3" />
<Edge From="12" To="13" Label="Source1" />
<Edge From="11" To="12" Label="Source1" />
<Edge From="12" To="13" Label="Source2" />
<Edge From="13" To="14" Label="Source1" />
<Edge From="14" To="15" Label="Source1" />
<Edge From="15" To="18" Label="Source2" />
<Edge From="16" To="17" Label="Source1" />
<Edge From="17" To="18" Label="Source3" />
<Edge From="18" To="19" Label="Source1" />
</Edges>
</Workflow>
</Expression>
Expand Down Expand Up @@ -1190,6 +1199,9 @@ FilteredWeight.Value - BaselinedWeight.Value as Baseline)</scr:Expression>
<Expression xsi:type="MemberSelector">
<Selector>Value.Image</Selector>
</Expression>
<Expression xsi:type="SubscribeSubject">
<Name>Heatmap</Name>
</Expression>
<Expression xsi:type="ExternalizedMapping">
<Property Name="SelectedStream" />
</Expression>
Expand All @@ -1206,32 +1218,34 @@ FilteredWeight.Value - BaselinedWeight.Value as Baseline)</scr:Expression>
<p1:string>CameraPatch1</p1:string>
<p1:string>CameraPatch2</p1:string>
<p1:string>CameraPatch3</p1:string>
<p1:string>HeatMap</p1:string>
</p1:StreamNames>
</Combinator>
</Expression>
<Expression xsi:type="WorkflowOutput" />
</Nodes>
<Edges>
<Edge From="0" To="1" Label="Source1" />
<Edge From="1" To="19" Label="Source1" />
<Edge From="1" To="20" Label="Source1" />
<Edge From="2" To="3" Label="Source1" />
<Edge From="3" To="19" Label="Source2" />
<Edge From="3" To="20" Label="Source2" />
<Edge From="4" To="5" Label="Source1" />
<Edge From="5" To="19" Label="Source3" />
<Edge From="5" To="20" Label="Source3" />
<Edge From="6" To="7" Label="Source1" />
<Edge From="7" To="19" Label="Source4" />
<Edge From="7" To="20" Label="Source4" />
<Edge From="8" To="9" Label="Source1" />
<Edge From="9" To="19" Label="Source5" />
<Edge From="9" To="20" Label="Source5" />
<Edge From="10" To="11" Label="Source1" />
<Edge From="11" To="19" Label="Source6" />
<Edge From="11" To="20" Label="Source6" />
<Edge From="12" To="13" Label="Source1" />
<Edge From="13" To="19" Label="Source7" />
<Edge From="13" To="20" Label="Source7" />
<Edge From="14" To="15" Label="Source1" />
<Edge From="15" To="19" Label="Source8" />
<Edge From="15" To="20" Label="Source8" />
<Edge From="16" To="17" Label="Source1" />
<Edge From="17" To="19" Label="Source9" />
<Edge From="18" To="19" Label="Source10" />
<Edge From="19" To="20" Label="Source1" />
<Edge From="17" To="20" Label="Source9" />
<Edge From="18" To="20" Label="Source10" />
<Edge From="19" To="20" Label="Source11" />
<Edge From="20" To="21" Label="Source1" />
</Edges>
</Workflow>
</Expression>
Expand Down
31 changes: 31 additions & 0 deletions workflows/social/Extensions/EnvironmentLogic.bonsai
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,29 @@ RatePatch3 as Rate)</scr:Expression>
<Expression xsi:type="MulticastSubject">
<Name>Patch3ThresholdCrossing</Name>
</Expression>
<Expression xsi:type="SubscribeSubject">
<Name>PatchDummy1WheelDisplacement</Name>
</Expression>
<Expression xsi:type="MemberSelector">
<Selector>Value</Selector>
</Expression>
<Expression xsi:type="ExternalizedMapping">
<Property Name="DistanceThreshold" DisplayName="ThresholdPatchDummy1" />
<Property Name="Rate" DisplayName="RatePatchDummy1" />
</Expression>
<Expression xsi:type="IncludeWorkflow" Path="Aeon.Foraging:RandomDepletion.bonsai">
<Name>PatchDummy1DistanceState</Name>
<DistanceThreshold>75</DistanceThreshold>
<Rate>0.01</Rate>
<DeliveryCount>PatchDummy1DeliveryCount</DeliveryCount>
<PatchState>PatchDummy1State</PatchState>
</Expression>
<Expression xsi:type="MulticastSubject">
<Name>PatchDummy1DeliverPellet</Name>
</Expression>
<Expression xsi:type="MulticastSubject">
<Name>PatchDummy1ThresholdCrossing</Name>
</Expression>
</Nodes>
<Edges>
<Edge From="0" To="1" Label="Source1" />
Expand All @@ -760,6 +783,11 @@ RatePatch3 as Rate)</scr:Expression>
<Edge From="14" To="15" Label="Source2" />
<Edge From="15" To="16" Label="Source1" />
<Edge From="16" To="17" Label="Source1" />
<Edge From="18" To="19" Label="Source1" />
<Edge From="19" To="21" Label="Source1" />
<Edge From="20" To="21" Label="Source2" />
<Edge From="21" To="22" Label="Source1" />
<Edge From="22" To="23" Label="Source1" />
</Edges>
</Workflow>
</Expression>
Expand All @@ -784,6 +812,9 @@ RatePatch3 as Rate)</scr:Expression>
<Expression xsi:type="rx:PublishSubject" TypeArguments="sys:Int32">
<rx:Name>Patch3ThresholdCrossing</rx:Name>
</Expression>
<Expression xsi:type="rx:PublishSubject" TypeArguments="sys:Int32">
<rx:Name>PatchDummy1ThresholdCrossing</rx:Name>
</Expression>
<Expression xsi:type="GroupWorkflow">
<Name>UpdatePelletCount</Name>
<Workflow>
Expand Down
Loading