Kaynağa Gözat

fixed bug from previous commit (merge fail)

Alexander Hendrich 11 yıl önce
ebeveyn
işleme
8f91f01534
2 değiştirilmiş dosya ile 1 ekleme ve 2 silme
  1. 1 1
      bbiwarg/Graphics/OutputWindow.cs
  2. 0 1
      bbiwarg/bbiwarg.csproj

+ 1 - 1
bbiwarg/Graphics/OutputWindow.cs

@@ -25,7 +25,7 @@ namespace bbiwarg.Graphics
         private Stopwatch watch;
 
         public OutputWindow(VideoHandle videoHandle)
-            : base((int) (Constants.WindwoSizeFactor * HelperFunctions.thresholdRange<int>(1, Constants.NumImagesPerRow, videoHandle.OutputImages.Length) * videoHandle.Width), 
+            : base((int) (Constants.WindwoSizeFactor * Math.Max(1, Math.Min(Constants.NumImagesPerRow, videoHandle.OutputImages.Length)) * videoHandle.Width), 
                    (int) (Constants.WindwoSizeFactor * (1 + (videoHandle.OutputImages.Length - 1) / Constants.NumImagesPerRow) * videoHandle.Height))
         {
             this.videoHandle = videoHandle;

+ 0 - 1
bbiwarg/bbiwarg.csproj

@@ -88,7 +88,6 @@
     <Compile Include="InputProvider\IisuInputProvider.cs" />
     <Compile Include="MainBBWIWARG.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utility\HelperFunctions.cs" />
     <Compile Include="Utility\Kalman2DPositionFilter.cs" />
     <Compile Include="Utility\Line2D.cs" />
     <Compile Include="Utility\LineSegment2D.cs" />