Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-04-21 09:07:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Up/Down button on Merge Images and controls disabled while image update is in progress.

Browse Source
This commit is contained in:
MaikyM 2019-08-08 22:16:15 -06:00
parent f24948dd05
commit 5ffdf1568a
2 changed files with 142 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
FModel/Forms/MergeImages.Designer.cs generated
View File

@ -35,6 +35,8 @@ namespace FModel.Forms
this.button3 = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.button7 = new System.Windows.Forms.Button();
this.button6 = new System.Windows.Forms.Button();
this.trackBar1 = new System.Windows.Forms.TrackBar();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.button5 = new System.Windows.Forms.Button();
@ -68,7 +70,7 @@ namespace FModel.Forms
// button2
//
this.button2.ForeColor = System.Drawing.SystemColors.ControlText;
this.button2.Location = new System.Drawing.Point(459, 309);
this.button2.Location = new System.Drawing.Point(515, 309);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(100, 23);
this.button2.TabIndex = 2;
@ -99,21 +101,43 @@ namespace FModel.Forms
//
// groupBox1
//
this.groupBox1.Controls.Add(this.button7);
this.groupBox1.Controls.Add(this.button6);
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Controls.Add(this.listBox1);
this.groupBox1.Controls.Add(this.button3);
this.groupBox1.Controls.Add(this.button4);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(263, 320);
this.groupBox1.Size = new System.Drawing.Size(319, 320);
this.groupBox1.TabIndex = 7;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Settings";
//
// button7
//
this.button7.Location = new System.Drawing.Point(262, 153);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(51, 23);
this.button7.TabIndex = 6;
this.button7.Text = "Down";
this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.button7_Click);
//
// button6
//
this.button6.Location = new System.Drawing.Point(262, 113);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(51, 23);
this.button6.TabIndex = 5;
this.button6.Text = "Up";
this.button6.UseVisualStyleBackColor = true;
this.button6.Click += new System.EventHandler(this.button6_Click);
//
// trackBar1
//
this.trackBar1.LargeChange = 0;
this.trackBar1.Location = new System.Drawing.Point(281, 268);
this.trackBar1.Location = new System.Drawing.Point(337, 268);
this.trackBar1.Maximum = 20;
this.trackBar1.Minimum = 1;
this.trackBar1.Name = "trackBar1";
@ -126,7 +150,7 @@ namespace FModel.Forms
// pictureBox1
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Location = new System.Drawing.Point(281, 18);
this.pictureBox1.Location = new System.Drawing.Point(337, 18);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(278, 244);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@ -136,7 +160,7 @@ namespace FModel.Forms
// button5
//
this.button5.ForeColor = System.Drawing.SystemColors.ControlText;
this.button5.Location = new System.Drawing.Point(353, 309);
this.button5.Location = new System.Drawing.Point(409, 309);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(100, 23);
this.button5.TabIndex = 10;
@ -155,7 +179,7 @@ namespace FModel.Forms
//
this.progressBar1.Location = new System.Drawing.Point(12, 338);
this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(547, 16);
this.progressBar1.Size = new System.Drawing.Size(603, 16);
this.progressBar1.Step = 1;
this.progressBar1.TabIndex = 11;
//
@ -163,7 +187,7 @@ namespace FModel.Forms
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.Red;
this.label1.Location = new System.Drawing.Point(281, 314);
this.label1.Location = new System.Drawing.Point(337, 314);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 13);
this.label1.TabIndex = 12;
@ -173,7 +197,7 @@ namespace FModel.Forms
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(571, 364);
this.ClientSize = new System.Drawing.Size(636, 364);
this.Controls.Add(this.label1);
this.Controls.Add(this.progressBar1);
this.Controls.Add(this.button5);
@ -210,5 +234,7 @@ namespace FModel.Forms
private System.ComponentModel.BackgroundWorker backgroundWorker1;
private System.Windows.Forms.ProgressBar progressBar1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button button7;
private System.Windows.Forms.Button button6;
}
}

120
FModel/Forms/MergeImages.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.IO;
using System.Windows.Forms;
using System.Web.UI.WebControls;
using Button = System.Windows.Forms.Button;
using Image = System.Drawing.Image;
using System.Drawing;
using System.Globalization;
@ -17,10 +18,12 @@ namespace FModel.Forms
private static List<Image> selectedImages { get; set; }
private static Bitmap bmp { get; set; }
private static Timer _scrollingTimer = null;
private static List<Control> allControls { get; set; }
public MergeImages()
{
InitializeComponent();
AddAllControls();
}
private void MergeImages_Load(object sender, EventArgs e)
@ -40,10 +43,7 @@ namespace FModel.Forms
{
AddFiles(theDialog.FileNames);
if (backgroundWorker1.IsBusy != true)
{
backgroundWorker1.RunWorkerAsync();
}
ReloadImages();
}
}
private void AddFiles(string[] files)
@ -126,10 +126,7 @@ namespace FModel.Forms
listBox1.Items.RemoveAt(listBox1.SelectedIndices[i]);
}
if (backgroundWorker1.IsBusy != true)
{
backgroundWorker1.RunWorkerAsync();
}
ReloadImages();
}
}
@ -182,6 +179,15 @@ namespace FModel.Forms
GC.Collect();
backgroundWorker1.Dispose();
if (allControls.Count > 0)
{
foreach (Control control in allControls)
{
if (control != null)
control.Enabled = true;
}
}
}
private void BackgroundWorker1_ProgressChanged(object sender, System.ComponentModel.ProgressChangedEventArgs e)
@ -207,10 +213,7 @@ namespace FModel.Forms
// scrolling has stopped so we are good to go ahead and do stuff
_scrollingTimer.Stop();
if (backgroundWorker1.IsBusy != true)
{
backgroundWorker1.RunWorkerAsync();
}
ReloadImages();
_scrollingTimer.Dispose();
_scrollingTimer = null;
@ -224,5 +227,98 @@ namespace FModel.Forms
_scrollingTimer.Start();
}
}
private void button6_Click(object sender, EventArgs e)
{
// Up
bool reloadImage = false;
listBox1.BeginUpdate();
int[] indices = listBox1.SelectedIndices.Cast<int>().ToArray();
if (indices.Length > 0 && indices[0] > 0)
{
for (int i = 0; i < listBox1.Items.Count; ++i)
{
if (indices.Contains(i))
{
object moveItem = listBox1.Items[i];
listBox1.Items.Remove(moveItem);
listBox1.Items.Insert(i - 1, moveItem);
listBox1.SetSelected(i - 1, true);
reloadImage = true;
}
}
}
listBox1.EndUpdate();
if (reloadImage)
ReloadImages();
}
private void button7_Click(object sender, EventArgs e)
{
// Down
bool reloadImage = false;
listBox1.BeginUpdate();
int[] indices = listBox1.SelectedIndices.Cast<int>().ToArray();
if (indices.Length > 0 && indices[indices.Length - 1] < listBox1.Items.Count - 1)
{
for (int i = listBox1.Items.Count - 1; i > -1; --i)
{
if (indices.Contains(i))
{
object itemTemp = listBox1.Items[i];
listBox1.Items.Remove(itemTemp);
listBox1.Items.Insert(i + 1, itemTemp);
listBox1.SetSelected(i + 1, true);
reloadImage = true;
}
}
}
listBox1.EndUpdate();
if (reloadImage)
ReloadImages();
}
private void ReloadImages()
{
if (allControls.Count > 0)
{
foreach (Control control in allControls)
{
if (control != null)
control.Enabled = false;
}
}
if (backgroundWorker1.IsBusy != true)
backgroundWorker1.RunWorkerAsync();
}
private void AddAllControls()
{
allControls = new List<Control>();
if (Controls.Count > 0)
{
foreach (Control control in Controls)
{
if (!allControls.Contains(control))
allControls.Add(control);
}
}
if (groupBox1.Controls.Count > 0)
{
foreach (Control control in groupBox1.Controls)
{
if (!allControls.Contains(control))
allControls.Add(control);
}
}
}
}
}