Merge pull request #1621 from glopesdev/issue-1620

Fix circle picker rescaling and size conversion issues
bonsai-rx · Nov 13, 2023 · f84aafe · f84aafe
2 parents 9c4db22 + d106b73
commit f84aafe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Bonsai.Vision.Design/Bonsai.Vision.Design.csproj b/Bonsai.Vision.Design/Bonsai.Vision.Design.csproj
@@ -6,7 +6,7 @@
     <PackageTags>Bonsai Rx Vision Visualizers</PackageTags>
     <UseWindowsForms>true</UseWindowsForms>
     <TargetFramework>net462</TargetFramework>
-    <VersionPrefix>2.8.0</VersionPrefix>
+    <VersionPrefix>2.8.1</VersionPrefix>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OpenTK.GLControl" Version="3.1.0" />

diff --git a/Bonsai.Vision.Design/ImageEllipsePicker.cs b/Bonsai.Vision.Design/ImageEllipsePicker.cs
@@ -63,7 +63,7 @@ orderby distance
                                 select (from moveEvt in mouseMove.TakeUntil(mouseUp)
                                         let target = NormalizedLocation(moveEvt.X, moveEvt.Y)
                                         let modifiedRegion = downEvt.Button == MouseButtons.Right
-                                            ? ScaleRegion(region, target, ModifierKeys.HasFlag(Keys.Control))
+                                            ? ScaleRegion(region, target, IsCirclePicker || ModifierKeys.HasFlag(Keys.Control))
                                             : MoveRegion(region, target - location)
                                         let modifiedRectangle = RegionRectangle(modifiedRegion)
                                         where modifiedRectangle.Width > 0 && modifiedRectangle.Height > 0 &&

diff --git a/Bonsai.Vision.Design/IplImageCircleEditor.cs b/Bonsai.Vision.Design/IplImageCircleEditor.cs
@@ -126,15 +126,15 @@ static RotatedRect FromCircle(Circle circle)
             RotatedRect ellipse;
             ellipse.Angle = 0;
             ellipse.Center = circle.Center;
-            ellipse.Size = new Size2f(circle.Radius, circle.Radius);
+            ellipse.Size = new Size2f(circle.Radius * 2, circle.Radius * 2);
             return ellipse;
         }
 
         static Circle ToCircle(RotatedRect ellipse)
         {
             Circle circle;
             circle.Center = ellipse.Center;
-            circle.Radius = ellipse.Size.Width;
+            circle.Radius = ellipse.Size.Width / 2;
             return circle;
         }