BUGFIX: When calibrated, origin was mirrored.

avosskuehler · Oct 21, 2021 · a77b309 · a77b309
1 parent b17b5bb
commit a77b309
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/VianaNET/Data/VideoData.cs b/VianaNET/Data/VideoData.cs
@@ -529,7 +529,7 @@ private static Point CalibrateSample(DataSample value)
       }
 
       Point origin = App.Project.CalibrationData.OriginInPixel;
-      Point calibratedPoint = new Point(value.PixelX - origin.X, origin.Y - value.PixelY);
+      Point calibratedPoint = new Point(value.PixelX - origin.X, value.PixelY - origin.Y);
 
       calibratedPoint.X = calibratedPoint.X * App.Project.CalibrationData.ScalePixelToUnit;
       calibratedPoint.Y = calibratedPoint.Y * App.Project.CalibrationData.ScalePixelToUnit;

diff --git a/VianaNET/Modules/Video/Dialogs/CalibrateVideoWindow.cs b/VianaNET/Modules/Video/Dialogs/CalibrateVideoWindow.cs
@@ -133,7 +133,7 @@ protected override void ContainerMouseLeftButtonDown(object sender, MouseButtonE
 
       if (!this.originIsSet)
       {
-        App.Project.CalibrationData.OriginInPixel = new Point(originalX, originalY);
+        App.Project.CalibrationData.OriginInPixel = new Point(originalX, Video.Control.Video.Instance.VideoElement.NaturalVideoHeight - originalY);
         this.originIsSet = true;
         this.originPath.Visibility = Visibility.Visible;
         Canvas.SetLeft(this.originPath, scaledX - this.originPath.ActualWidth / 2);

diff --git a/VianaNET/Modules/Video/VideoWindow.xaml.cs b/VianaNET/Modules/Video/VideoWindow.xaml.cs
@@ -715,7 +715,7 @@ private void PlaceCalibration()
       if (this.GetScales(out double scaleX, out double scaleY))
       {
         Canvas.SetLeft(this.OriginPath, App.Project.CalibrationData.OriginInPixel.X * scaleX - this.OriginPath.ActualWidth / 2);
-        Canvas.SetTop(this.OriginPath, App.Project.CalibrationData.OriginInPixel.Y * scaleY - this.OriginPath.ActualHeight / 2);
+        Canvas.SetTop(this.OriginPath, (Video.Instance.VideoElement.NaturalVideoHeight - App.Project.CalibrationData.OriginInPixel.Y) * scaleY - this.OriginPath.ActualHeight / 2);
         this.RulerLine.X1 = App.Project.CalibrationData.RulerStartPointInPixel.X * scaleX;
         this.RulerLine.Y1 = App.Project.CalibrationData.RulerStartPointInPixel.Y * scaleY;
         this.RulerLine.X2 = App.Project.CalibrationData.RulerEndPointInPixel.X * scaleX;