Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 24 additions & 8 deletions .bonsai/Bonsai.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
<Package id="Bonsai" version="2.9.0" />
<Package id="Bonsai.Core" version="2.9.0" />
<Package id="Bonsai.Design" version="2.9.0" />
<Package id="Bonsai.Dsp" version="2.7.0" />
<Package id="Bonsai.Design.Visualizers" version="2.9.0" />
<Package id="Bonsai.Dsp" version="2.9.0" />
<Package id="Bonsai.Editor" version="2.9.0" />
<Package id="Bonsai.Gui" version="0.2.0" />
<Package id="Bonsai.Gui.ZedGraph" version="0.2.0" />
<Package id="Bonsai.Harp" version="3.6.1" />
<Package id="Bonsai.Numerics" version="0.7.0" />
<Package id="Bonsai.Scripting.Expressions" version="2.9.0" />
Expand All @@ -16,7 +19,8 @@
<Package id="Bonsai.Shaders.Rendering" version="0.3.0" />
<Package id="Bonsai.System" version="2.9.0" />
<Package id="Bonsai.System.Design" version="2.9.0" />
<Package id="Bonsai.Vision" version="2.7.0" />
<Package id="Bonsai.Vision" version="2.9.0" />
<Package id="Bonsai.Vision.Design" version="2.9.0" />
<Package id="Bonsai.VR" version="0.6.0" />
<Package id="Bonsai.Windows.Input" version="2.9.0" />
<Package id="BonVision" version="0.11.0" />
Expand All @@ -29,6 +33,7 @@
<Package id="Newtonsoft.Json" version="13.0.3" />
<Package id="OpenCV.Net" version="3.4.2" />
<Package id="OpenTK" version="3.1.0" />
<Package id="OpenTK.GLControl" version="3.1.0" />
<Package id="Rx-Core" version="2.2.5" />
<Package id="Rx-Interfaces" version="2.2.5" />
<Package id="Rx-Linq" version="2.2.5" />
Expand All @@ -40,17 +45,21 @@
<Package id="System.Numerics.Vectors" version="4.6.0" />
<Package id="System.Resources.Extensions" version="8.0.0" />
<Package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" />
<Package id="UclOpen.Core" version="0.1.3-dev0" />
<Package id="UclOpen.Devices" version="0.1.3-dev0" />
<Package id="UclOpen.Core" version="0.1.2-dev0" />

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Downgraded package? In future we must have a way to lock the version of acquisition to rigs schemas.

<Package id="UclOpen.Devices" version="0.1.2-dev0" />
<Package id="UclOpen.Logging" version="0.1.3-dev0" />
<Package id="YamlDotNet" version="16.3.0" />
<Package id="ZedGraph" version="5.1.7" />
</Packages>
<AssemblyReferences>
<AssemblyReference assemblyName="Bonsai" />
<AssemblyReference assemblyName="Bonsai.Core" />
<AssemblyReference assemblyName="Bonsai.Design" />
<AssemblyReference assemblyName="Bonsai.Design.Visualizers" />
<AssemblyReference assemblyName="Bonsai.Dsp" />
<AssemblyReference assemblyName="Bonsai.Editor" />
<AssemblyReference assemblyName="Bonsai.Gui" />
<AssemblyReference assemblyName="Bonsai.Gui.ZedGraph" />
<AssemblyReference assemblyName="Bonsai.Harp" />
<AssemblyReference assemblyName="Bonsai.Numerics" />
<AssemblyReference assemblyName="Bonsai.Scripting.Expressions" />
Expand All @@ -61,6 +70,7 @@
<AssemblyReference assemblyName="Bonsai.System" />
<AssemblyReference assemblyName="Bonsai.System.Design" />
<AssemblyReference assemblyName="Bonsai.Vision" />
<AssemblyReference assemblyName="Bonsai.Vision.Design" />
<AssemblyReference assemblyName="Bonsai.VR" />
<AssemblyReference assemblyName="Bonsai.Windows.Input" />
<AssemblyReference assemblyName="BonVision" />
Expand All @@ -73,8 +83,11 @@
<AssemblyLocation assemblyName="Bonsai" processorArchitecture="MSIL" location="Packages/Bonsai.2.9.0/lib/net48/Bonsai.exe" />
<AssemblyLocation assemblyName="Bonsai.Core" processorArchitecture="MSIL" location="Packages/Bonsai.Core.2.9.0/lib/net472/Bonsai.Core.dll" />
<AssemblyLocation assemblyName="Bonsai.Design" processorArchitecture="MSIL" location="Packages/Bonsai.Design.2.9.0/lib/net472/Bonsai.Design.dll" />
<AssemblyLocation assemblyName="Bonsai.Dsp" processorArchitecture="MSIL" location="Packages/Bonsai.Dsp.2.7.0/lib/net462/Bonsai.Dsp.dll" />
<AssemblyLocation assemblyName="Bonsai.Design.Visualizers" processorArchitecture="MSIL" location="Packages/Bonsai.Design.Visualizers.2.9.0/lib/net472/Bonsai.Design.Visualizers.dll" />
<AssemblyLocation assemblyName="Bonsai.Dsp" processorArchitecture="MSIL" location="Packages/Bonsai.Dsp.2.9.0/lib/net472/Bonsai.Dsp.dll" />
<AssemblyLocation assemblyName="Bonsai.Editor" processorArchitecture="MSIL" location="Packages/Bonsai.Editor.2.9.0/lib/net472/Bonsai.Editor.dll" />
<AssemblyLocation assemblyName="Bonsai.Gui" processorArchitecture="MSIL" location="Packages/Bonsai.Gui.0.2.0/lib/net472/Bonsai.Gui.dll" />
<AssemblyLocation assemblyName="Bonsai.Gui.ZedGraph" processorArchitecture="MSIL" location="Packages/Bonsai.Gui.ZedGraph.0.2.0/lib/net472/Bonsai.Gui.ZedGraph.dll" />
<AssemblyLocation assemblyName="Bonsai.Harp" processorArchitecture="MSIL" location="Packages/Bonsai.Harp.3.6.1/lib/net462/Bonsai.Harp.dll" />
<AssemblyLocation assemblyName="Bonsai.Numerics" processorArchitecture="MSIL" location="Packages/Bonsai.Numerics.0.7.0/lib/net462/Bonsai.Numerics.dll" />
<AssemblyLocation assemblyName="Bonsai.Scripting.Expressions" processorArchitecture="MSIL" location="Packages/Bonsai.Scripting.Expressions.2.9.0/lib/net472/Bonsai.Scripting.Expressions.dll" />
Expand All @@ -84,7 +97,8 @@
<AssemblyLocation assemblyName="Bonsai.Shaders.Rendering" processorArchitecture="MSIL" location="Packages/Bonsai.Shaders.Rendering.0.3.0/lib/net462/Bonsai.Shaders.Rendering.dll" />
<AssemblyLocation assemblyName="Bonsai.System" processorArchitecture="MSIL" location="Packages/Bonsai.System.2.9.0/lib/net472/Bonsai.System.dll" />
<AssemblyLocation assemblyName="Bonsai.System.Design" processorArchitecture="MSIL" location="Packages/Bonsai.System.Design.2.9.0/lib/net472/Bonsai.System.Design.dll" />
<AssemblyLocation assemblyName="Bonsai.Vision" processorArchitecture="MSIL" location="Packages/Bonsai.Vision.2.7.0/lib/net462/Bonsai.Vision.dll" />
<AssemblyLocation assemblyName="Bonsai.Vision" processorArchitecture="MSIL" location="Packages/Bonsai.Vision.2.9.0/lib/net472/Bonsai.Vision.dll" />
<AssemblyLocation assemblyName="Bonsai.Vision.Design" processorArchitecture="MSIL" location="Packages/Bonsai.Vision.Design.2.9.0/lib/net472/Bonsai.Vision.Design.dll" />
<AssemblyLocation assemblyName="Bonsai.VR" processorArchitecture="MSIL" location="Packages/Bonsai.VR.0.6.0/lib/net45/Bonsai.VR.dll" />
<AssemblyLocation assemblyName="Bonsai.Windows.Input" processorArchitecture="MSIL" location="Packages/Bonsai.Windows.Input.2.9.0/lib/net472/Bonsai.Windows.Input.dll" />
<AssemblyLocation assemblyName="BonVision" processorArchitecture="MSIL" location="Packages/BonVision.0.11.0/lib/net462/BonVision.dll" />
Expand All @@ -96,6 +110,7 @@
<AssemblyLocation assemblyName="Newtonsoft.Json" processorArchitecture="MSIL" location="Packages/Newtonsoft.Json.13.0.3/lib/net45/Newtonsoft.Json.dll" />
<AssemblyLocation assemblyName="OpenCV.Net" processorArchitecture="MSIL" location="Packages/OpenCV.Net.3.4.2/lib/net462/OpenCV.Net.dll" />
<AssemblyLocation assemblyName="OpenTK" processorArchitecture="MSIL" location="Packages/OpenTK.3.1.0/lib/net20/OpenTK.dll" />
<AssemblyLocation assemblyName="OpenTK.GLControl" processorArchitecture="MSIL" location="Packages/OpenTK.GLControl.3.1.0/lib/net20/OpenTK.GLControl.dll" />
<AssemblyLocation assemblyName="ScintillaNET" processorArchitecture="MSIL" location="Packages/jacobslusser.ScintillaNET.3.6.3/lib/net40/ScintillaNET.dll" />
<AssemblyLocation assemblyName="SVG" processorArchitecture="MSIL" location="Packages/SvgNet.3.5.0/lib/net462/SVG.dll" />
<AssemblyLocation assemblyName="System.Buffers" processorArchitecture="MSIL" location="Packages/System.Buffers.4.6.0/lib/net462/System.Buffers.dll" />
Expand All @@ -108,12 +123,13 @@
<AssemblyLocation assemblyName="System.Reactive.PlatformServices" processorArchitecture="MSIL" location="Packages/Rx-PlatformServices.2.2.5/lib/net45/System.Reactive.PlatformServices.dll" />
<AssemblyLocation assemblyName="System.Resources.Extensions" processorArchitecture="MSIL" location="Packages/System.Resources.Extensions.8.0.0/lib/net462/System.Resources.Extensions.dll" />
<AssemblyLocation assemblyName="System.Runtime.CompilerServices.Unsafe" processorArchitecture="MSIL" location="Packages/System.Runtime.CompilerServices.Unsafe.6.1.0/lib/net462/System.Runtime.CompilerServices.Unsafe.dll" />
<AssemblyLocation assemblyName="UclOpen.Core" processorArchitecture="MSIL" location="Packages/UclOpen.Core.0.1.3-dev0/lib/net472/UclOpen.Core.dll" />
<AssemblyLocation assemblyName="UclOpen.Devices" processorArchitecture="MSIL" location="Packages/UclOpen.Devices.0.1.3-dev0/lib/net472/UclOpen.Devices.dll" />
<AssemblyLocation assemblyName="UclOpen.Core" processorArchitecture="MSIL" location="Packages/UclOpen.Core.0.1.2-dev0/lib/net472/UclOpen.Core.dll" />
<AssemblyLocation assemblyName="UclOpen.Devices" processorArchitecture="MSIL" location="Packages/UclOpen.Devices.0.1.2-dev0/lib/net472/UclOpen.Devices.dll" />
<AssemblyLocation assemblyName="UclOpen.Logging" processorArchitecture="MSIL" location="Packages/UclOpen.Logging.0.1.3-dev0/lib/net472/UclOpen.Logging.dll" />
<AssemblyLocation assemblyName="WeifenLuo.WinFormsUI.Docking" processorArchitecture="MSIL" location="Packages/DockPanelSuite.3.1.1/lib/net40/WeifenLuo.WinFormsUI.Docking.dll" />
<AssemblyLocation assemblyName="WeifenLuo.WinFormsUI.Docking.ThemeVS2015" processorArchitecture="MSIL" location="Packages/DockPanelSuite.ThemeVS2015.3.1.1/lib/net40/WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll" />
<AssemblyLocation assemblyName="YamlDotNet" processorArchitecture="MSIL" location="Packages/YamlDotNet.16.3.0/lib/net47/YamlDotNet.dll" />
<AssemblyLocation assemblyName="ZedGraph" processorArchitecture="MSIL" location="Packages/ZedGraph.5.1.7/lib/net35-Client/ZedGraph.dll" />
</AssemblyLocations>
<LibraryFolders>
<LibraryFolder path="Packages/AssimpNet.4.1.0/runtimes/win-x64/native" platform="x64" />
Expand Down
44 changes: 34 additions & 10 deletions .bonsai/Settings/src/main.editor
Original file line number Diff line number Diff line change
@@ -1,27 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<EditorSettings Version="2.9.0">
<DockPanel FormatVersion="1.0" DockLeftPortion="0.25" DockRightPortion="0.25" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="0" ActivePane="0">
<Contents Count="3">
<DockPanel FormatVersion="1.0" DockLeftPortion="0.25" DockRightPortion="0.25" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="1" ActivePane="1">
<Contents Count="4">
<Content ID="0" PersistString="WorkflowFindToolWindow" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="1" PersistString="WatchToolWindow" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="WorkflowDockContent" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="WorkflowDockContent:5.3.6" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="3" PersistString="WorkflowDockContent:5.7.6" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
</Contents>
<Panes Count="2">
<Pane ID="0" DockState="Document" ActiveContent="2">
<Panes Count="4">
<Pane ID="0" DockState="DockBottom" ActiveContent="1">
<Contents Count="2">
<Content ID="0" RefID="1" />
<Content ID="1" RefID="0" />
</Contents>
</Pane>
<Pane ID="1" DockState="Document" ActiveContent="3">
<Contents Count="2">
<Content ID="0" RefID="3" />
<Content ID="1" RefID="2" />
</Contents>
</Pane>
<Pane ID="2" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="2" />
</Contents>
</Pane>
<Pane ID="1" DockState="DockBottom" ActiveContent="1">
<Pane ID="3" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="1" />
<Content ID="0" RefID="3" />
</Contents>
</Pane>
</Panes>
<DockWindows>
<DockWindow ID="0" DockState="Document" ZOrderIndex="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Right" Proportion="0.5" />
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</DockWindow>
<DockWindow ID="1" DockState="DockLeft" ZOrderIndex="3">
Expand All @@ -35,10 +48,21 @@
</DockWindow>
<DockWindow ID="4" DockState="DockBottom" ZOrderIndex="2">
<NestedPanes Count="1">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Right" Proportion="0.5" />
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</DockWindow>
</DockWindows>
<FloatWindows Count="0" />
<FloatWindows Count="2">
<FloatWindow ID="0" Bounds="467, 434, 320, 205" ZOrderIndex="0">
<NestedPanes Count="1">
<Pane ID="0" RefID="2" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
<FloatWindow ID="1" Bounds="348, 241, 320, 240" ZOrderIndex="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="3" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
</FloatWindows>
</DockPanel>
</EditorSettings>
Loading