ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - 0f6c1ddd4b2a

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jason Maltzen (jmaltzen) - 9 years ago 2016-01-15 17:24:47
jason.maltzen@unsanctioned.net

Use new Settings class for managing app settings

1 file changed with 33 insertions and 101 deletions:

MainWindow.cs

101

0 comments (0 inline, 0 general)

MainWindow.cs

➞

Show inline comments

@@ ... / @@ -8,85 +8,75 @@ @@
  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.1.10";
+    const string APP_VERSION = "1.7.11";
 	bool unsavedData = false;
 	bool shouldShutDown = false;
 	string appDataPath;
 	List<string> profileList = new List<string>();
 	PlayerProfile profile = null;
 	PaintColor expectedColor = new PaintColor();
 	PaintColor reactedColor = new PaintColor();
 	int screenWidth = 0;
 	int screenHeight = 0;
 	int pixelMultiplier = 1;
     bool enableDebugMenu = false;
 	Gdk.Window rootWindow = null;
 	Gdk.Pixbuf screenBuffer = null;
     Reagent[] reagents = new Reagent[3];
     PaintRecipe recipe = new PaintRecipe();
 	public bool ShouldShutDown
+	{
 		get
+		{
 			return shouldShutDown;
+		}
+	}
 	public MainWindow () : base(Gtk.WindowType.Toplevel)
+	{
 		appDataPath = System.IO.Path.Combine(
 			Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
 		    "DesertPaintLab");
         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);
+			}
+		}
         reagents[0] = null;
         reagents[1] = null;
         reagents[2] = null;
         string colorsPath = FileUtils.FindApplicationResourceFile("colors.txt");
         if (colorsPath == null)
+        {
             // failed to find colors.txt file
             MessageDialog md = new MessageDialog(this,
@@ ... / @@ -109,178 +99,110 @@ public partial class MainWindow : Gtk.Wi @@
                 MessageType.Error, ButtonsType.Close,
                 "Failed to find ingredients.txt file. Please check your installation.");
             md.Run();
             md.Destroy();
             Application.Quit();
+        }
         ReagentManager.Load(ingredientsPath);
 		Build();
 		if (unmodifiedSwatch != null)
+		{
 			unmodifiedSwatch.Clear();
+		}
 		if (reactionSwatch != null)
+		{
 			reactionSwatch.Clear();
+		}
 		// 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;
         string settingsPath = System.IO.Path.Combine(appDataPath, "settings");
         if (System.IO.File.Exists(settingsPath))
         if ( DesertPaintLab.Settings.Load() == true )
+        {
             LoadSettings(settingsPath);
             DesertPaintLab.Settings.Get("ScreenWidth", out screenWidth);
             DesertPaintLab.Settings.Get("ScreenHeight", out screenHeight);
             DesertPaintLab.Settings.Get("PixelMultiplier", out pixelMultiplier);
+        }
         bool enableDebugMenu;
         DesertPaintLab.Settings.Get("EnableDebugMenu", out enableDebugMenu);
         this.DebugAction.Visible = enableDebugMenu;
 		ScreenCheckDialog screenCheckDialog = new ScreenCheckDialog();
 		screenCheckDialog.ScreenWidth = screenWidth;
 		screenCheckDialog.ScreenHeight = screenHeight;
-		screenCheckDialog.GamePixelWidth = pixelMultiplier;
+        screenCheckDialog.GamePixelWidth = pixelMultiplier;
 		ResponseType resp = (ResponseType)screenCheckDialog.Run();
 		screenWidth = screenCheckDialog.ScreenWidth;
 		screenHeight = screenCheckDialog.ScreenHeight;
 		pixelMultiplier = screenCheckDialog.GamePixelWidth;
         screenWidth = screenCheckDialog.ScreenWidth;
         screenHeight = screenCheckDialog.ScreenHeight;
         pixelMultiplier = screenCheckDialog.GamePixelWidth;
 		screenCheckDialog.Destroy();
         SaveSettings(settingsPath);
         DesertPaintLab.Settings.Set("ScreenWidth", screenWidth);
         DesertPaintLab.Settings.Set("ScreenHeight", screenHeight);
         DesertPaintLab.Settings.Set("PixelMultiplier", pixelMultiplier);
         DesertPaintLab.Settings.Save();
 		screenBuffer = new Gdk.Pixbuf(Gdk.Colorspace.Rgb, false, 8, screenWidth, screenHeight);
         ReactionRecorder.SetPixelMultiplier(pixelMultiplier);
 		if (!OpenProfile())
+		{
 			shouldShutDown = true;
+		}
+	}
     static Regex optionEntry = new Regex(@"(?<opt>[^#=][^=]*)=(?<optval>.*)$");
     void LoadSettings(string file)
+    {
         string line;
         Match match;
         using (StreamReader reader = new StreamReader(file))
+        {
             while ((line = reader.ReadLine()) != null)
+            {
                 match = optionEntry.Match(line);
                 if (match.Success)
+                {
                     String optName = match.Groups["opt"].Value.ToLower();
                     String optVal = match.Groups["optval"].Value.Trim();
                     switch (optName)
+                    {
                         case "screenwidth":
                             try {
                                 int val = Int32.Parse(optVal);
                                 if (val > 0)
+                                {
                                     screenWidth = val;
+                                }
                             } catch (FormatException) {
                                 // ignore
+                            }
                             break;
                         case "screenheight":
                             try {
                                 int val = Int32.Parse(optVal);
                                 if (val > 0)
+                                {
                                     screenHeight = val;
+                                }
                             } catch (FormatException) {
                                 // ignore
+                            }
                             break;
                         case "pixelmultiplier":
                             try {
                                 int val = Int32.Parse(optVal);
                                 if (val > 0)
+                                {
                                     pixelMultiplier = val;
+                                }
                             } catch (FormatException) {
                                 // ignore
+                            }
                             break;
                         case "debug":
                             try {
                                 bool val = Boolean.Parse(optVal.ToLower());
                                 enableDebugMenu = val;
                             } catch (FormatException) {
                                 // ignore
+                            }
                             break;
                         default:
                             // ignore
                             break;
+                    }
+                }
+            }
+        }
+    }
     void SaveSettings(string file)
+    {
         using (StreamWriter writer = new StreamWriter(file))
+        {
             writer.WriteLine("screenwidth={0}", screenWidth);
             writer.WriteLine("screenheight={0}", screenHeight);
             writer.WriteLine("pixelmultiplier={0}", pixelMultiplier);
             writer.WriteLine("debug={0}", enableDebugMenu);
+        }
+    }
 	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;
+	}
 	void SetProfileName(string name)
+	{
 		profile = new PlayerProfile(name,
-		                System.IO.Path.Combine(appDataPath, name));
+            System.IO.Path.Combine(FileUtils.AppDataPath, name));
 		statusBar.Push(0, name);
+	}
 	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 == 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;
@@ ... / @@ -550,97 +472,107 @@ public partial class MainWindow : Gtk.Wi @@
+	}
 	protected void OnDeleteEvent(object sender, DeleteEventArgs a)
+	{
 		if (ConfirmedExit())
+		{
 			a.RetVal = true;
 			Application.Quit();
+		}
 		else
+		{
 			a.RetVal = false;
+		}
+	}
 	bool IsPapyTexture(byte r, byte g, byte b)
+	{
 		return ((r > 0xD0) && (g > 0xC8) && (b > 0xA0)) &&
 				((r < 0xF4) && (g < 0xE0) && (b < 0xC4));
+	}
 	unsafe bool CaptureReactionColor()
+	{
 		// Take a screenshot.
 		Gdk.Image rootImage = rootWindow.GetImage(0, 0, screenWidth, screenHeight);
         int screenWidth, screenHeight;
         bool debugScreenshot = false;
         bool enableDebugMenu = false;
         DesertPaintLab.Settings.Get("ScreenWidth", out screenWidth);
         DesertPaintLab.Settings.Get("ScreenHeight", out screenHeight);
         DesertPaintLab.Settings.Get("EnableDebugMenu", out enableDebugMenu);
         DesertPaintLab.Settings.Get("DebugScreenshot", out debugScreenshot);
         Gdk.Image rootImage = rootWindow.GetImage(0, 0, screenWidth, screenHeight);
 		screenBuffer.GetFromImage(rootImage, rootImage.Colormap, 0, 0, 0, 0, screenWidth, screenHeight);
 		//screenBuffer.GetFromDrawable(rootWindow,
 		//	rootWindow.Colormap, 0, 0, 0, 0, screenWidth, screenHeight);
 		int stride = screenBuffer.Rowstride;
 		byte* pixBytes = (byte*)screenBuffer.Pixels;
         int redPixelStart = -1;
         bool wasCaptured = ReactionRecorder.CaptureReaction(pixBytes, screenWidth, screenHeight, stride, ref reactedColor, ref redPixelStart);
         if (!wasCaptured && enableDebugMenu)
+        if (!wasCaptured && enableDebugMenu && debugScreenshot)
+        {
             // write out the screenshot
             string screenshotDir = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
             string filename;
             int i = 0;
             do
+            {
                 ++i;
                 filename = System.IO.Path.Combine(screenshotDir, String.Format("DesertPaintLab_Colormatch{0}.png", i));
             } while (System.IO.File.Exists(filename));
             screenBuffer.Save(filename, "png");
+        }
         else
+        {
             // convert to pixel offset instead of byte
             int redPixelStartX = (redPixelStart % stride) / 3;
             int redPixelStartY = (redPixelStart / stride);
             // write out the screenshot
             string screenshotDir = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
             string filename;
             int i = 0;
             do
+            {
                 ++i;
                 filename = System.IO.Path.Combine(screenshotDir, String.Format("DesertPaintLab_Colormatch{0}.png", i));
             } while (System.IO.File.Exists(filename));
             int captureAreaWidth = Math.Min(64, screenWidth - redPixelStartX + 64);
-            int captureAreaHeight = Math.Min(64, screenWidth - redPixelStartY + 64);
+            int captureAreaHeight = Math.Min(64, screenHeight - redPixelStartY + 64);
             Gdk.Pixbuf outPixBuf = new Gdk.Pixbuf(screenBuffer, Math.Max(0, redPixelStartX - 16), Math.Max(0, redPixelStartY - 16), captureAreaWidth, captureAreaHeight);
             //screenBuffer.Save(filename, "png");
             outPixBuf.Save(filename, "png");
+        }
         //screenBuffer.Save("screenshot.png", "png");
 		return wasCaptured;
+	}
     protected virtual void OnDebugScreenshot(object sender, System.EventArgs e)
+    {
         int screenWidth, screenHeight;
         DesertPaintLab.Settings.Get("ScreenWidth", out screenWidth);
         DesertPaintLab.Settings.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 OnCaptureButton(object sender, System.EventArgs e)
+	{
 		if (CaptureReactionColor())
+		{
 			string warning = "";
 			if (reactedColor.Red == 0)
+			{
 				warning = warning + "\nRed is too low.";
+			}
 			if (reactedColor.Green == 0)
+			{

0 comments (0 inline, 0 general)