diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index e78a55d..7d95519 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -75,8 +75,6 @@ private void InitializeComponent() this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.zoomLevelsToolStripComboBox = new System.Windows.Forms.ToolStripComboBox(); this.settings_tabPage = new System.Windows.Forms.TabPage(); -<<<<<<< Updated upstream -======= this.showDebugInfo_checkBox = new System.Windows.Forms.CheckBox(); this.useMergeWithGradient_checkBox = new System.Windows.Forms.CheckBox(); this.inMemoryMode_checkBox = new System.Windows.Forms.CheckBox(); @@ -87,7 +85,6 @@ private void InitializeComponent() this.balanceRgb_checkBox = new System.Windows.Forms.CheckBox(); this.balanceAlphas_checkBox = new System.Windows.Forms.CheckBox(); this.useMblend_checkBox = new System.Windows.Forms.CheckBox(); ->>>>>>> Stashed changes this.groupBox8 = new System.Windows.Forms.GroupBox(); this.topMost_checkBox = new System.Windows.Forms.CheckBox(); this.showPopups_checkBox = new System.Windows.Forms.CheckBox(); @@ -99,7 +96,8 @@ private void InitializeComponent() this.threshold_groupBox = new System.Windows.Forms.GroupBox(); this.thresholdBlack_numericUpDown = new System.Windows.Forms.NumericUpDown(); this.label13 = new System.Windows.Forms.Label(); - this.thresholdEnabled_checkBox = new System.Windows.Forms.CheckBox(); + this.thresholdEnabledAlpha_checkBox = new System.Windows.Forms.CheckBox(); + this.thresholdEnabledRbg_checkBox = new System.Windows.Forms.CheckBox(); this.label12 = new System.Windows.Forms.Label(); this.thresholdWhite_numericUpDown = new System.Windows.Forms.NumericUpDown(); this.label35 = new System.Windows.Forms.Label(); @@ -119,8 +117,6 @@ private void InitializeComponent() this.noiseReductionType_comboBox = new System.Windows.Forms.ComboBox(); this.outputFormat_comboBox = new System.Windows.Forms.ComboBox(); this.ignoreSingleColorAlpha_checkBox = new System.Windows.Forms.CheckBox(); - this.balanceRgb_checkBox = new System.Windows.Forms.CheckBox(); - this.balanceAlphas_checkBox = new System.Windows.Forms.CheckBox(); this.splitRGB_checkBox = new System.Windows.Forms.CheckBox(); this.profileModel_comboBox = new System.Windows.Forms.ComboBox(); this.useProfileModel_checkBox = new System.Windows.Forms.CheckBox(); @@ -302,11 +298,8 @@ private void InitializeComponent() this.tableLayoutPanel6.SuspendLayout(); this.toolStrip.SuspendLayout(); this.settings_tabPage.SuspendLayout(); -<<<<<<< Updated upstream -======= this.groupBox13.SuspendLayout(); this.groupBox12.SuspendLayout(); ->>>>>>> Stashed changes this.groupBox8.SuspendLayout(); this.groupBox9.SuspendLayout(); this.groupBox11.SuspendLayout(); @@ -440,7 +433,7 @@ private void InitializeComponent() this.main_tabPage.Location = new System.Drawing.Point(4, 25); this.main_tabPage.Name = "main_tabPage"; this.main_tabPage.Padding = new System.Windows.Forms.Padding(3); - this.main_tabPage.Size = new System.Drawing.Size(1263, 714); + this.main_tabPage.Size = new System.Drawing.Size(980, 752); this.main_tabPage.TabIndex = 0; this.main_tabPage.Text = "Basic"; this.main_tabPage.UseVisualStyleBackColor = true; @@ -462,7 +455,7 @@ private void InitializeComponent() this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1257, 708); + this.tableLayoutPanel1.Size = new System.Drawing.Size(974, 746); this.tableLayoutPanel1.TabIndex = 20; // // panel2 @@ -470,7 +463,7 @@ private void InitializeComponent() this.panel2.Controls.Add(this.progressFiltered_label); this.panel2.Controls.Add(this.progress_label); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(3, 681); + this.panel2.Location = new System.Drawing.Point(3, 719); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(149, 24); this.panel2.TabIndex = 37; @@ -515,7 +508,7 @@ private void InitializeComponent() this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(3, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(149, 672); + this.panel1.Size = new System.Drawing.Size(149, 710); this.panel1.TabIndex = 20; // // button1 @@ -599,8 +592,8 @@ private void InitializeComponent() // this.splitContainer1.Panel2.Controls.Add(this.richTextBox1); this.splitContainer1.Panel2MinSize = 100; - this.splitContainer1.Size = new System.Drawing.Size(1096, 672); - this.splitContainer1.SplitterDistance = 581; + this.splitContainer1.Size = new System.Drawing.Size(813, 710); + this.splitContainer1.SplitterDistance = 430; this.splitContainer1.TabIndex = 21; // // richTextBox1 @@ -612,7 +605,7 @@ private void InitializeComponent() this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(511, 672); + this.richTextBox1.Size = new System.Drawing.Size(379, 710); this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = ""; this.richTextBox1.TextChanged += new System.EventHandler(this.richTextBox1_TextChanged); @@ -620,9 +613,9 @@ private void InitializeComponent() // progressBar1 // this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; - this.progressBar1.Location = new System.Drawing.Point(158, 681); + this.progressBar1.Location = new System.Drawing.Point(158, 719); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(1096, 24); + this.progressBar1.Size = new System.Drawing.Size(813, 24); this.progressBar1.TabIndex = 22; // // previewResult_tabPage @@ -631,7 +624,7 @@ private void InitializeComponent() this.previewResult_tabPage.Controls.Add(this.toolStrip); this.previewResult_tabPage.Location = new System.Drawing.Point(4, 25); this.previewResult_tabPage.Name = "previewResult_tabPage"; - this.previewResult_tabPage.Size = new System.Drawing.Size(1263, 714); + this.previewResult_tabPage.Size = new System.Drawing.Size(980, 752); this.previewResult_tabPage.TabIndex = 5; this.previewResult_tabPage.Text = "Preview result"; this.previewResult_tabPage.UseVisualStyleBackColor = true; @@ -656,7 +649,7 @@ private void InitializeComponent() this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 124F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(1263, 689); + this.tableLayoutPanel3.Size = new System.Drawing.Size(980, 727); this.tableLayoutPanel3.TabIndex = 5; // // zoomImageBox @@ -671,7 +664,7 @@ private void InitializeComponent() this.zoomImageBox.GridScale = Cyotek.Windows.Forms.ImageBoxGridScale.None; this.zoomImageBox.Location = new System.Drawing.Point(3, 3); this.zoomImageBox.Name = "zoomImageBox"; - this.zoomImageBox.Size = new System.Drawing.Size(625, 498); + this.zoomImageBox.Size = new System.Drawing.Size(484, 536); this.zoomImageBox.TabIndex = 0; this.zoomImageBox.TabStop = false; this.zoomImageBox.ImageChanged += new System.EventHandler(this.zoomImageBox_ImageChanged); @@ -690,9 +683,9 @@ private void InitializeComponent() this.previewImageBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.previewImageBox.GridColor = System.Drawing.SystemColors.ControlDarkDark; this.previewImageBox.GridScale = Cyotek.Windows.Forms.ImageBoxGridScale.None; - this.previewImageBox.Location = new System.Drawing.Point(634, 3); + this.previewImageBox.Location = new System.Drawing.Point(493, 3); this.previewImageBox.Name = "previewImageBox"; - this.previewImageBox.Size = new System.Drawing.Size(626, 498); + this.previewImageBox.Size = new System.Drawing.Size(484, 536); this.previewImageBox.SizeMode = Cyotek.Windows.Forms.ImageBoxSizeMode.Fit; this.previewImageBox.TabIndex = 4; this.previewImageBox.MouseDown += new System.Windows.Forms.MouseEventHandler(this.previewImageBox_MouseDown); @@ -705,25 +698,25 @@ private void InitializeComponent() this.previewModels_comboBox.Dock = System.Windows.Forms.DockStyle.Fill; this.previewModels_comboBox.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.previewModels_comboBox.FormattingEnabled = true; - this.previewModels_comboBox.Location = new System.Drawing.Point(634, 507); + this.previewModels_comboBox.Location = new System.Drawing.Point(493, 545); this.previewModels_comboBox.Name = "previewModels_comboBox"; - this.previewModels_comboBox.Size = new System.Drawing.Size(626, 21); + this.previewModels_comboBox.Size = new System.Drawing.Size(484, 21); this.previewModels_comboBox.TabIndex = 6; // // preview_progressBar // this.tableLayoutPanel3.SetColumnSpan(this.preview_progressBar, 2); this.preview_progressBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.preview_progressBar.Location = new System.Drawing.Point(3, 662); + this.preview_progressBar.Location = new System.Drawing.Point(3, 700); this.preview_progressBar.Name = "preview_progressBar"; - this.preview_progressBar.Size = new System.Drawing.Size(1257, 24); + this.preview_progressBar.Size = new System.Drawing.Size(974, 24); this.preview_progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous; this.preview_progressBar.TabIndex = 8; // // splitContainer3 // this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer3.Location = new System.Drawing.Point(3, 507); + this.splitContainer3.Location = new System.Drawing.Point(3, 545); this.splitContainer3.Name = "splitContainer3"; // // splitContainer3.Panel1 @@ -734,8 +727,8 @@ private void InitializeComponent() // this.splitContainer3.Panel2.Controls.Add(this.imageSizeToolStripStatusLabel); this.tableLayoutPanel3.SetRowSpan(this.splitContainer3, 2); - this.splitContainer3.Size = new System.Drawing.Size(625, 149); - this.splitContainer3.SplitterDistance = 239; + this.splitContainer3.Size = new System.Drawing.Size(484, 149); + this.splitContainer3.SplitterDistance = 185; this.splitContainer3.TabIndex = 9; // // miniMapImageBox @@ -761,7 +754,7 @@ private void InitializeComponent() // this.imageSizeToolStripStatusLabel.AutoSize = true; this.imageSizeToolStripStatusLabel.Dock = System.Windows.Forms.DockStyle.Right; - this.imageSizeToolStripStatusLabel.Location = new System.Drawing.Point(340, 0); + this.imageSizeToolStripStatusLabel.Location = new System.Drawing.Point(253, 0); this.imageSizeToolStripStatusLabel.Name = "imageSizeToolStripStatusLabel"; this.imageSizeToolStripStatusLabel.Size = new System.Drawing.Size(42, 13); this.imageSizeToolStripStatusLabel.TabIndex = 0; @@ -773,23 +766,19 @@ private void InitializeComponent() this.tableLayoutPanel6.ColumnCount = 3; this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 49.84026F)); this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.15974F)); -<<<<<<< Updated upstream - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 191F)); -======= this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 210F)); ->>>>>>> Stashed changes this.tableLayoutPanel6.Controls.Add(this.previewUpdate_button, 0, 0); this.tableLayoutPanel6.Controls.Add(this.previewSave_button, 1, 0); this.tableLayoutPanel6.Controls.Add(this.button_previewSaveComparison, 0, 1); this.tableLayoutPanel6.Controls.Add(this.previewSaveOutputFormat_button, 2, 0); this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel6.Location = new System.Drawing.Point(634, 538); + this.tableLayoutPanel6.Location = new System.Drawing.Point(493, 576); this.tableLayoutPanel6.Name = "tableLayoutPanel6"; this.tableLayoutPanel6.RowCount = 1; this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F)); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 59F)); this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel6.Size = new System.Drawing.Size(626, 118); + this.tableLayoutPanel6.Size = new System.Drawing.Size(484, 118); this.tableLayoutPanel6.TabIndex = 10; // // previewUpdate_button @@ -798,11 +787,7 @@ private void InitializeComponent() this.previewUpdate_button.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.previewUpdate_button.Location = new System.Drawing.Point(3, 3); this.previewUpdate_button.Name = "previewUpdate_button"; -<<<<<<< Updated upstream - this.previewUpdate_button.Size = new System.Drawing.Size(210, 75); -======= this.previewUpdate_button.Size = new System.Drawing.Size(130, 53); ->>>>>>> Stashed changes this.previewUpdate_button.TabIndex = 6; this.previewUpdate_button.Text = "Update preview"; this.previewUpdate_button.UseVisualStyleBackColor = true; @@ -812,17 +797,10 @@ private void InitializeComponent() // this.previewSave_button.Dock = System.Windows.Forms.DockStyle.Fill; this.previewSave_button.FlatStyle = System.Windows.Forms.FlatStyle.Popup; -<<<<<<< Updated upstream - this.previewSave_button.Location = new System.Drawing.Point(219, 3); - this.previewSave_button.Name = "previewSave_button"; - this.tableLayoutPanel6.SetRowSpan(this.previewSave_button, 2); - this.previewSave_button.Size = new System.Drawing.Size(212, 112); -======= this.previewSave_button.Location = new System.Drawing.Point(139, 3); this.previewSave_button.Name = "previewSave_button"; this.tableLayoutPanel6.SetRowSpan(this.previewSave_button, 2); this.previewSave_button.Size = new System.Drawing.Size(131, 112); ->>>>>>> Stashed changes this.previewSave_button.TabIndex = 6; this.previewSave_button.Text = "Enhance and save as png"; this.previewSave_button.UseVisualStyleBackColor = true; @@ -832,13 +810,9 @@ private void InitializeComponent() // this.button_previewSaveComparison.Dock = System.Windows.Forms.DockStyle.Fill; this.button_previewSaveComparison.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button_previewSaveComparison.Location = new System.Drawing.Point(3, 84); + this.button_previewSaveComparison.Location = new System.Drawing.Point(3, 62); this.button_previewSaveComparison.Name = "button_previewSaveComparison"; -<<<<<<< Updated upstream - this.button_previewSaveComparison.Size = new System.Drawing.Size(210, 31); -======= this.button_previewSaveComparison.Size = new System.Drawing.Size(130, 53); ->>>>>>> Stashed changes this.button_previewSaveComparison.TabIndex = 7; this.button_previewSaveComparison.Text = "Save comparison to clipboard"; this.button_previewSaveComparison.UseVisualStyleBackColor = true; @@ -848,17 +822,10 @@ private void InitializeComponent() // this.previewSaveOutputFormat_button.Dock = System.Windows.Forms.DockStyle.Fill; this.previewSaveOutputFormat_button.FlatStyle = System.Windows.Forms.FlatStyle.Popup; -<<<<<<< Updated upstream - this.previewSaveOutputFormat_button.Location = new System.Drawing.Point(437, 3); - this.previewSaveOutputFormat_button.Name = "previewSaveOutputFormat_button"; - this.tableLayoutPanel6.SetRowSpan(this.previewSaveOutputFormat_button, 2); - this.previewSaveOutputFormat_button.Size = new System.Drawing.Size(186, 112); -======= this.previewSaveOutputFormat_button.Location = new System.Drawing.Point(276, 3); this.previewSaveOutputFormat_button.Name = "previewSaveOutputFormat_button"; this.tableLayoutPanel6.SetRowSpan(this.previewSaveOutputFormat_button, 2); this.previewSaveOutputFormat_button.Size = new System.Drawing.Size(205, 112); ->>>>>>> Stashed changes this.previewSaveOutputFormat_button.TabIndex = 9; this.previewSaveOutputFormat_button.Text = "Enhance and save with ouput format"; this.previewSaveOutputFormat_button.UseVisualStyleBackColor = true; @@ -876,7 +843,7 @@ private void InitializeComponent() this.zoomLevelsToolStripComboBox}); this.toolStrip.Location = new System.Drawing.Point(0, 0); this.toolStrip.Name = "toolStrip"; - this.toolStrip.Size = new System.Drawing.Size(1263, 25); + this.toolStrip.Size = new System.Drawing.Size(980, 25); this.toolStrip.TabIndex = 3; // // openFromFileToolStripButton @@ -939,14 +906,11 @@ private void InitializeComponent() // settings_tabPage // this.settings_tabPage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; -<<<<<<< Updated upstream -======= this.settings_tabPage.Controls.Add(this.showDebugInfo_checkBox); this.settings_tabPage.Controls.Add(this.useMergeWithGradient_checkBox); this.settings_tabPage.Controls.Add(this.inMemoryMode_checkBox); this.settings_tabPage.Controls.Add(this.groupBox13); this.settings_tabPage.Controls.Add(this.groupBox12); ->>>>>>> Stashed changes this.settings_tabPage.Controls.Add(this.groupBox8); this.settings_tabPage.Controls.Add(this.deleteProfile_button); this.settings_tabPage.Controls.Add(this.groupBox9); @@ -997,8 +961,6 @@ private void InitializeComponent() this.settings_tabPage.Text = "Settings"; this.settings_tabPage.UseVisualStyleBackColor = true; // -<<<<<<< Updated upstream -======= // showDebugInfo_checkBox // this.showDebugInfo_checkBox.AutoSize = true; @@ -1119,7 +1081,6 @@ private void InitializeComponent() this.useMblend_checkBox.Text = "Use old merge mblend"; this.useMblend_checkBox.UseVisualStyleBackColor = true; // ->>>>>>> Stashed changes // groupBox8 // this.groupBox8.Controls.Add(this.topMost_checkBox); @@ -1178,8 +1139,6 @@ private void InitializeComponent() this.groupBox9.Controls.Add(this.imagePreprocess_groupBox); this.groupBox9.Controls.Add(this.outputFormat_comboBox); this.groupBox9.Controls.Add(this.ignoreSingleColorAlpha_checkBox); - this.groupBox9.Controls.Add(this.balanceRgb_checkBox); - this.groupBox9.Controls.Add(this.balanceAlphas_checkBox); this.groupBox9.Controls.Add(this.splitRGB_checkBox); this.groupBox9.Controls.Add(this.profileModel_comboBox); this.groupBox9.Controls.Add(this.useProfileModel_checkBox); @@ -1236,7 +1195,8 @@ private void InitializeComponent() // this.threshold_groupBox.Controls.Add(this.thresholdBlack_numericUpDown); this.threshold_groupBox.Controls.Add(this.label13); - this.threshold_groupBox.Controls.Add(this.thresholdEnabled_checkBox); + this.threshold_groupBox.Controls.Add(this.thresholdEnabledAlpha_checkBox); + this.threshold_groupBox.Controls.Add(this.thresholdEnabledRbg_checkBox); this.threshold_groupBox.Controls.Add(this.label12); this.threshold_groupBox.Controls.Add(this.thresholdWhite_numericUpDown); this.threshold_groupBox.Location = new System.Drawing.Point(9, 51); @@ -1250,7 +1210,7 @@ private void InitializeComponent() // this.thresholdBlack_numericUpDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.thresholdBlack_numericUpDown.Enabled = false; - this.thresholdBlack_numericUpDown.Location = new System.Drawing.Point(63, 16); + this.thresholdBlack_numericUpDown.Location = new System.Drawing.Point(135, 13); this.thresholdBlack_numericUpDown.Name = "thresholdBlack_numericUpDown"; this.thresholdBlack_numericUpDown.Size = new System.Drawing.Size(45, 20); this.thresholdBlack_numericUpDown.TabIndex = 1; @@ -1260,24 +1220,12 @@ private void InitializeComponent() // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.label13.Location = new System.Drawing.Point(109, 46); + this.label13.Location = new System.Drawing.Point(181, 43); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(46, 13); this.label13.TabIndex = 2; this.label13.Text = "% White"; // -<<<<<<< Updated upstream - // thresholdEnabled_checkBox - // - this.thresholdEnabled_checkBox.AutoSize = true; - this.thresholdEnabled_checkBox.Location = new System.Drawing.Point(12, 31); - this.thresholdEnabled_checkBox.Name = "thresholdEnabled_checkBox"; - this.thresholdEnabled_checkBox.Size = new System.Drawing.Size(45, 17); - this.thresholdEnabled_checkBox.TabIndex = 0; - this.thresholdEnabled_checkBox.Text = "Use"; - this.thresholdEnabled_checkBox.UseVisualStyleBackColor = true; - this.thresholdEnabled_checkBox.CheckedChanged += new System.EventHandler(this.thresholdEnabled_checkBox_CheckedChanged); -======= // thresholdEnabledAlpha_checkBox // this.thresholdEnabledAlpha_checkBox.AutoSize = true; @@ -1301,13 +1249,12 @@ private void InitializeComponent() this.thresholdEnabledRbg_checkBox.Text = "Use for RGB"; this.thresholdEnabledRbg_checkBox.UseVisualStyleBackColor = true; this.thresholdEnabledRbg_checkBox.CheckedChanged += new System.EventHandler(this.thresholdEnabled_checkBox_CheckedChanged); ->>>>>>> Stashed changes // // label12 // this.label12.AutoSize = true; this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.label12.Location = new System.Drawing.Point(109, 20); + this.label12.Location = new System.Drawing.Point(181, 17); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(45, 13); this.label12.TabIndex = 2; @@ -1322,7 +1269,7 @@ private void InitializeComponent() 0, 0, 0}); - this.thresholdWhite_numericUpDown.Location = new System.Drawing.Point(63, 42); + this.thresholdWhite_numericUpDown.Location = new System.Drawing.Point(135, 39); this.thresholdWhite_numericUpDown.Name = "thresholdWhite_numericUpDown"; this.thresholdWhite_numericUpDown.Size = new System.Drawing.Size(45, 20); this.thresholdWhite_numericUpDown.TabIndex = 1; @@ -1507,30 +1454,6 @@ private void InitializeComponent() this.toolTip1.SetToolTip(this.ignoreSingleColorAlpha_checkBox, "Solid white alpha will be always ignored on split"); this.ignoreSingleColorAlpha_checkBox.UseVisualStyleBackColor = true; // - // balanceRgb_checkBox - // - this.balanceRgb_checkBox.AutoSize = true; - this.balanceRgb_checkBox.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.balanceRgb_checkBox.Location = new System.Drawing.Point(403, 20); - this.balanceRgb_checkBox.Name = "balanceRgb_checkBox"; - this.balanceRgb_checkBox.Size = new System.Drawing.Size(153, 17); - this.balanceRgb_checkBox.TabIndex = 25; - this.balanceRgb_checkBox.Text = "Use globalbalance on RGB"; - this.toolTip1.SetToolTip(this.balanceRgb_checkBox, "No need to enable this for most cases"); - this.balanceRgb_checkBox.UseVisualStyleBackColor = true; - // - // balanceAlphas_checkBox - // - this.balanceAlphas_checkBox.AutoSize = true; - this.balanceAlphas_checkBox.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.balanceAlphas_checkBox.Location = new System.Drawing.Point(403, 39); - this.balanceAlphas_checkBox.Name = "balanceAlphas_checkBox"; - this.balanceAlphas_checkBox.Size = new System.Drawing.Size(156, 17); - this.balanceAlphas_checkBox.TabIndex = 25; - this.balanceAlphas_checkBox.Text = "Use globalbalance on alpha"; - this.toolTip1.SetToolTip(this.balanceAlphas_checkBox, "No need to enable this for most cases"); - this.balanceAlphas_checkBox.UseVisualStyleBackColor = true; - // // splitRGB_checkBox // this.splitRGB_checkBox.AutoSize = true; @@ -2152,7 +2075,7 @@ private void InitializeComponent() this.settingsOutputFormat_tabPage.Controls.Add(this.ddsOutputSettings_groupBox); this.settingsOutputFormat_tabPage.Location = new System.Drawing.Point(4, 25); this.settingsOutputFormat_tabPage.Name = "settingsOutputFormat_tabPage"; - this.settingsOutputFormat_tabPage.Size = new System.Drawing.Size(1263, 714); + this.settingsOutputFormat_tabPage.Size = new System.Drawing.Size(980, 752); this.settingsOutputFormat_tabPage.TabIndex = 4; this.settingsOutputFormat_tabPage.Text = "Output formats"; this.settingsOutputFormat_tabPage.UseVisualStyleBackColor = true; @@ -2468,7 +2391,7 @@ private void InitializeComponent() this.advanced_tabPage.Controls.Add(this.filters_groupBox); this.advanced_tabPage.Location = new System.Drawing.Point(4, 25); this.advanced_tabPage.Name = "advanced_tabPage"; - this.advanced_tabPage.Size = new System.Drawing.Size(1263, 714); + this.advanced_tabPage.Size = new System.Drawing.Size(980, 752); this.advanced_tabPage.TabIndex = 2; this.advanced_tabPage.Text = "Filters/Rules"; this.advanced_tabPage.UseVisualStyleBackColor = true; @@ -2954,7 +2877,7 @@ private void InitializeComponent() this.interpolation_tabPage.Controls.Add(this.interpolationModelOne_comboBox); this.interpolation_tabPage.Location = new System.Drawing.Point(4, 25); this.interpolation_tabPage.Name = "interpolation_tabPage"; - this.interpolation_tabPage.Size = new System.Drawing.Size(1263, 714); + this.interpolation_tabPage.Size = new System.Drawing.Size(980, 752); this.interpolation_tabPage.TabIndex = 3; this.interpolation_tabPage.Text = "Models interpolation"; this.interpolation_tabPage.UseVisualStyleBackColor = true; @@ -3032,7 +2955,7 @@ private void InitializeComponent() this.overlayResults_tabPage.Controls.Add(this.tableLayoutPanel4); this.overlayResults_tabPage.Location = new System.Drawing.Point(4, 25); this.overlayResults_tabPage.Name = "overlayResults_tabPage"; - this.overlayResults_tabPage.Size = new System.Drawing.Size(1263, 714); + this.overlayResults_tabPage.Size = new System.Drawing.Size(980, 752); this.overlayResults_tabPage.TabIndex = 6; this.overlayResults_tabPage.Text = "Image interpolation"; this.overlayResults_tabPage.UseVisualStyleBackColor = true; @@ -3055,16 +2978,16 @@ private void InitializeComponent() this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 175F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(1263, 714); + this.tableLayoutPanel4.Size = new System.Drawing.Size(980, 752); this.tableLayoutPanel4.TabIndex = 4; // // overlayImages_button // this.overlayImages_button.Dock = System.Windows.Forms.DockStyle.Fill; this.overlayImages_button.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.overlayImages_button.Location = new System.Drawing.Point(1166, 3); + this.overlayImages_button.Location = new System.Drawing.Point(883, 3); this.overlayImages_button.Name = "overlayImages_button"; - this.overlayImages_button.Size = new System.Drawing.Size(94, 483); + this.overlayImages_button.Size = new System.Drawing.Size(94, 521); this.overlayImages_button.TabIndex = 1; this.overlayImages_button.Text = "Interpolate"; this.overlayImages_button.UseVisualStyleBackColor = true; @@ -3076,7 +2999,7 @@ private void InitializeComponent() this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox4.Location = new System.Drawing.Point(3, 3); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(1157, 483); + this.groupBox4.Size = new System.Drawing.Size(874, 521); this.groupBox4.TabIndex = 0; this.groupBox4.TabStop = false; this.groupBox4.Text = "Interpolate two images"; @@ -3096,7 +3019,7 @@ private void InitializeComponent() this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28F)); this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(1151, 464); + this.tableLayoutPanel5.Size = new System.Drawing.Size(868, 502); this.tableLayoutPanel5.TabIndex = 0; // // groupBox7 @@ -3104,9 +3027,9 @@ private void InitializeComponent() this.groupBox7.Controls.Add(this.imageBName_label); this.groupBox7.Controls.Add(this.imageB_panel); this.groupBox7.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox7.Location = new System.Drawing.Point(578, 3); + this.groupBox7.Location = new System.Drawing.Point(437, 3); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(570, 430); + this.groupBox7.Size = new System.Drawing.Size(428, 468); this.groupBox7.TabIndex = 1; this.groupBox7.TabStop = false; this.groupBox7.Text = "Image B"; @@ -3127,7 +3050,7 @@ private void InitializeComponent() this.imageB_panel.Dock = System.Windows.Forms.DockStyle.Fill; this.imageB_panel.Location = new System.Drawing.Point(3, 16); this.imageB_panel.Name = "imageB_panel"; - this.imageB_panel.Size = new System.Drawing.Size(564, 411); + this.imageB_panel.Size = new System.Drawing.Size(422, 449); this.imageB_panel.TabIndex = 5; this.imageB_panel.DragDrop += new System.Windows.Forms.DragEventHandler(this.imagePanel_DragDrop); this.imageB_panel.DragEnter += new System.Windows.Forms.DragEventHandler(this.general_DragEnter); @@ -3137,7 +3060,7 @@ private void InitializeComponent() this.imageB_pictureBox.Dock = System.Windows.Forms.DockStyle.Fill; this.imageB_pictureBox.Location = new System.Drawing.Point(0, 0); this.imageB_pictureBox.Name = "imageB_pictureBox"; - this.imageB_pictureBox.Size = new System.Drawing.Size(564, 411); + this.imageB_pictureBox.Size = new System.Drawing.Size(422, 449); this.imageB_pictureBox.TabIndex = 0; this.imageB_pictureBox.TabStop = false; // @@ -3148,7 +3071,7 @@ private void InitializeComponent() this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox6.Location = new System.Drawing.Point(3, 3); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(569, 430); + this.groupBox6.Size = new System.Drawing.Size(428, 468); this.groupBox6.TabIndex = 1; this.groupBox6.TabStop = false; this.groupBox6.Text = "Image A"; @@ -3169,7 +3092,7 @@ private void InitializeComponent() this.imageA_panel.Dock = System.Windows.Forms.DockStyle.Fill; this.imageA_panel.Location = new System.Drawing.Point(3, 16); this.imageA_panel.Name = "imageA_panel"; - this.imageA_panel.Size = new System.Drawing.Size(563, 411); + this.imageA_panel.Size = new System.Drawing.Size(422, 449); this.imageA_panel.TabIndex = 4; this.imageA_panel.DragDrop += new System.Windows.Forms.DragEventHandler(this.imagePanel_DragDrop); this.imageA_panel.DragEnter += new System.Windows.Forms.DragEventHandler(this.general_DragEnter); @@ -3179,7 +3102,7 @@ private void InitializeComponent() this.imageA_pictureBox.Dock = System.Windows.Forms.DockStyle.Fill; this.imageA_pictureBox.Location = new System.Drawing.Point(0, 0); this.imageA_pictureBox.Name = "imageA_pictureBox"; - this.imageA_pictureBox.Size = new System.Drawing.Size(563, 411); + this.imageA_pictureBox.Size = new System.Drawing.Size(422, 449); this.imageA_pictureBox.TabIndex = 0; this.imageA_pictureBox.TabStop = false; // @@ -3188,16 +3111,16 @@ private void InitializeComponent() this.overlayResultName_textBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tableLayoutPanel5.SetColumnSpan(this.overlayResultName_textBox, 2); this.overlayResultName_textBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.overlayResultName_textBox.Location = new System.Drawing.Point(3, 439); + this.overlayResultName_textBox.Location = new System.Drawing.Point(3, 477); this.overlayResultName_textBox.Name = "overlayResultName_textBox"; - this.overlayResultName_textBox.Size = new System.Drawing.Size(1145, 20); + this.overlayResultName_textBox.Size = new System.Drawing.Size(862, 20); this.overlayResultName_textBox.TabIndex = 2; // // overlayFolders_button // this.overlayFolders_button.Dock = System.Windows.Forms.DockStyle.Fill; this.overlayFolders_button.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.overlayFolders_button.Location = new System.Drawing.Point(1166, 542); + this.overlayFolders_button.Location = new System.Drawing.Point(883, 580); this.overlayFolders_button.Name = "overlayFolders_button"; this.overlayFolders_button.Size = new System.Drawing.Size(94, 169); this.overlayFolders_button.TabIndex = 1; @@ -3210,7 +3133,7 @@ private void InitializeComponent() this.imageInterpolationAlphaValue_textBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.imageInterpolationAlphaValue_textBox.Dock = System.Windows.Forms.DockStyle.Fill; this.imageInterpolationAlphaValue_textBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.25F); - this.imageInterpolationAlphaValue_textBox.Location = new System.Drawing.Point(1166, 501); + this.imageInterpolationAlphaValue_textBox.Location = new System.Drawing.Point(883, 539); this.imageInterpolationAlphaValue_textBox.Margin = new System.Windows.Forms.Padding(3, 12, 3, 3); this.imageInterpolationAlphaValue_textBox.Name = "imageInterpolationAlphaValue_textBox"; this.imageInterpolationAlphaValue_textBox.ReadOnly = true; @@ -3233,7 +3156,7 @@ private void InitializeComponent() this.groupBox5.Controls.Add(this.resultsBPath_textBox); this.groupBox5.Controls.Add(this.resultsDestinationPath_textBox); this.groupBox5.Controls.Add(this.label28); - this.groupBox5.Location = new System.Drawing.Point(3, 542); + this.groupBox5.Location = new System.Drawing.Point(3, 580); this.groupBox5.Name = "groupBox5"; this.groupBox5.Size = new System.Drawing.Size(661, 169); this.groupBox5.TabIndex = 0; @@ -3363,9 +3286,9 @@ private void InitializeComponent() // this.panel3.Controls.Add(this.imageInterpolation_trackBar); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(3, 492); + this.panel3.Location = new System.Drawing.Point(3, 530); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1157, 44); + this.panel3.Size = new System.Drawing.Size(874, 44); this.panel3.TabIndex = 6; // // imageInterpolation_trackBar @@ -3376,7 +3299,7 @@ private void InitializeComponent() this.imageInterpolation_trackBar.Maximum = 99; this.imageInterpolation_trackBar.Minimum = 1; this.imageInterpolation_trackBar.Name = "imageInterpolation_trackBar"; - this.imageInterpolation_trackBar.Size = new System.Drawing.Size(1157, 44); + this.imageInterpolation_trackBar.Size = new System.Drawing.Size(874, 44); this.imageInterpolation_trackBar.TabIndex = 5; this.imageInterpolation_trackBar.Value = 50; this.imageInterpolation_trackBar.Scroll += new System.EventHandler(this.ImageInterpolation_trackBar_Scroll); @@ -3449,13 +3372,10 @@ private void InitializeComponent() this.toolStrip.PerformLayout(); this.settings_tabPage.ResumeLayout(false); this.settings_tabPage.PerformLayout(); -<<<<<<< Updated upstream -======= this.groupBox13.ResumeLayout(false); this.groupBox13.PerformLayout(); this.groupBox12.ResumeLayout(false); this.groupBox12.PerformLayout(); ->>>>>>> Stashed changes this.groupBox8.ResumeLayout(false); this.groupBox8.PerformLayout(); this.groupBox9.ResumeLayout(false); @@ -3603,7 +3523,7 @@ private void InitializeComponent() private System.Windows.Forms.GroupBox threshold_groupBox; private System.Windows.Forms.NumericUpDown thresholdBlack_numericUpDown; private System.Windows.Forms.Label label13; - private System.Windows.Forms.CheckBox thresholdEnabled_checkBox; + private System.Windows.Forms.CheckBox thresholdEnabledRbg_checkBox; private System.Windows.Forms.Label label12; private System.Windows.Forms.NumericUpDown thresholdWhite_numericUpDown; private System.Windows.Forms.GroupBox imagePreprocess_groupBox; @@ -3773,8 +3693,6 @@ private void InitializeComponent() private System.Windows.Forms.Label label35; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.ComboBox comboBox2; -<<<<<<< Updated upstream -======= private System.Windows.Forms.CheckBox useMblend_checkBox; private System.Windows.Forms.GroupBox groupBox12; private System.Windows.Forms.CheckBox inMemoryMode_checkBox; @@ -3784,7 +3702,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox checkBox1; private System.Windows.Forms.CheckBox checkBox2; private System.Windows.Forms.CheckBox showDebugInfo_checkBox; ->>>>>>> Stashed changes } } diff --git a/MainForm.cs b/MainForm.cs index c7e08f2..6f205c3 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -245,6 +245,8 @@ public MainForm() originalImagesPath_textBox.Text = imgPath_textBox.Text; resultsDestinationPath_textBox.Text = resultsMergedPath_textBox.Text; + + //tabControl1.SelectedTab = previewResult_tabPage; } #endregion @@ -314,13 +316,10 @@ void BindSettingsTab() this.Bind(ViewModel, vm => vm.CondaEnv, v => v.condaEnvName_textBox.Text); this.Bind(ViewModel, vm => vm.CheckForUpdates, v => v.checkForUpdates_checkBox.Checked); -<<<<<<< Updated upstream -======= this.Bind(ViewModel, vm => vm.EnableBlend, v => v.useMblend_checkBox.Checked); this.Bind(ViewModel, vm => vm.InMemoryMode, v => v.inMemoryMode_checkBox.Checked); this.Bind(ViewModel, vm => vm.UseMergeWithGradient, v => v.useMergeWithGradient_checkBox.Checked); this.Bind(ViewModel, vm => vm.DebugMode, v => v.showDebugInfo_checkBox.Checked); ->>>>>>> Stashed changes } void BindOutputFormats() @@ -456,7 +455,8 @@ void BindAdvanced() noiseReductionType_comboBox.SelectedIndex = 0; this.Bind(ViewModel, vm => vm.CurrentProfile.NoiseReductionType, v => v.noiseReductionType_comboBox.SelectedIndex); - this.Bind(ViewModel, vm => vm.CurrentProfile.ThresholdEnabled, v => v.thresholdEnabled_checkBox.Checked); + this.Bind(ViewModel, vm => vm.CurrentProfile.ThresholdEnabled, v => v.thresholdEnabledRbg_checkBox.Checked); + this.Bind(ViewModel, vm => vm.CurrentProfile.ThresholdAlphaEnabled, v => v.thresholdEnabledAlpha_checkBox.Checked); this.Bind(ViewModel, vm => vm.CurrentProfile.ThresholdBlackValue, v => v.thresholdBlack_numericUpDown.Value, x => x, y => decimal.ToInt32(y)); this.Bind(ViewModel, vm => vm.CurrentProfile.ThresholdWhiteValue, v => v.thresholdWhite_numericUpDown.Value, x => x, y => decimal.ToInt32(y)); @@ -1065,17 +1065,25 @@ private async void previewUpdate_button_Click(object sender, EventArgs e) if (originalPreview == null) return; PreviewInProgress(true); - Bitmap preview = await ViewModel.CreatePreview(originalPreview, modelPath); + bool success = await ViewModel.Preview(previewFullname, originalPreview, modelPath, true); PreviewInProgress(false); - if (preview != null) - { - previewImageBox.Image = preview; - resultPreview = preview; - } - else + if (!success) { MessageBox.Show($"Failed to create preview! Logs saved in <{ViewModel.EsrganPath}\\IEU_preview>"); + return; } + string previewOutPath = $"{ViewModel.PreviewDirPath}\\preview.png"; + if (File.Exists(previewOutPath)) + { + Bitmap preview = new Bitmap(previewOutPath); + if (preview != null) + { + Bitmap preview2 = new Bitmap(preview); + previewImageBox.Image = preview2; + resultPreview = preview2; + } + preview.Dispose(); + } } private async void savePreview(bool saveAsPng = true) @@ -1086,7 +1094,7 @@ private async void savePreview(bool saveAsPng = true) PreviewInProgress(true); try { - bool success = await ViewModel.SavePreview(previewFullname, modelPath, saveAsPng); + bool success = await ViewModel.Preview(previewFullname, zoomImageBox.Image, modelPath, saveAsPng, true); if (!success) MessageBox.Show($"Failed to create preview! Logs saved in <{ViewModel.EsrganPath}\\IEU_preview>"); } @@ -1109,27 +1117,6 @@ private async void previewSavePng_button_Click(object sender, EventArgs e) private async void previewSaveOutputFormat_button_Click(object sender, EventArgs e) { savePreview(false); - } - - private async void previewSave_button_Click_(object sender, EventArgs e) - { - string modelPath = previewModels_comboBox.SelectedValue.ToString(); - if (zoomImageBox.Image == null) - return; - PreviewInProgress(true); - Bitmap preview = await ViewModel.CreatePreview((Bitmap)zoomImageBox.Image, modelPath); - PreviewInProgress(false); - if (preview != null) - { - string modelName = Path.GetFileNameWithoutExtension(modelPath); - string dir = Path.GetDirectoryName(previewFullname); - string fileName = Path.GetFileNameWithoutExtension(previewFullname); - preview.Save(dir + "\\" + fileName + "_" + modelName + ".png"); - } - else - { - MessageBox.Show($"Failed to create preview! Logs saved in <{ViewModel.EsrganPath}\\IEU_preview>"); - } } private async void previewSaveComparison_button_Click(object sender, EventArgs e) @@ -1370,7 +1357,7 @@ private void filtersSizeOn_checkBox_CheckedChanged(object sender, EventArgs e) private void thresholdEnabled_checkBox_CheckedChanged(object sender, EventArgs e) { - if (thresholdEnabled_checkBox.Checked) + if (thresholdEnabledRbg_checkBox.Checked || thresholdEnabledAlpha_checkBox.Checked) { thresholdBlack_numericUpDown.Enabled = true; thresholdWhite_numericUpDown.Enabled = true;