Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

Bin/x64/Debug/Version.txt

@@ -0,0 +1,68 @@
+=====================================
+update history
+------OTS3.1 2024-5
+增加边界重叠测量并自动去重功能
+可更加个性化设置报告模板（可精确到具体的分类）
+增加部分删除测量结果数据，然后重新测量功能。
+支持牛津6.1 sp1
+优化支持Coxem电镜
+-----OTS 3.0版本 2023-12
+优化运行目录结构，缩小发布文件尺寸（分门别类存放各种功能Dll）。
+优化牛津驱动，提升效率
+支持牛津aztec 6.1
+改进国标80384算法，增加单类高亮功能，提高可验证能力。
+完善清洁度标准库
+增加系统切换界面，可在安装完成后自动初始化
+
+------OTS2.8 2023-8
+升级布鲁克驱动为支持最新版dll,支持esprit 2.4 2.5
+------OTS2.7 2023-4
+增加自动关枪功能
+增加测量暂停功能
+增加外来夹杂物分析溯源功能模块
+增加可视化样品台编辑功能
+------OTS2.5 2022-5
+1 国标算法优化。（原来是多个OTS帧拼接成一个国标帧，现在是一个大的OTS帧切割成多个国标帧）。
+2 报告导出控件更换为功能强大Dev控件。解决纯英文系统乱码问题，能够准确显示下标和各种特殊符号。
+3 样品台缩放功能优化，支持滚轮无极缩放。
+4 增加环形测量区域设置功能。（为了做轴承钢夹杂物深度分析而增加）
+5 夹杂物分类算法微调。（去掉CrO的识别等,Cr 不做为夹杂物辅元素）。
+6 改进夹杂物标准库
+7 增加支持FEI内置能谱
+-----OTS2.0 2021-5
+重构测量程序，主体代码升级为C#
+重构报告程序，主体代码升级为C#
+支持FEI电镜图像分辨率
+适配各种FEI电镜
+-----OTS1.5 2020-7
+测量程序：
+重新设计分类库编辑功能
+增加用户自定义库支持能力
+增加可选择是否使用系统库分类
+灰度设置可视化功能。
+增加log界面输出显示
+报告程序：
+增加数据表分页显示功能
+分析图页面增加辅助线功能
+报表导出条件设置与设计可视化模块
+报表导出独立进程化，缩减内存占用。
+报表导出增加bse原图，并增加颗粒在图上的标记信息
+对被帧图分割的颗粒进行合成并显示
+增加钢铁夹杂物美标与德标分类显示。
+多数据源三元相图合并显示功能。
+牛津驱动改进,支持牛津aztec5.0 5.1
+智能选择点扫或面扫
+-----OTS1.4 2019-10
+增加对牛津能谱extender的支持
+支持牛津aztec4.2
+-----OTS1.3 2019-5
+适配蔡司电镜
+支持布鲁克1.9 2.1版本驱动
+引入RMReport
+引入echart图表
+
+
+
+
+
+

Bin/x64/OTSOx50_30.wse

@@ -924,6 +924,11 @@ end
 item: Include Script
   Pathname=%_WISE_%\INCLUDE\uninstal.wse
 end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\Version.txt
+  Destination=%MAINDIR%\Version.txt
+  Flags=0000000010000010
+end
 item: Install File
   Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\Config\ReportTemplate\Inca_Template\ReportTemplateConfig.xml
   Destination=%MAINDIR%\Config\ReportTemplate\Inca_Template\ReportTemplateConfig.xml

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/frmInitializeStartInput.Designer.cs

@@ -60,7 +60,7 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(59, 25);
             this.button1.TabIndex = 2;
-            this.button1.Text = "确定";
+            this.button1.Text = "OK";
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
@@ -70,7 +70,7 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(59, 25);
             this.button2.TabIndex = 3;
-            this.button2.Text = "取消";
+            this.button2.Text = "Cancel";
             this.button2.UseVisualStyleBackColor = true;
             this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
@@ -80,9 +80,9 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
             this.label2.Font = new System.Drawing.Font("SimSun", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.Location = new System.Drawing.Point(3, 126);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(188, 16);
+            this.label2.Size = new System.Drawing.Size(242, 16);
             this.label2.TabIndex = 4;
-            this.label2.Text = " After the Field No!";
+            this.label2.Text = " After the Start Field No!";
             // 
             // label3
             // 

OTSIncAMeasureApp/About.Designer.cs

@@ -31,12 +31,14 @@ namespace OTSMeasureApp
         {
             this.button_OK = new System.Windows.Forms.Button();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.richTextBox2 = new System.Windows.Forms.RichTextBox();
+            this.button1 = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // button_OK
             // 
-            this.button_OK.Location = new System.Drawing.Point(135, 98);
-            this.button_OK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button_OK.Location = new System.Drawing.Point(142, 97);
+            this.button_OK.Margin = new System.Windows.Forms.Padding(2);
             this.button_OK.Name = "button_OK";
             this.button_OK.Size = new System.Drawing.Size(77, 25);
             this.button_OK.TabIndex = 0;
@@ -51,12 +53,37 @@ namespace OTSMeasureApp
             this.richTextBox1.Cursor = System.Windows.Forms.Cursors.No;
             this.richTextBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.richTextBox1.ForeColor = System.Drawing.SystemColors.HotTrack;
-            this.richTextBox1.Location = new System.Drawing.Point(15, 11);
-            this.richTextBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.richTextBox1.Location = new System.Drawing.Point(83, 11);
+            this.richTextBox1.Margin = new System.Windows.Forms.Padding(2);
             this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(331, 69);
+            this.richTextBox1.Size = new System.Drawing.Size(136, 30);
             this.richTextBox1.TabIndex = 1;
-            this.richTextBox1.Text = "";
+            this.richTextBox1.Text = "Version : 3.1";
+            // 
+            // richTextBox2
+            // 
+            this.richTextBox2.BackColor = System.Drawing.SystemColors.Menu;
+            this.richTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.richTextBox2.Cursor = System.Windows.Forms.Cursors.No;
+            this.richTextBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.richTextBox2.ForeColor = System.Drawing.SystemColors.HotTrack;
+            this.richTextBox2.Location = new System.Drawing.Point(83, 45);
+            this.richTextBox2.Margin = new System.Windows.Forms.Padding(2);
+            this.richTextBox2.Name = "richTextBox2";
+            this.richTextBox2.Size = new System.Drawing.Size(262, 30);
+            this.richTextBox2.TabIndex = 1;
+            this.richTextBox2.Text = "Opton Copyright © 2024";
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(236, 14);
+            this.button1.Margin = new System.Windows.Forms.Padding(2);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(77, 25);
+            this.button1.TabIndex = 2;
+            this.button1.Text = "update log";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
             // About
             // 
@@ -64,10 +91,12 @@ namespace OTSMeasureApp
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.ClientSize = new System.Drawing.Size(377, 143);
+            this.Controls.Add(this.button1);
+            this.Controls.Add(this.richTextBox2);
             this.Controls.Add(this.richTextBox1);
             this.Controls.Add(this.button_OK);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "About";
@@ -84,5 +113,7 @@ namespace OTSMeasureApp
 
         private System.Windows.Forms.Button button_OK;
         private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.RichTextBox richTextBox2;
+        private System.Windows.Forms.Button button1;
     }
 }

OTSIncAMeasureApp/About.cs

@@ -20,20 +20,19 @@ namespace OTSMeasureApp
         private void About_Load(object sender, EventArgs e)
         {
 
-            richTextBox1.Text = "Version : 3.0\n";
-            richTextBox1.Text += "Opton Copyright © 2024";
-            richTextBox1.Select(0, richTextBox1.Text.Length);
-            //richTextBox1.SelectionColor = Color.DarkBlue;
-            richTextBox1.SelectionAlignment = HorizontalAlignment.Center;
-            richTextBox1.ReadOnly = true;
             richTextBox1.Enabled = false;
-            richTextBox1.Select(0, 0);
-            this.Focus();
+            richTextBox2.Enabled = false;
+            
         }
 
         private void button_OK_Click(object sender, EventArgs e)
         {
             this.Close();
         }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("notepad.exe", Application.StartupPath+"\\version.txt");
+        }
     }
 }