1、添加2个自定义控件:chartTC、TreeViewTc; 2、修复了一些bug,完善了功能;3、更新了gitignore,将bin等目录忽略;

This commit is contained in:
tangchao0503
2022-06-16 13:26:55 +08:00
parent b43227dc58
commit f36c5eaa39
50 changed files with 13043 additions and 3770 deletions

View File

@ -32,6 +32,8 @@ namespace mainProgram
mProjectManager = value;
Console.WriteLine("工程文件目录为:" + mProjectManager.ProjectPath + "---------------------");
}
private void newToolStripMenuItem_Click(object sender, EventArgs e)
@ -42,8 +44,11 @@ namespace mainProgram
//w.Show();//不阻塞
DialogResult tmp = w.ShowDialog();//阻塞
if(tmp == DialogResult.OK)
if (tmp == DialogResult.OK)
{
treeViewTc21.Initialize(mProjectManager.ProjectPath);
SetProjectNameAndProjectPath();
}
}
private void OpenProjectToolStripMenuItem_Click(object sender, EventArgs e)
@ -62,7 +67,7 @@ namespace mainProgram
if (dialogResult == DialogResult.OK)
{
this.Text = this.Text + "-" + getProjectName();
SetProjectNameAndProjectPath();
treeViewTc21.Initialize(mProjectManager.ProjectPath);
}
@ -77,9 +82,22 @@ namespace mainProgram
}
private void ss()
private void SetProjectNameAndProjectPath()
{
//PrejectTreeView
this.Text = this.Text + "-" + getProjectName();
this.projectPath_toolStripStatusLabel.Text = this.projectPath_toolStripStatusLabel.Text + mProjectManager.ProjectPath;
}
private void ClearProjectNameAndProjectPath()
{
this.Text = this.Text + "-" + getProjectName();
this.projectPath_toolStripStatusLabel.Text = this.projectPath_toolStripStatusLabel.Text + mProjectManager.ProjectPath;
int index = this.Text.IndexOf(getProjectName());
this.Text = this.Text.Substring(0, index - 1);//index - 1还要加上一个字符“-”
int index2 = this.projectPath_toolStripStatusLabel.Text.IndexOf(mProjectManager.ProjectPath);
this.projectPath_toolStripStatusLabel.Text = this.projectPath_toolStripStatusLabel.Text.Substring(0, index2);
}
@ -118,7 +136,7 @@ namespace mainProgram
private void main_FormClosing(object sender, FormClosingEventArgs e)
{
if (MessageBox.Show("确退出", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
if (MessageBox.Show("确退出", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
{
e.Cancel = false;
}
@ -136,6 +154,12 @@ namespace mainProgram
return;
}
if (mProjectManager.GetDateFolderCount() == 0)//当没有做福亮度校正时2rad文件夹为空就不能打开算法窗口
{
MessageBox.Show(this, "请先进行预处理-福亮度校正!", "提示");
return;
}
SVDWindows w = new SVDWindows(mProjectManager, "svd");
//w.TransferEvent += RecieveProjectManager;
@ -154,6 +178,12 @@ namespace mainProgram
return;
}
if (mProjectManager.GetDateFolderCount() == 0)//当没有做福亮度校正时2rad文件夹为空就不能打开算法窗口
{
MessageBox.Show(this, "请先进行预处理-福亮度校正!", "提示");
return;
}
SVDWindows w = new SVDWindows(mProjectManager, "doas");
//w.TransferEvent += RecieveProjectManager;
@ -172,6 +202,12 @@ namespace mainProgram
return;
}
if (mProjectManager.GetDateFolderCount() == 0)//当没有做福亮度校正时2rad文件夹为空就不能打开算法窗口
{
MessageBox.Show(this, "请先进行预处理-福亮度校正!", "提示");
return;
}
SVDWindows w = new SVDWindows(mProjectManager, "sfm");
//w.TransferEvent += RecieveProjectManager;
@ -190,6 +226,12 @@ namespace mainProgram
return;
}
if (mProjectManager.GetDateFolderCount() == 0)//当没有做福亮度校正时2rad文件夹为空就不能打开算法窗口
{
MessageBox.Show(this, "请先进行预处理-福亮度校正!", "提示");
return;
}
SVDWindows w = new SVDWindows(mProjectManager, "sfm_gaussian");
//w.TransferEvent += RecieveProjectManager;
@ -208,6 +250,12 @@ namespace mainProgram
return;
}
if (mProjectManager.GetDateFolderCount() == 0)//当没有做福亮度校正时2rad文件夹为空就不能打开算法窗口
{
MessageBox.Show(this, "请先进行预处理-福亮度校正!", "提示");
return;
}
SVDWindows w = new SVDWindows(mProjectManager, "sfld");
//w.TransferEvent += RecieveProjectManager;
@ -226,6 +274,12 @@ namespace mainProgram
return;
}
if (mProjectManager.GetDateFolderCount() == 0)//当没有做福亮度校正时2rad文件夹为空就不能打开算法窗口
{
MessageBox.Show(this, "请先进行预处理-福亮度校正!", "提示");
return;
}
SVDWindows w = new SVDWindows(mProjectManager, "3fld");
//w.TransferEvent += RecieveProjectManager;
@ -391,6 +445,7 @@ namespace mainProgram
private void main_Load(object sender, EventArgs e)
{
treeViewTc21.DeleteEvent += DeleteFiles;
treeViewTc21.PlotSifEvent += PlotSif;
treeViewTc21.SaveAsEvent += SaveAs;
@ -398,6 +453,12 @@ namespace mainProgram
chartTC1.clickPointEvent += ShowPointInfo;
}
//protected override void OnPaint(PaintEventArgs e)
//{
// //System.Drawing.Color.FromArgb(0, 106, 181)
// ControlPaint.DrawBorder(e.Graphics, ClientRectangle, System.Drawing.Color.FromArgb(0, 106, 181), ButtonBorderStyle.Solid);
//}
public void PlotSifSpectral(string path)
{
//SpectralDataReaderWriter spectralDataReaderWriter = new SpectralDataReaderWriter(@"D:\Desktop\0sifRawData\rawdata\2021_12_21\beijing_10_53_45.csv");
@ -469,33 +530,40 @@ namespace mainProgram
this.SfmGaussinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SfldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Fld3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.sifAlgorithmAbstractToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.projectPath_toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.panel1 = new System.Windows.Forms.Panel();
this.treeViewTc21 = new TreeViewTc.TreeViewTc2();
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.PointInfoTextBox = new System.Windows.Forms.TextBox();
this.chartTC1 = new chartTC.chartTC();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.menuStrip1.SuspendLayout();
this.statusStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.panel1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// menuStrip1
//
this.menuStrip1.BackColor = System.Drawing.Color.White;
this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem,
this.preprocessToolStripMenuItem,
this.sifComputeToolStripMenuItem});
this.sifComputeToolStripMenuItem,
this.ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1420, 25);
this.menuStrip1.Size = new System.Drawing.Size(1176, 25);
this.menuStrip1.TabIndex = 0;
this.menuStrip1.Text = "menuStrip1";
//
@ -608,60 +676,127 @@ namespace mainProgram
this.Fld3ToolStripMenuItem.Text = "3Fld";
this.Fld3ToolStripMenuItem.Click += new System.EventHandler(this.Fld3ToolStripMenuItem_Click);
//
// 帮助ToolStripMenuItem
//
this.ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.sifAlgorithmAbstractToolStripMenuItem,
this.AboutToolStripMenuItem});
this.ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(44, 21);
this.ToolStripMenuItem.Text = "帮助";
//
// sifAlgorithmAbstractToolStripMenuItem
//
this.sifAlgorithmAbstractToolStripMenuItem.Name = "sifAlgorithmAbstractToolStripMenuItem";
this.sifAlgorithmAbstractToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.sifAlgorithmAbstractToolStripMenuItem.Text = "Sif算法简介";
this.sifAlgorithmAbstractToolStripMenuItem.Click += new System.EventHandler(this.sifAlgorithmAbstractToolStripMenuItem_Click);
//
// AboutToolStripMenuItem
//
this.AboutToolStripMenuItem.Name = "AboutToolStripMenuItem";
this.AboutToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.AboutToolStripMenuItem.Text = "关于";
this.AboutToolStripMenuItem.Click += new System.EventHandler(this.AboutToolStripMenuItem_Click);
//
// statusStrip1
//
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Location = new System.Drawing.Point(0, 1040);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.projectPath_toolStripStatusLabel});
this.statusStrip1.Location = new System.Drawing.Point(0, 778);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1420, 22);
this.statusStrip1.Size = new System.Drawing.Size(1176, 22);
this.statusStrip1.TabIndex = 1;
this.statusStrip1.Text = "statusStrip1";
//
// projectPath_toolStripStatusLabel
//
this.projectPath_toolStripStatusLabel.Name = "projectPath_toolStripStatusLabel";
this.projectPath_toolStripStatusLabel.Size = new System.Drawing.Size(68, 17);
this.projectPath_toolStripStatusLabel.Text = "工程路径:";
//
// splitContainer1
//
this.splitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.Location = new System.Drawing.Point(0, 52);
this.splitContainer1.Location = new System.Drawing.Point(0, 50);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.panel1);
this.splitContainer1.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.chartTC1);
this.splitContainer1.Size = new System.Drawing.Size(1420, 988);
this.splitContainer1.SplitterDistance = 269;
this.splitContainer1.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.splitContainer1.Size = new System.Drawing.Size(1176, 728);
this.splitContainer1.SplitterDistance = 231;
this.splitContainer1.TabIndex = 6;
//
// panel1
//
this.panel1.Controls.Add(this.treeViewTc21);
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.button2);
this.panel1.Controls.Add(this.PointInfoTextBox);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(269, 988);
this.panel1.Size = new System.Drawing.Size(227, 724);
this.panel1.TabIndex = 6;
//
// treeViewTc21
//
this.treeViewTc21.Dock = System.Windows.Forms.DockStyle.Fill;
this.treeViewTc21.Location = new System.Drawing.Point(0, 0);
this.treeViewTc21.Location = new System.Drawing.Point(0, 23);
this.treeViewTc21.Margin = new System.Windows.Forms.Padding(4);
this.treeViewTc21.Name = "treeViewTc21";
this.treeViewTc21.Size = new System.Drawing.Size(269, 731);
this.treeViewTc21.Size = new System.Drawing.Size(227, 421);
this.treeViewTc21.TabIndex = 6;
this.treeViewTc21.Load += new System.EventHandler(this.treeViewTc21_Load);
//
// button1
//
this.button1.BackColor = System.Drawing.Color.WhiteSmoke;
this.button1.Cursor = System.Windows.Forms.Cursors.Default;
this.button1.Dock = System.Windows.Forms.DockStyle.Top;
this.button1.Enabled = false;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.button1.Location = new System.Drawing.Point(0, 0);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(227, 23);
this.button1.TabIndex = 7;
this.button1.Text = "工程";
this.button1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// button2
//
this.button2.BackColor = System.Drawing.Color.WhiteSmoke;
this.button2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.button2.Enabled = false;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.button2.Location = new System.Drawing.Point(0, 444);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(227, 23);
this.button2.TabIndex = 8;
this.button2.Text = "信息";
this.button2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button2.UseVisualStyleBackColor = false;
//
// PointInfoTextBox
//
this.PointInfoTextBox.BackColor = System.Drawing.Color.White;
this.PointInfoTextBox.Dock = System.Windows.Forms.DockStyle.Bottom;
this.PointInfoTextBox.Location = new System.Drawing.Point(0, 731);
this.PointInfoTextBox.Location = new System.Drawing.Point(0, 467);
this.PointInfoTextBox.Multiline = true;
this.PointInfoTextBox.Name = "PointInfoTextBox";
this.PointInfoTextBox.ReadOnly = true;
this.PointInfoTextBox.Size = new System.Drawing.Size(269, 257);
this.PointInfoTextBox.Size = new System.Drawing.Size(227, 257);
this.PointInfoTextBox.TabIndex = 5;
//
// chartTC1
@ -669,56 +804,50 @@ namespace mainProgram
this.chartTC1.Dock = System.Windows.Forms.DockStyle.Fill;
this.chartTC1.Location = new System.Drawing.Point(0, 0);
this.chartTC1.Name = "chartTC1";
this.chartTC1.Size = new System.Drawing.Size(1147, 988);
this.chartTC1.Size = new System.Drawing.Size(937, 724);
this.chartTC1.TabIndex = 3;
this.chartTC1.Load += new System.EventHandler(this.chartTC1_Load);
//
// toolStrip1
//
this.toolStrip1.BackColor = System.Drawing.Color.WhiteSmoke;
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton1});
this.toolStrip1.Location = new System.Drawing.Point(0, 25);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1420, 27);
this.toolStrip1.Size = new System.Drawing.Size(1176, 25);
this.toolStrip1.TabIndex = 7;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripButton1
//
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(24, 24);
this.toolStripButton1.Text = "toolStripButton1";
//
// main
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1420, 1062);
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1176, 800);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.menuStrip1);
this.ForeColor = System.Drawing.SystemColors.ControlText;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
this.Name = "main";
this.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "easySif";
this.Text = "EasySif";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.main_FormClosing);
this.Load += new System.EventHandler(this.main_Load);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -744,11 +873,11 @@ namespace mainProgram
if (mProjectManager == null)
return;
int index = this.Text.IndexOf(getProjectName());
this.Text = this.Text.Substring(0, index - 1);//index - 1还要加上一个字符“-”
ClearProjectNameAndProjectPath();
mProjectManager = null;
GC.Collect();
treeViewTc21.clearAll();
chartTC1.chart1.Series.Clear();
PointInfoTextBox.Clear();
@ -758,6 +887,26 @@ namespace mainProgram
{
}
private void button1_Click(object sender, EventArgs e)
{
}
//C#调用默认浏览器打开网页的几种方法https://blog.csdn.net/testcs_dn/article/details/42246969
private void sifAlgorithmAbstractToolStripMenuItem_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("https://mp.weixin.qq.com/s/L89CdJcSs2dADxQMztv2nw");
}
private void AboutToolStripMenuItem_Click(object sender, EventArgs e)
{
AboutWindows w = new AboutWindows();
//Form2 w = new Form2();
//w.Show();//不阻塞
DialogResult tmp = w.ShowDialog();//阻塞
}
}
}