diff --git a/Bonsai.Vision.Design/Bonsai.Vision.Design.csproj b/Bonsai.Vision.Design/Bonsai.Vision.Design.csproj index 520a55ec..0366827e 100644 --- a/Bonsai.Vision.Design/Bonsai.Vision.Design.csproj +++ b/Bonsai.Vision.Design/Bonsai.Vision.Design.csproj @@ -6,7 +6,7 @@ Bonsai Rx Vision Visualizers true net462 - 2.8.0 + 2.8.1 diff --git a/Bonsai.Vision.Design/ImageEllipsePicker.cs b/Bonsai.Vision.Design/ImageEllipsePicker.cs index 5e162c86..6dabb03e 100644 --- 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 index 4ba7fa7c..e7f53e1e 100644 --- a/Bonsai.Vision.Design/IplImageCircleEditor.cs +++ b/Bonsai.Vision.Design/IplImageCircleEditor.cs @@ -126,7 +126,7 @@ 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; } @@ -134,7 +134,7 @@ static Circle ToCircle(RotatedRect ellipse) { Circle circle; circle.Center = ellipse.Center; - circle.Radius = ellipse.Size.Width; + circle.Radius = ellipse.Size.Width / 2; return circle; }