ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - eee2a6a0c86b

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Jason Maltzen (jmaltzen) - 9 years ago 2016-03-04 06:23:05
jason.maltzen@unsanctioned.net

Loosen checks on testing for papyrus texture some more. Allow for a bit of error there, as long as everything else checks out.

3 files changed with 20 insertions and 17 deletions:

MainWindow.cs

ReactionRecorder.cs

gtk-gui/MainWindow.cs

0 comments (0 inline, 0 general)

MainWindow.cs

➞

Show inline comments

 /*
  * Copyright (c) 2010, Tess Snider
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 */
 using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Gtk;
 using DesertPaintLab;
 public partial class MainWindow : Gtk.Window
+{
-    const string APP_VERSION = "1.7.13";
+    const string APP_VERSION = "1.7.14";
 	bool unsavedData = false;
 	bool shouldShutDown = false;
 	List<string> profileList = new List<string>();
 	PlayerProfile profile = null;
 	Gdk.Window rootWindow = null;
 	Gdk.Pixbuf screenBuffer = null;
     // views
     RecipeGeneratorView generatorView;
     SimulatorView simulatorView;
     CaptureView captureView;
 	public bool ShouldShutDown
+	{
 		get
+		{
 			return shouldShutDown;
+		}
+	}
 	public MainWindow () : base(Gtk.WindowType.Toplevel)
+	{
         string appDataPath = FileUtils.AppDataPath;
 		if (!System.IO.Directory.Exists(appDataPath))
+		{
 			System.IO.Directory.CreateDirectory(appDataPath);
+		}
 		DirectoryInfo di = new DirectoryInfo(appDataPath);
 		DirectoryInfo[] dirs = di.GetDirectories();
 		foreach (DirectoryInfo dir in dirs)
+		{
 			if (dir.Name != "template")
+			{
 				profileList.Add(dir.Name);
+			}
+		}
         string colorsPath = FileUtils.FindApplicationResourceFile("colors.txt");
         if (colorsPath == null)
+        {
             // failed to find colors.txt file
             MessageDialog md = new MessageDialog(this,
                 DialogFlags.DestroyWithParent,
                 MessageType.Error, ButtonsType.Close,
                 "Failed to find colors.txt file. Please check your installation.");
             md.Run();
             md.Destroy();
             Application.Quit();
+        }
 		Palette.Load(colorsPath);
         string ingredientsPath = FileUtils.FindApplicationResourceFile("ingredients.txt");
         if (ingredientsPath == null)
+        {
             // failed to find ingredients.txt file
             MessageDialog md = new MessageDialog(this,
                 DialogFlags.DestroyWithParent,
                 MessageType.Error, ButtonsType.Close,
                 "Failed to find ingredients.txt file. Please check your installation.");
             md.Run();
             md.Destroy();
             Application.Quit();
+        }
         ReagentManager.Load(ingredientsPath);
 		Build();
 		// get the root window
 		rootWindow = Gdk.Global.DefaultRootWindow;
 		// get its width and height
         int screenWidth;
         int screenHeight;
 		rootWindow.GetSize(out screenWidth, out screenHeight);
         int pixelMultiplier = 1;
         if ( DesertPaintLab.AppSettings.Load() == true )
+        {
             DesertPaintLab.AppSettings.Get("ScreenWidth", out screenWidth);
             DesertPaintLab.AppSettings.Get("ScreenHeight", out screenHeight);
             DesertPaintLab.AppSettings.Get("PixelMultiplier", out pixelMultiplier);
+        }
         bool enableDebugMenu;
         DesertPaintLab.AppSettings.Get("EnableDebugMenu", out enableDebugMenu);
         this.DebugAction.Visible = enableDebugMenu;
 		ScreenCheckDialog screenCheckDialog = new ScreenCheckDialog();
 		screenCheckDialog.ScreenWidth = screenWidth;
 		screenCheckDialog.ScreenHeight = screenHeight;
         screenCheckDialog.GamePixelWidth = pixelMultiplier;
 		ResponseType resp = (ResponseType)screenCheckDialog.Run();
         screenWidth = screenCheckDialog.ScreenWidth;
         screenHeight = screenCheckDialog.ScreenHeight;
         pixelMultiplier = screenCheckDialog.GamePixelWidth;
 		screenCheckDialog.Destroy();
         DesertPaintLab.AppSettings.Set("ScreenWidth", screenWidth);
         DesertPaintLab.AppSettings.Set("ScreenHeight", screenHeight);
         DesertPaintLab.AppSettings.Set("PixelMultiplier", pixelMultiplier);
         DesertPaintLab.AppSettings.Save();
 		screenBuffer = new Gdk.Pixbuf(Gdk.Colorspace.Rgb, false, 8, screenWidth, screenHeight);
         ReactionRecorder.SetPixelMultiplier(pixelMultiplier);
 		if (!OpenProfile())
+		{
 			shouldShutDown = true;
+		}
         captureView = new CaptureView(profile, screenBuffer);
         generatorView = new RecipeGeneratorView(profile);
         generatorView.SetStatus += OnStatusUpdate;
         generatorView.Started += OnGeneratorRunning;
         generatorView.Stopped += OnGeneratorStopped;
         simulatorView = new SimulatorView(profile);
         contentContainer.Add(captureView);
         captureView.Show();
+	}
 	bool ConfirmedExit()
+	{
 		if (unsavedData)
+		{
 			MessageDialog md = new MessageDialog(this,
 	            DialogFlags.DestroyWithParent,
 	            MessageType.Warning, ButtonsType.OkCancel,
 	            "Your last reaction was unsaved." +
 	            "Are you sure you want to quit?");
 			ResponseType resp = (ResponseType)md.Run();
 			md.Destroy();
 			return (resp == ResponseType.Ok);
+		}
 		return true;
+	}
     protected void OnStatusUpdate(object sender, EventArgs args)
+    {
         StatusUpdateEventArgs statusArgs = (StatusUpdateEventArgs)args;
         statusBar.Push(0, statusArgs.Status);
+    }
     protected void OnGeneratorRunning(object sender, EventArgs args)
+    {
         NewProfileAction.Sensitive = false;
         OpenProfileAction.Sensitive = false;
         ImportProfileAction.Sensitive = false;
         if (captureView != null)
+        {
             captureView.DisableRecord();
+        }
+    }
     protected void OnGeneratorStopped(object sender, EventArgs args)
+    {
         NewProfileAction.Sensitive = true;
         OpenProfileAction.Sensitive = true;
         ImportProfileAction.Sensitive = true;
         if (captureView != null)
+        {
             captureView.EnableRecord();
+        }
+    }
 	void SetProfileName(string name)
+	{
 		profile = new PlayerProfile(name,
             System.IO.Path.Combine(FileUtils.AppDataPath, name));
+	}
     void ProfileChanged()
+    {
         statusBar.Push(0, "Profile: " + profile.Name);
         Title  = "Desert Paint Lab - " + profile.Name;
         if (generatorView != null)
+        {
             generatorView.Profile = profile;
+        }
         if (simulatorView != null)
+        {
             simulatorView.Profile = profile;
+        }
         if (captureView != null)
+        {
             captureView.Profile = profile;
+        }
+    }
 	bool NewProfile()
+	{
 		bool newProfileCreated = false;
 		bool duplicateName = false;
 		NewProfileDialog newProfileDialog = new NewProfileDialog();
 		ResponseType resp = (ResponseType)newProfileDialog.Run();
 		if (resp == ResponseType.Ok)
+		{
 			// Make sure profile doesn't already exist.
 			foreach (string profileName in profileList)
+			{
 				if (profileName.Equals(newProfileDialog.ProfileName))
+				{
 					MessageDialog md = new MessageDialog(this,
 	            		DialogFlags.DestroyWithParent,
 	            		MessageType.Error, ButtonsType.Ok,
 	            		"That profile name already exists.");
 					resp = (ResponseType)md.Run();
 					md.Destroy();
 					duplicateName = true;
 					break;
+				}
+			}
 			if (!duplicateName)
+			{
 				// Set profile name.
 				SetProfileName(newProfileDialog.ProfileName);
                 newProfileCreated = profile.Initialize();
                 if (!newProfileCreated)
+                {
                     MessageDialog md = new MessageDialog(this,
                         DialogFlags.DestroyWithParent,
                         MessageType.Error, ButtonsType.Ok,
                         "Failed to initialize profile: " + profile.LastError);
                     resp = (ResponseType)md.Run();
                     md.Destroy();
                     duplicateName = false;
+                }
                 ProfileChanged();
+			}
+		}
 		newProfileDialog.Destroy();
 		return newProfileCreated;
+	}
 	bool OpenProfile()
+	{
 		bool profileSelected = false;
 		if (profileList.Count > 0)
+		{
 			SelectProfileDialog selectProfileDialog = new SelectProfileDialog();
 			selectProfileDialog.ProfileList = profileList;
 			ResponseType resp = (ResponseType)selectProfileDialog.Run();
 			selectProfileDialog.Destroy();
 			string selectedProfile = selectProfileDialog.SelectedProfile;
 			if ((resp == ResponseType.Ok) && (selectedProfile.Length > 0))
 				// Selected a profile.
+			{
 				SetProfileName(selectedProfile);
 				profileSelected = true;
+			}
 			else if (resp == ResponseType.Accept) // New profile.
+			{
 				profileSelected = NewProfile();
+			}
+		}
 		else
+		{
 			FirstRunDialog firstRunDialog = new FirstRunDialog();
 			ResponseType resp = (ResponseType)firstRunDialog.Run();
 			firstRunDialog.Destroy();
 			if (resp == ResponseType.Ok) // New profile
+			{
 				profileSelected = NewProfile();
+			}
 			else if (resp == ResponseType.Accept) // Import
+			{
 				FileChooserDialog fileDialog =
 					new FileChooserDialog("Select reactions.txt file.",
 				    this, FileChooserAction.Open,
 					Gtk.Stock.Cancel, ResponseType.Cancel,
 		            Gtk.Stock.Open, ResponseType.Accept);
 				resp = (ResponseType)fileDialog.Run();
 				if (resp == ResponseType.Accept)
+				{
 					string fileName = fileDialog.Filename;
 					string directory = fileDialog.CurrentFolder;
 					if (fileName == "reactions.txt")
+					{
 						profileSelected = NewProfile();
 						if (profileSelected)
+						{
 							profile.ImportFromPP(directory);
+						}
+					}
+				}
+			}
+		}
 		if (profileSelected)
+		{
 			bool ok = profile.Load();
             if (ok)
+            {
                 ProfileChanged();
+            }
             else
+            {
                 MessageDialog md = new MessageDialog(this,
                     DialogFlags.DestroyWithParent,
                     MessageType.Error, ButtonsType.Ok,
                     "Error loading profile: " + profile.LastError);
                 md.Run();
                 md.Destroy();
                 profileSelected = false;
+            }
+		}
 		return profileSelected;
+	}
 	protected void OnDeleteEvent(object sender, DeleteEventArgs a)
+	{
 		if (ConfirmedExit())
+		{
 			a.RetVal = true;
 			Application.Quit();
+		}
 		else
+		{
 			a.RetVal = false;
+		}
+	}
     protected virtual void OnDebugScreenshot(object sender, System.EventArgs e)
+    {
         int screenWidth, screenHeight;
         rootWindow.GetSize(out screenWidth, out screenHeight);
         DesertPaintLab.AppSettings.Get("ScreenWidth", out screenWidth);
         DesertPaintLab.AppSettings.Get("ScreenHeight", out screenHeight);
         Gdk.Image rootImage = rootWindow.GetImage(0, 0, screenWidth, screenHeight);
         screenBuffer.GetFromImage(rootImage, rootImage.Colormap, 0, 0, 0, 0, screenWidth, screenHeight);
         string screenshotDir = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
         string filename;
         int i = 0;
         do
+        {
             ++i;
             filename = System.IO.Path.Combine(screenshotDir, String.Format("DesertPaintLab_{0}.png", i));
         } while (System.IO.File.Exists(filename));
         screenBuffer.Save(filename, "png");
+    }
 	protected virtual void OnNewProfile(object sender, System.EventArgs e)
+	{
 		if (unsavedData)
+		{
 			MessageDialog md = new MessageDialog(this,
 	            DialogFlags.DestroyWithParent,
 	            MessageType.Warning, ButtonsType.OkCancel,
 	            "Your last reaction was unsaved." +
 	            "Are you sure you want to lose your changes?");
 			ResponseType resp = (ResponseType)md.Run();
 			md.Destroy();
 			if (resp != ResponseType.Ok)
+			{
 				return;
+			}
+		}
 		if (NewProfile())
+		{
 			bool ok = profile.Load();
             if (ok)
+            {
                 ProfileChanged();
+            }
             else
+            {
                 MessageDialog md = new MessageDialog(this,
                     DialogFlags.DestroyWithParent,
                     MessageType.Warning, ButtonsType.OkCancel,
                     "Failed to load profile: " + profile.LastError);
                 md.Run();
                 md.Destroy();
+            }
+		}
+	}
 	protected virtual void OnOpenProfile(object sender, System.EventArgs e)
+	{
 		bool profileSelected = false;
 		SelectProfileDialog selectProfileDialog = new SelectProfileDialog();
 		selectProfileDialog.ProfileList = profileList;
 		ResponseType resp = (ResponseType)selectProfileDialog.Run();
 		selectProfileDialog.Destroy();
 		if (resp == ResponseType.Ok) // Selected a profile.
+		{
 			SetProfileName(selectProfileDialog.SelectedProfile);
 			profileSelected = true;
+		}
 		else if (resp == ResponseType.Accept) // New profile.
+		{
 			profileSelected = NewProfile();
+		}
 		if (profileSelected)
+		{
 			bool ok = profile.Load();
             if (ok)
+            {
                 ProfileChanged();
+            }
             else
+            {
                 MessageDialog md = new MessageDialog(this,
                     DialogFlags.DestroyWithParent,
                     MessageType.Warning, ButtonsType.OkCancel,
                     "Failed to load profile: " + profile.LastError);
                 md.Run();
                 md.Destroy();
+            }
+		}
+	}
 	protected virtual void OnAbout(object sender, System.EventArgs e)
+	{
 		AboutDialog aboutDialog = new AboutDialog();
         aboutDialog.ProgramName = "Desert Paint Lab";
         aboutDialog.Version = APP_VERSION ;
         aboutDialog.Comments = "Desert Paint Lab paint reaction recorder for A Tale in the Desert";
         aboutDialog.Authors = new string [] {"Tess Snider", "Jason Maltzen"};
         //aboutDialog.Website = "http://www.google.com/";
 		aboutDialog.Run();
 		aboutDialog.Destroy();
+	}
 	protected virtual void OnMenuExit (object sender, System.EventArgs e)
+	{
 		if (ConfirmedExit())
+		{
 			Application.Quit();
+		}
+	}
 	protected virtual void OnExportToPracticalPaint(object sender, System.EventArgs e)
+	{
 		FileChooserDialog fileDialog =
 			new FileChooserDialog("Select destination file.",
 				    this, FileChooserAction.Save,
 			        Gtk.Stock.Cancel, ResponseType.Cancel,
 		            Gtk.Stock.Save, ResponseType.Accept);
 		ResponseType resp = (ResponseType)fileDialog.Run();
 		if (resp == ResponseType.Accept)
+		{
 			string fileName = fileDialog.Filename;
 			string directory = fileDialog.CurrentFolder;
 			profile.SaveToPP(System.IO.Path.Combine(directory, fileName));
+		}
 		fileDialog.Destroy();
+	}
     protected void OnShowReactionStatus(object sender, EventArgs e)
+    {
         ReactionStatusWindow win = new ReactionStatusWindow(profile);
         win.Show();
+    }
     protected void OnExportProfile(object sender, EventArgs e)
+    {
         FileChooserDialog fileDialog =
             new FileChooserDialog("Select destination file.",
                     this, FileChooserAction.Save,
                     Gtk.Stock.Cancel, ResponseType.Cancel,
                     Gtk.Stock.Save, ResponseType.Accept);
         ResponseType resp = (ResponseType)fileDialog.Run();
         if (resp == ResponseType.Accept)
+        {
             string fileName = fileDialog.Filename;
             string directory = fileDialog.CurrentFolder;
             string targetFile = System.IO.Path.Combine(directory, fileName);
             if (File.Exists(targetFile))
+            {
                 // prompt to overwrite
                 MessageDialog md = new MessageDialog(this,
                     DialogFlags.DestroyWithParent,
                     MessageType.Warning, ButtonsType.OkCancel,
                     "Overwrite file at " +
                     targetFile + "?");
                 resp = (ResponseType)md.Run();
                 md.Destroy();
                 if (resp == ResponseType.Ok)
+                {
                     File.Delete(targetFile);
                     profile.Export(targetFile);
+                }
+            }
             else
+            {
                 profile.Export(targetFile);
+            }
+        }
         fileDialog.Destroy();
+    }
     protected void OnImportProfile(object sender, EventArgs e)
+    {
         FileChooserDialog fileDialog =

ReactionRecorder.cs

➞

Show inline comments

 /*
  * Copyright (c) 2015, Jason Maltzen
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 */
 using System;
 namespace DesertPaintLab
+{
     // ReactionRecorder - business logic for recording paint reactions
     public class ReactionRecorder
+    {
         const int COLOR_TOLERANCE = 3;
         const int DEFAULT_SWATCH_HEIGHT = 24; // including top and bottom borders
         const int DEFAULT_SWATCH_WIDTH = 260;
         const int DEFAULT_COLOR_BAR_WIDTH = 306;
         const int DEFAULT_RED_BAR_SPACING = 32;
         const int DEFAULT_GREEN_BAR_SPACING = 42;
         const int DEFAULT_BLUE_BAR_SPACING = 52;
         const int DEFAULT_SWATCH_TEST_WIDTH = 26; // width to test on ends of swatch (10% on either end)
         static int swatchHeight = DEFAULT_SWATCH_HEIGHT;
         static int swatchWidth = DEFAULT_SWATCH_WIDTH;
         static int swatchTestWidth = DEFAULT_SWATCH_TEST_WIDTH;
         static int colorBarWidth = DEFAULT_COLOR_BAR_WIDTH;
         static int redBarSpacing = DEFAULT_RED_BAR_SPACING;
         static int greenBarSpacing = DEFAULT_GREEN_BAR_SPACING;
         static int blueBarSpacing = DEFAULT_BLUE_BAR_SPACING;
         static int pixelMultiplier = 1;
         private static bool IsPapyTexture(byte r, byte g, byte b)
+        {
             // red between 208 and 244
             // green between 192 and 237
             // blue between 145 and 205
             return ((r > 0xD0) && (g >= 0xC0) && (b >= 0x91)) &&
                    ((r < 0xF4) && (g <= 0xED) && (b <= 0xCD));
+        }
         public static void SetPixelMultiplier(int pixelMultiplier)
+        {
             swatchHeight    = DEFAULT_SWATCH_HEIGHT * pixelMultiplier;
             swatchWidth     = DEFAULT_SWATCH_WIDTH * pixelMultiplier;
             colorBarWidth   = DEFAULT_COLOR_BAR_WIDTH * pixelMultiplier;
             redBarSpacing   = DEFAULT_RED_BAR_SPACING * pixelMultiplier;
             greenBarSpacing = DEFAULT_GREEN_BAR_SPACING * pixelMultiplier;
             blueBarSpacing  = DEFAULT_BLUE_BAR_SPACING * pixelMultiplier;
             swatchTestWidth = DEFAULT_SWATCH_TEST_WIDTH * pixelMultiplier;
             ReactionRecorder.pixelMultiplier = pixelMultiplier;
+        }
         unsafe private static void ColorAt(byte *pixBytes, int x, int y, int stride, out byte r, out byte g, out byte b)
+        {
             int pixelStart = (y * stride) + (x * 3);
                     r = pixBytes[pixelStart];
                     g = pixBytes[pixelStart + 1];
                     b = pixBytes[pixelStart + 2];
+        }
         private static bool IsDarkPixel(int r, int g, int b)
+        {
             return ((r < 0x46) && (g < 0x46) && (b < 0x47));
+        }
         private static bool IsColorMatch(byte test_r, byte test_g, byte test_b, byte target_r, byte target_g, byte target_b)
+        {
             return ((Math.Abs(test_r - target_r) <= COLOR_TOLERANCE) &&
                 (Math.Abs(test_g - target_g) <= COLOR_TOLERANCE) &&
                 (Math.Abs(test_b - target_b) <= COLOR_TOLERANCE));
+        }
         unsafe private static bool IsPossibleSwatchSlice(byte* pixBytes, int x, int y, int stride)
+        {
             int testPixelStart = (y * stride) + (x * 3);
             byte r = pixBytes[testPixelStart];
             byte g = pixBytes[testPixelStart+1];
             byte b = pixBytes[testPixelStart+2];
             bool isDarkPixel = false;
             bool isPapyAbove = false;
             bool isPapyBelow = false;
             //bool isPapyAbove = false;
             //bool isPapyBelow = false;
             // 1.) Check if the top pixel is a dark pixel.
             isDarkPixel = IsDarkPixel(r, g, b); // ((r < 0x46) && (g < 0x46) && (b < 0x46));
             // 2.) Check the pixel above it to see if it's from the papy texture.
             int otherPixelStart = testPixelStart - stride;
             isPapyAbove = ((otherPixelStart >= 0) &&
                 IsPapyTexture(pixBytes[otherPixelStart++], pixBytes[otherPixelStart++], pixBytes[otherPixelStart]));
             //// 2.) Check the pixel above it to see if it's from the papy texture.
             //int otherPixelStart = testPixelStart - stride;
             //isPapyAbove = ((otherPixelStart >= 0) &&
             //    IsPapyTexture(pixBytes[otherPixelStart++], pixBytes[otherPixelStart++], pixBytes[otherPixelStart]));
             // 3.) Check the pixel below where the swatch should be to see if it's also from the papy texture.
             otherPixelStart = testPixelStart + (stride * swatchHeight);
             isPapyBelow = (IsPapyTexture(pixBytes[otherPixelStart++], pixBytes[otherPixelStart++], pixBytes[otherPixelStart]));
             //// 3.) Check the pixel below where the swatch should be to see if it's also from the papy texture.
             //otherPixelStart = testPixelStart + (stride * swatchHeight);
             //isPapyBelow = (IsPapyTexture(pixBytes[otherPixelStart++], pixBytes[otherPixelStart++], pixBytes[otherPixelStart]));
             bool result = isDarkPixel && isPapyAbove && isPapyBelow;
             //bool result = isDarkPixel && isPapyAbove && isPapyBelow;
             bool result = isDarkPixel;
             // grab the swatch color
             int swatchColorStart = testPixelStart + (2 * pixelMultiplier * stride); // 2 rows below the test pixel, skipping the faded color
             r = pixBytes[swatchColorStart];
             g = pixBytes[swatchColorStart+1];
             b = pixBytes[swatchColorStart+2];
             // scan the column from 2 below the top to 2 above the bottom to ensure the color matches
             for (int i = (2*pixelMultiplier); result && (i < swatchHeight-(2*pixelMultiplier)); ++i)
+            {
                 otherPixelStart = testPixelStart + (stride * i);
+                int otherPixelStart = testPixelStart + (stride * i);
                 result &= IsColorMatch(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2], r, g, b);
+            }
             return result;
+        }
         unsafe private static bool IsPossibleSwatchUpperLeft(byte* pixBytes, int x, int y, int stride)
+        {
             int testPixelStart = (y * stride) + (x * 3);
             bool result = true;
             // test the left edge for dark pixels
             for (int i = 0; result && (i < swatchHeight-pixelMultiplier); ++i)
+            {
                 int otherPixelStart = testPixelStart + (stride * i);
                 result &= IsDarkPixel(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
+            }
             // test the dark top border and for papyrus below the swatch
             // test the dark top border and for papyrus above and below the swatch
             int papyErrorCount = 0;
             for (int i = 0; result && (i < swatchWidth); ++i)
+            {
                 int otherPixelStart = testPixelStart + (3 * i);
                 result &= IsDarkPixel(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
                 otherPixelStart = otherPixelStart - stride;
-                result &= IsPapyTexture(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
+                papyErrorCount += (IsPapyTexture(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]) ? 1 : 0);
                 otherPixelStart = testPixelStart + (stride * swatchHeight) + (3 * i);
                 result &= IsPapyTexture(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
                 papyErrorCount += (IsPapyTexture(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]) ? 1 : 0);
                 result &= (papyErrorCount < (swatchWidth / 20)); // allow up to 5% error rate checking for papy texture, because this seems to be inconsistent
+            }
             return result;
+        }
         unsafe public static bool CaptureReaction(byte* pixBytes, int screenshotWidth, int screenshotHeight, int stride, ref PaintColor reactedColor, ref int redPixelStart)
+        {
             byte pixel_r, pixel_g, pixel_b;
             int pixelStart, otherPixelStart;
             bool colorMatch = true;
             for (int x = 0; x < screenshotWidth - colorBarWidth; ++x)
+            {
                 for (int y = 0; y < (screenshotHeight - (blueBarSpacing + 1)  /*53*/); ++y)
+                {
                     // Look for the color swatch.
                     pixelStart = (y * stride) + (x * 3);
                     pixel_r = pixBytes[pixelStart];
                     pixel_g = pixBytes[pixelStart + 1];
                     pixel_b = pixBytes[pixelStart + 2];
                     bool foundSwatch = IsPossibleSwatchUpperLeft(pixBytes, x, y, stride); // ((pixel_r < 0x46) && (pixel_g < 0x46) && (pixel_b < 0x46));
                     if (foundSwatch)
+                    {
                         int borderXOffset = 0;
                         for (borderXOffset = (2 * pixelMultiplier); foundSwatch && (borderXOffset < swatchTestWidth); ++borderXOffset)
+                        {
                             foundSwatch &= IsPossibleSwatchSlice(pixBytes, x + borderXOffset, y, stride);
                             foundSwatch &= IsPossibleSwatchSlice(pixBytes, x + swatchWidth - borderXOffset, y, stride);
+                        }
+                    }
                     if (foundSwatch)
+                    {
                         // found a swatch with an appropriate dark top border with papyrus texture above it and papyrus a jump below it
                         // 4.) Scan the left border of the potential swatch
                         // location.
                         colorMatch = true;
-                        for (int i = 1; i < swatchHeight - 2; ++i)
+                        for (int i = 2; i < swatchHeight - (2 * pixelMultiplier); ++i)
+                        {
                             otherPixelStart = pixelStart + (stride * i);
                             if (!IsColorMatch(pixel_r, pixel_g, pixel_b, pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]))
+                            {
                                 colorMatch = false;
                                 break;
+                            }
+                        }
                         if (colorMatch)
+                        {
                             // WE FOUND THE SWATCH!
                             // Now we know where the color bars are.
                             redPixelStart = pixelStart + (redBarSpacing * stride);
                             int redPixelCount = 0;
                             while ((pixBytes[redPixelStart] > 0x9F) &&
                                    (pixBytes[redPixelStart + 1] < 0x62) &&
                                    (pixBytes[redPixelStart + 2]  < 0x62))
+                            {
                                 redPixelCount++;
                                 // pixBytes[redPixelStart] = 0x00;
                                 // pixBytes[redPixelStart + 1] = 0xFF;
                                 // pixBytes[redPixelStart + 2] = 0xFF;
                                 redPixelStart += 3;
+                            }
                             reactedColor.Red = (byte)Math.Round((float)redPixelCount * 255f / (float)colorBarWidth);
                             int greenPixelStart = pixelStart + (greenBarSpacing * stride);
                             int greenPixelCount = 0;
                             while ((pixBytes[greenPixelStart] < 0x62) &&
                                    (pixBytes[greenPixelStart + 1] > 0x9F) &&
                                    (pixBytes[greenPixelStart + 2] < 0x62))
+                            {
                                 greenPixelCount++;
                                 // pixBytes[greenPixelStart] = 0x00;
                                 // pixBytes[greenPixelStart + 1] = 0xFF;
                                 // pixBytes[greenPixelStart + 2] = 0xFF;
                                 greenPixelStart += 3;
+                            }
                             reactedColor.Green = (byte)Math.Round((float)greenPixelCount * 255f / (float)colorBarWidth);
                             int bluePixelStart = pixelStart + (blueBarSpacing * stride);
                             int bluePixelCount = 0;
                             while ((pixBytes[bluePixelStart] < 0x62) &&
                                 (pixBytes[bluePixelStart + 1] < 0x62) &&
                                 (pixBytes[bluePixelStart + 2] > 0x9F))
+                            {
                                 bluePixelCount++;
                                 // pixBytes[bluePixelStart] = 0x00;
                                 // pixBytes[bluePixelStart + 1] = 0xFF;
                                 // pixBytes[bluePixelStart + 2] = 0xFF;
                                 bluePixelStart += 3;
+                            }
                             reactedColor.Blue = (byte)Math.Round((float)bluePixelCount * 255f / (float)colorBarWidth);
                             return true;
+                        }
+                    }
+                }
+            }
             return false;
+        }
         public static bool RecordReaction(PlayerProfile profile, PaintColor expectedColor, PaintColor reactedColor, Reagent[] reagents)
+        {
             bool saved = false;
             int r, g, b;
             if (reagents[2] != null)
+            {
                 // A 3-reagent reaction.
                 Reaction reaction1 = profile.FindReaction(reagents[0], reagents[1]);
                 Reaction reaction2 = profile.FindReaction(reagents[0], reagents[2]);
                 Reaction reaction3 = profile.FindReaction(reagents[1], reagents[2]);
                 r = reactedColor.Red - expectedColor.Red;
                 g = reactedColor.Green - expectedColor.Green;
                 b = reactedColor.Blue - expectedColor.Blue;
                 if (reaction2 == null)
+                {
                     r = r - reaction1.Red - reaction3.Red;
                     g = g - reaction1.Green - reaction3.Green;
                     b = b - reaction1.Blue - reaction3.Blue;
                     profile.SetReaction(reagents[0], reagents[2], new Reaction(r, g, b));
                     profile.Save();
                     saved = true;
+                }
                 else if (reaction3 == null)
+                {
                     r = r - reaction1.Red - reaction2.Red;
                     g = g - reaction1.Green - reaction2.Green;
                     b = b - reaction1.Blue - reaction2.Blue;
                     profile.SetReaction(reagents[1], reagents[2], new Reaction(r, g, b));
                     profile.Save();
                     saved = true;
+                }
+            }
             else if ((reagents[0] != null) && (reagents[1] != null))
+            {
                 // A 2-reagent reaction.
                 r = reactedColor.Red - expectedColor.Red;
                 g = reactedColor.Green - expectedColor.Green;
                 b = reactedColor.Blue - expectedColor.Blue;
                 profile.SetReaction(reagents[0], reagents[1], new Reaction(r, g, b));
                 profile.Save();
                 saved = true;
+            }
             return saved;
+        }
+    }
+}

gtk-gui/MainWindow.cs

➞

Show inline comments

 // This file has been generated by the GUI designer. Do not modify.
 public partial class MainWindow
+{
 	private global::Gtk.UIManager UIManager;
 	private global::Gtk.Action FileAction;
 	private global::Gtk.Action HelpAction;
 	private global::Gtk.Action AboutAction;
 	private global::Gtk.Action ExitAction;
 	private global::Gtk.Action DebugAction;
 	private global::Gtk.Action ScreenshotAction;
 	private global::Gtk.Action ReactionStatusAction;
 	private global::Gtk.Action ViewAction;
 	private global::Gtk.RadioAction CaptureAction;
 	private global::Gtk.RadioAction SimulatorAction;
 	private global::Gtk.RadioAction RecipeGeneratorAction;
 	private global::Gtk.Action RecipesAction;
 	private global::Gtk.Action ExportRecipesAction;
 	private global::Gtk.Action CopyRecipesToClipboardAction;
 	private global::Gtk.Action ProfileAction;
 	private global::Gtk.Action NewProfileAction;
 	private global::Gtk.Action OpenProfileAction;
 	private global::Gtk.Action ImportProfileAction;
 	private global::Gtk.Action ExportProfileAction;
 	private global::Gtk.Action ExportForPracticalPaintAction;
 	private global::Gtk.VBox vbox1;
 	private global::Gtk.MenuBar menu;
 	private global::Gtk.Alignment contentContainer;
 	private global::Gtk.Statusbar statusBar;
 	protected virtual void Build ()
+	{
 		global::Stetic.Gui.Initialize (this);
 		// Widget MainWindow
 		this.UIManager = new global::Gtk.UIManager ();
 		global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default");
 		this.FileAction = new global::Gtk.Action ("FileAction", "_File", null, null);
 		this.FileAction.ShortLabel = "_File";
 		w1.Add (this.FileAction, "<Alt>f");
 		this.HelpAction = new global::Gtk.Action ("HelpAction", "_Help", null, null);
 		this.HelpAction.ShortLabel = "_Help";
 		w1.Add (this.HelpAction, "<Alt>a");
 		this.AboutAction = new global::Gtk.Action ("AboutAction", "_About...", null, null);
 		this.AboutAction.ShortLabel = "_About...";
 		w1.Add (this.AboutAction, "<Alt>a");
 		this.ExitAction = new global::Gtk.Action ("ExitAction", "E_xit", null, null);
 		this.ExitAction.ShortLabel = "E_xit";
 		w1.Add (this.ExitAction, "<Alt>x");
 		this.DebugAction = new global::Gtk.Action ("DebugAction", "Debug", null, null);
 		this.DebugAction.ShortLabel = "Debug";
 		w1.Add (this.DebugAction, null);
 		this.ScreenshotAction = new global::Gtk.Action ("ScreenshotAction", "Screenshot", null, null);
 		this.ScreenshotAction.ShortLabel = "Screenshot";
 		w1.Add (this.ScreenshotAction, null);
 		this.ReactionStatusAction = new global::Gtk.Action ("ReactionStatusAction", "Reaction Status", null, null);
 		this.ReactionStatusAction.ShortLabel = "Reaction Status";
 		w1.Add (this.ReactionStatusAction, null);
 		this.ViewAction = new global::Gtk.Action ("ViewAction", "View", null, null);
 		this.ViewAction.ShortLabel = "View";
 		w1.Add (this.ViewAction, null);
 		this.CaptureAction = new global::Gtk.RadioAction ("CaptureAction", "Capture", null, null, 0);
 		this.CaptureAction.Group = new global::GLib.SList (global::System.IntPtr.Zero);
 		this.CaptureAction.ShortLabel = "Capture";
 		w1.Add (this.CaptureAction, null);
 		this.SimulatorAction = new global::Gtk.RadioAction ("SimulatorAction", "Simulator", null, null, 0);
 		this.SimulatorAction.Group = this.CaptureAction.Group;
 		this.SimulatorAction.ShortLabel = "Simulator";
 		w1.Add (this.SimulatorAction, null);
 		this.RecipeGeneratorAction = new global::Gtk.RadioAction ("RecipeGeneratorAction", "Recipe Generator", null, null, 0);
-		this.RecipeGeneratorAction.Group = this.SimulatorAction.Group;
+		this.RecipeGeneratorAction.Group = this.CaptureAction.Group;
 		this.RecipeGeneratorAction.ShortLabel = "Recipe Generator";
 		w1.Add (this.RecipeGeneratorAction, null);
 		this.RecipesAction = new global::Gtk.Action ("RecipesAction", "Recipes...", null, null);
 		this.RecipesAction.ShortLabel = "Recipes...";
 		w1.Add (this.RecipesAction, null);
 		this.ExportRecipesAction = new global::Gtk.Action ("ExportRecipesAction", "Export Recipes", null, null);
 		this.ExportRecipesAction.ShortLabel = "Export Recipes";
 		w1.Add (this.ExportRecipesAction, null);
 		this.CopyRecipesToClipboardAction = new global::Gtk.Action ("CopyRecipesToClipboardAction", "Copy to Clipboard", null, null);
 		this.CopyRecipesToClipboardAction.ShortLabel = "Copy to Clipboard";
 		w1.Add (this.CopyRecipesToClipboardAction, null);
 		this.ProfileAction = new global::Gtk.Action ("ProfileAction", "Profile...", null, null);
 		this.ProfileAction.ShortLabel = "Profile...";
 		w1.Add (this.ProfileAction, null);
 		this.NewProfileAction = new global::Gtk.Action ("NewProfileAction", "New Profile", null, null);
 		this.NewProfileAction.ShortLabel = "New Profile";
 		w1.Add (this.NewProfileAction, null);
 		this.OpenProfileAction = new global::Gtk.Action ("OpenProfileAction", "Open Profile", null, null);
 		this.OpenProfileAction.ShortLabel = "Open Profile";
 		w1.Add (this.OpenProfileAction, null);
 		this.ImportProfileAction = new global::Gtk.Action ("ImportProfileAction", "Import Profile", null, null);
 		this.ImportProfileAction.ShortLabel = "Import Profile";
 		w1.Add (this.ImportProfileAction, null);
 		this.ExportProfileAction = new global::Gtk.Action ("ExportProfileAction", "Export Profile", null, null);
 		this.ExportProfileAction.ShortLabel = "Export Profile";
 		w1.Add (this.ExportProfileAction, null);
 		this.ExportForPracticalPaintAction = new global::Gtk.Action ("ExportForPracticalPaintAction", "Export for PracticalPaint", null, null);
 		this.ExportForPracticalPaintAction.ShortLabel = "Export for PracticalPaint";
 		w1.Add (this.ExportForPracticalPaintAction, null);
 		this.UIManager.InsertActionGroup (w1, 0);
 		this.AddAccelGroup (this.UIManager.AccelGroup);
 		this.Name = "MainWindow";
 		this.Title = "Desert Paint Lab";
 		this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 		// Container child MainWindow.Gtk.Container+ContainerChild
 		this.vbox1 = new global::Gtk.VBox ();
 		this.vbox1.Name = "vbox1";
 		// Container child vbox1.Gtk.Box+BoxChild
 		this.UIManager.AddUiFromString ("<ui><menubar name='menu'><menu name='FileAction' action='FileAction'><menu name='ProfileAction' action='ProfileAction'><menuitem name='NewProfileAction' action='NewProfileAction'/><menuitem name='OpenProfileAction' action='OpenProfileAction'/><menuitem name='ImportProfileAction' action='ImportProfileAction'/><menuitem name='ExportProfileAction' action='ExportProfileAction'/><menuitem name='ExportForPracticalPaintAction' action='ExportForPracticalPaintAction'/></menu><menu name='RecipesAction' action='RecipesAction'><menuitem name='ExportRecipesAction' action='ExportRecipesAction'/><menuitem name='CopyRecipesToClipboardAction' action='CopyRecipesToClipboardAction'/></menu><separator/><menuitem name='ExitAction' action='ExitAction'/></menu><menu name='ViewAction' action='ViewAction'><menuitem name='CaptureAction' action='CaptureAction'/><menuitem name='SimulatorAction' action='SimulatorAction'/><menuitem name='RecipeGeneratorAction' action='RecipeGeneratorAction'/></menu><menu name='HelpAction' action='HelpAction'><menuitem name='AboutAction' action='AboutAction'/><menuitem name='ReactionStatusAction' action='ReactionStatusAction'/></menu><menu name='DebugAction' action='DebugAction'><menuitem name='ScreenshotAction' action='ScreenshotAction'/></menu></menubar></ui>");
 		this.menu = ((global::Gtk.MenuBar)(this.UIManager.GetWidget ("/menu")));
 		this.menu.Name = "menu";
 		this.vbox1.Add (this.menu);
 		global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.menu]));
 		w2.Position = 0;
 		w2.Expand = false;
 		w2.Fill = false;
 		// Container child vbox1.Gtk.Box+BoxChild
 		this.contentContainer = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
 		this.contentContainer.Name = "contentContainer";
 		this.contentContainer.LeftPadding = ((uint)(8));
 		this.contentContainer.TopPadding = ((uint)(6));
 		this.contentContainer.RightPadding = ((uint)(8));
 		this.contentContainer.BottomPadding = ((uint)(5));
 		this.vbox1.Add (this.contentContainer);
 		global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.contentContainer]));
 		w3.Position = 1;
 		// Container child vbox1.Gtk.Box+BoxChild
 		this.statusBar = new global::Gtk.Statusbar ();
 		this.statusBar.Name = "statusBar";
 		this.statusBar.Spacing = 6;
 		this.vbox1.Add (this.statusBar);
 		global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.statusBar]));
 		w4.Position = 2;
 		w4.Expand = false;
 		w4.Fill = false;
 		this.Add (this.vbox1);
 		if ((this.Child != null)) {
 			this.Child.ShowAll ();
+		}
 		this.DefaultWidth = 732;
 		this.DefaultHeight = 384;
 		this.Show ();
 		this.DeleteEvent += new global::Gtk.DeleteEventHandler (this.OnDeleteEvent);
 		this.AboutAction.Activated += new global::System.EventHandler (this.OnAbout);
 		this.ExitAction.Activated += new global::System.EventHandler (this.OnMenuExit);
 		this.ScreenshotAction.Activated += new global::System.EventHandler (this.OnDebugScreenshot);
 		this.ReactionStatusAction.Activated += new global::System.EventHandler (this.OnShowReactionStatus);
 		this.CaptureAction.Toggled += new global::System.EventHandler (this.OnSelectCaptureView);
 		this.SimulatorAction.Toggled += new global::System.EventHandler (this.OnSelectSimulatorView);
 		this.RecipeGeneratorAction.Toggled += new global::System.EventHandler (this.OnSelectRecipeGeneratorView);
 		this.ExportRecipesAction.Activated += new global::System.EventHandler (this.OnExportRecipeListToWiki);
 		this.CopyRecipesToClipboardAction.Activated += new global::System.EventHandler (this.OnCopyRecipeListToClipboard);
 		this.NewProfileAction.Activated += new global::System.EventHandler (this.OnNewProfile);
 		this.OpenProfileAction.Activated += new global::System.EventHandler (this.OnOpenProfile);
 		this.ImportProfileAction.Activated += new global::System.EventHandler (this.OnImportProfile);
 		this.ExportProfileAction.Activated += new global::System.EventHandler (this.OnExportProfile);
 		this.ExportForPracticalPaintAction.Activated += new global::System.EventHandler (this.OnExportToPracticalPaint);
+	}
+}

0 comments (0 inline, 0 general)