Patch 1.4.6 - Fixed issue with detecting competitive play screen due to brightness.

Martin Nielsen · Martin Nielsen · commit 51071e2b9f42 · 2019-09-08T19:24:40.000+02:00
TODO: alternative way of detecting
diff --git a/BetterOverwatch/Functions.cs b/BetterOverwatch/Functions.cs
@@ -300,7 +300,10 @@ public static string BitmapToText(Bitmap frame, int x, int y, int width, int hei
                     AdjustContrast(result, 255f, invertColors, limeToWhite);
                 }
                 output = FetchTextFromImage(result, network);
-
+                if(output.StartsWith("70"))
+                {
+                    //result.Save($@"C:\Users\Avoid\Desktop\test\{output}.png", ImageFormat.Png);
+                }
                 result.Dispose();
             }
             catch (Exception e) { Console.WriteLine($"BitmapToText error: {e}"); }
diff --git a/BetterOverwatch/GameMethods.cs b/BetterOverwatch/GameMethods.cs
@@ -13,7 +13,7 @@ class GameMethods
     {
         public static bool IsOnCompetitiveScreen(Bitmap frame)
         {
-            return (Functions.BitmapToText(frame, 76, 204, 78, 28, true, 110, Network.Numbers, false) == "7022");
+            return (Functions.BitmapToText(frame, 76, 204, 78, 28, false, 110, Network.Numbers, false) == "7029");
         }
         public static void ReadRoleRatings(Bitmap frame)
         {
diff --git a/BetterOverwatch/Program.cs b/BetterOverwatch/Program.cs
@@ -22,7 +22,7 @@ internal class Program
         private static void Main()
         {
             AppData.initalize = new Initalize(
-                "1.4.5",
+                "1.4.6",
                 "betteroverwatch.com",
                 "https://api.github.com/repos/MartinNielsenDev/OverwatchTracker/releases/latest");
             Application.EnableVisualStyles();
@@ -32,7 +32,7 @@ private static void Main()
 
             if (!mutex.WaitOne(TimeSpan.Zero, true))
             {
-                MessageBox.Show("Better Overwatch is already running\r\n\r\nYou must close other instances of Better Overwatch if you want to open this one", "", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("Better Overwatch is already running\r\n\r\nYou must close other instances of Better Overwatch if you want to open this one", "Better Overwatch", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
             AppDomain.CurrentDomain.AssemblyResolve += (s, assembly) =>
diff --git a/BetterOverwatch/Properties/AssemblyInfo.cs b/BetterOverwatch/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.5.0")]
-[assembly: AssemblyFileVersion("1.4.5.0")]
+[assembly: AssemblyVersion("1.4.6.0")]
+[assembly: AssemblyFileVersion("1.4.6.0")]
diff --git a/BetterOverwatch/ScreenCaptureHandler.cs b/BetterOverwatch/ScreenCaptureHandler.cs
@@ -10,7 +10,7 @@ namespace BetterOverwatch
 {
     class ScreenCaptureHandler
     {
-        #if DEBUG
+#if DEBUG
         public static bool debug = true;
         #else
         public static bool debug = false;

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,10 @@ public static string BitmapToText(Bitmap frame, int x, int y, int width, int hei`
`300`	`300`	`AdjustContrast(result, 255f, invertColors, limeToWhite);`
`301`	`301`	`}`
`302`	`302`	`output = FetchTextFromImage(result, network);`
`303`		`-`
	`303`	`+ if(output.StartsWith("70"))`
	`304`	`+ {`
	`305`	`+ //result.Save($@"C:\Users\Avoid\Desktop\test\{output}.png", ImageFormat.Png);`
	`306`	`+ }`
`304`	`307`	`result.Dispose();`
`305`	`308`	`}`
`306`	`309`	`catch (Exception e) { Console.WriteLine($"BitmapToText error: {e}"); }`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class GameMethods`
`13`	`13`	`{`
`14`	`14`	`public static bool IsOnCompetitiveScreen(Bitmap frame)`
`15`	`15`	`{`
`16`		`- return (Functions.BitmapToText(frame, 76, 204, 78, 28, true, 110, Network.Numbers, false) == "7022");`
	`16`	`+ return (Functions.BitmapToText(frame, 76, 204, 78, 28, false, 110, Network.Numbers, false) == "7029");`
`17`	`17`	`}`
`18`	`18`	`public static void ReadRoleRatings(Bitmap frame)`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ internal class Program`
`22`	`22`	`private static void Main()`
`23`	`23`	`{`
`24`	`24`	`AppData.initalize = new Initalize(`
`25`		`- "1.4.5",`
	`25`	`+ "1.4.6",`
`26`	`26`	`"betteroverwatch.com",`
`27`	`27`	`"https://api.github.com/repos/MartinNielsenDev/OverwatchTracker/releases/latest");`
`28`	`28`	`Application.EnableVisualStyles();`
`@@ -32,7 +32,7 @@ private static void Main()`
`32`	`32`
`33`	`33`	`if (!mutex.WaitOne(TimeSpan.Zero, true))`
`34`	`34`	`{`
`35`		`- MessageBox.Show("Better Overwatch is already running\r\n\r\nYou must close other instances of Better Overwatch if you want to open this one", "", MessageBoxButtons.OK, MessageBoxIcon.Error);`
	`35`	`+ MessageBox.Show("Better Overwatch is already running\r\n\r\nYou must close other instances of Better Overwatch if you want to open this one", "Better Overwatch", MessageBoxButtons.OK, MessageBoxIcon.Error);`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`	`AppDomain.CurrentDomain.AssemblyResolve += (s, assembly) =>`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace BetterOverwatch`
`10`	`10`	`{`
`11`	`11`	`class ScreenCaptureHandler`
`12`	`12`	`{`
`13`		`- #if DEBUG`
	`13`	`+#if DEBUG`
`14`	`14`	`public static bool debug = true;`
`15`	`15`	`#else`
`16`	`16`	`public static bool debug = false;`