Fix: DPI with ML #3

LionelJouin · Nov 4, 2018 · 13aeff4 · 13aeff4
1 parent cffccdf
commit 13aeff4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/PiP-Tool.MachineLearning/DataModel/RegionPrediction.cs b/PiP-Tool.MachineLearning/DataModel/RegionPrediction.cs
@@ -76,18 +76,6 @@ public void Predicted()
             Left = int.Parse(Region.Split(Delimiter)[1]);
             Height = int.Parse(Region.Split(Delimiter)[2]);
             Width = int.Parse(Region.Split(Delimiter)[3]);
-
-            if (Width + Left > WindowWidth)
-                Width = (int)(WindowWidth - Left);
-
-            if (Height + Top > WindowHeight)
-                Height = (int)(WindowHeight - Top);
-
-            if (Height < Constants.MinCropperSize)
-                Height = Constants.MinCropperSize;
-
-            if (Width < Constants.MinCropperSize)
-                Width = Constants.MinCropperSize;
         }
 
         public override string ToString()

diff --git a/PiP-Tool/ViewModels/CropperViewModel.cs b/PiP-Tool/ViewModels/CropperViewModel.cs
@@ -41,7 +41,7 @@ public string Title
         /// Gets selected region
         /// </summary>
         public NativeStructs.Rect SelectedRegion => new NativeStructs.Rect(Left, Top, Width + Left, Top + Height);
-        
+
         public const int DefaultPosition = 0;
         public bool RegionHasBeenModified => Top != DefaultPosition || Left != DefaultPosition ||
                                              Height != Constants.MinCropperSize || Width != Constants.MinCropperSize;
@@ -345,11 +345,23 @@ private void SetRegion(Task<RegionPrediction> obj)
         {
             if (RegionHasBeenModified)
                 return;
-            
-            Top = (int) (obj.Result.Top / _windowInfo.DpiY);
-            Left = (int) (obj.Result.Left / _windowInfo.DpiX);
+
+            Top = (int)(obj.Result.Top / _windowInfo.DpiY);
+            Left = (int)(obj.Result.Left / _windowInfo.DpiX);
             Height = (int)(obj.Result.Height / _windowInfo.DpiY);
             Width = (int)(obj.Result.Width / _windowInfo.DpiX);
+
+            if (Width + Left > WindowWidth)
+                Width = WindowWidth - Left;
+
+            if (Height + Top > WindowHeight)
+                Height = WindowHeight - Top;
+
+            if (Height < Constants.MinCropperSize)
+                Height = Constants.MinCropperSize;
+
+            if (Width < Constants.MinCropperSize)
+                Width = Constants.MinCropperSize;
         }
 
         /// <summary>

diff --git a/PiP-Tool/ViewModels/PiPModeViewModel.cs b/PiP-Tool/ViewModels/PiPModeViewModel.cs
@@ -360,9 +360,6 @@ private void Train()
             var windowNoBorder = _selectedWindow.WindowInfo.RectNoBorder;
             var regionNoBorder = _selectedWindow.SelectedRegionNoBorder;
 
-            //regionNoBorder.Height = (int) (regionNoBorder.Height * _selectedWindow.WindowInfo.DpiY);
-            //regionNoBorder.Width = (int)(regionNoBorder.Width * _selectedWindow.WindowInfo.DpiX);
-
             var region =
                     $"{regionNoBorder.Top} " +
                     $"{regionNoBorder.Left} " +