Quellcode durchsuchen

Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2

GSP vor 2 Monaten
Ursprung
Commit
4f2c5397d3

+ 11 - 1
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -126,7 +126,7 @@ namespace OTSMeasureApp
         const int m_OffsetPX = 10;
         //默认值
         const int m_DValue = 1;
-
+        SetSEMDATAMParameterWindows setSEMDATAMParameterWindows = null;
 
 
         #region 手动绘制测量区域
@@ -246,6 +246,15 @@ namespace OTSMeasureApp
                     if (m_MeasureAppForm.m_ProjParam.GetWorkingSampleSEMData(ref dDistance, ref SemMag, ref bri, ref contra, ref kv))
                     {
                         //设置SEM数据
+                        if(setSEMDATAMParameterWindows==null || setSEMDATAMParameterWindows.IsDisposed)
+                        { 
+                          setSEMDATAMParameterWindows = new SetSEMDATAMParameterWindows(m_SEMDATAService);
+                            setSEMDATAMParameterWindows.Show();
+                        }
+                        else
+                        {
+                            setSEMDATAMParameterWindows.Activate();
+                        }
 
                         if (!SetSEMDATAMParameter(SemMag, dDistance, bri, contra))
                         {
@@ -2845,6 +2854,7 @@ namespace OTSMeasureApp
         {
 
 
+            
             List<double> semParameters;
 
 

+ 6 - 1
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/SEMControlService.cs

@@ -317,7 +317,10 @@ namespace OTSMeasureApp
         }
         #endregion
 
-  
+        public bool MoveSEMToPoint(double x, double y, double r)
+        {
+            return cSemfun.MoveSEMToPoint(x, y,r);
+        }
 
 
 
@@ -415,6 +418,8 @@ namespace OTSMeasureApp
         }
         #endregion
 
+
+
         #region 获取SEM位置
         public bool GetSemLocation(ref List<double> SemLocation)
         {

+ 342 - 0
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/SetSEMDATAMParameterWindows.Designer.cs

@@ -0,0 +1,342 @@
+namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
+{
+    partial class SetSEMDATAMParameterWindows
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.label1 = new System.Windows.Forms.Label();
+            this.tB_distance = new System.Windows.Forms.TextBox();
+            this.btn_distance = new System.Windows.Forms.Button();
+            this.btn_setbrightness = new System.Windows.Forms.Button();
+            this.tB_Brightness = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.btn_setContrast = new System.Windows.Forms.Button();
+            this.tB_Contrast = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.btn_setAcceleratingVoltage = new System.Windows.Forms.Button();
+            this.tB_AcceleratingVoltage = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.btn_setMagnification = new System.Windows.Forms.Button();
+            this.tB_Magnification = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.btn_setXYR = new System.Windows.Forms.Button();
+            this.tB_X = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.tB_Y = new System.Windows.Forms.TextBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.tB_R = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.panel1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(10, 16);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(53, 12);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "工作距离";
+            // 
+            // tB_distance
+            // 
+            this.tB_distance.Location = new System.Drawing.Point(79, 13);
+            this.tB_distance.Name = "tB_distance";
+            this.tB_distance.Size = new System.Drawing.Size(100, 21);
+            this.tB_distance.TabIndex = 1;
+            this.tB_distance.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // btn_distance
+            // 
+            this.btn_distance.Location = new System.Drawing.Point(200, 13);
+            this.btn_distance.Name = "btn_distance";
+            this.btn_distance.Size = new System.Drawing.Size(75, 23);
+            this.btn_distance.TabIndex = 20;
+            this.btn_distance.Text = "设定";
+            this.btn_distance.UseVisualStyleBackColor = true;
+            this.btn_distance.Click += new System.EventHandler(this.btn_distance_Click);
+            // 
+            // btn_setbrightness
+            // 
+            this.btn_setbrightness.Location = new System.Drawing.Point(200, 54);
+            this.btn_setbrightness.Name = "btn_setbrightness";
+            this.btn_setbrightness.Size = new System.Drawing.Size(75, 23);
+            this.btn_setbrightness.TabIndex = 5;
+            this.btn_setbrightness.Text = "设定";
+            this.btn_setbrightness.UseVisualStyleBackColor = true;
+            this.btn_setbrightness.Click += new System.EventHandler(this.btn_setbrightness_Click);
+            // 
+            // tB_Brightness
+            // 
+            this.tB_Brightness.Location = new System.Drawing.Point(79, 54);
+            this.tB_Brightness.Name = "tB_Brightness";
+            this.tB_Brightness.Size = new System.Drawing.Size(100, 21);
+            this.tB_Brightness.TabIndex = 4;
+            this.tB_Brightness.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(10, 57);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(29, 12);
+            this.label2.TabIndex = 3;
+            this.label2.Text = "亮度";
+            // 
+            // btn_setContrast
+            // 
+            this.btn_setContrast.Location = new System.Drawing.Point(200, 95);
+            this.btn_setContrast.Name = "btn_setContrast";
+            this.btn_setContrast.Size = new System.Drawing.Size(75, 23);
+            this.btn_setContrast.TabIndex = 8;
+            this.btn_setContrast.Text = "设定";
+            this.btn_setContrast.UseVisualStyleBackColor = true;
+            this.btn_setContrast.Click += new System.EventHandler(this.btn_setContrast_Click);
+            // 
+            // tB_Contrast
+            // 
+            this.tB_Contrast.Location = new System.Drawing.Point(79, 95);
+            this.tB_Contrast.Name = "tB_Contrast";
+            this.tB_Contrast.Size = new System.Drawing.Size(100, 21);
+            this.tB_Contrast.TabIndex = 7;
+            this.tB_Contrast.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(10, 98);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(41, 12);
+            this.label3.TabIndex = 6;
+            this.label3.Text = "对比度";
+            // 
+            // btn_setAcceleratingVoltage
+            // 
+            this.btn_setAcceleratingVoltage.Location = new System.Drawing.Point(200, 135);
+            this.btn_setAcceleratingVoltage.Name = "btn_setAcceleratingVoltage";
+            this.btn_setAcceleratingVoltage.Size = new System.Drawing.Size(75, 23);
+            this.btn_setAcceleratingVoltage.TabIndex = 11;
+            this.btn_setAcceleratingVoltage.Text = "设定";
+            this.btn_setAcceleratingVoltage.UseVisualStyleBackColor = true;
+            this.btn_setAcceleratingVoltage.Click += new System.EventHandler(this.btn_setAcceleratingVoltage_Click);
+            // 
+            // tB_AcceleratingVoltage
+            // 
+            this.tB_AcceleratingVoltage.Location = new System.Drawing.Point(79, 135);
+            this.tB_AcceleratingVoltage.Name = "tB_AcceleratingVoltage";
+            this.tB_AcceleratingVoltage.Size = new System.Drawing.Size(100, 21);
+            this.tB_AcceleratingVoltage.TabIndex = 10;
+            this.tB_AcceleratingVoltage.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(10, 138);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(53, 12);
+            this.label4.TabIndex = 9;
+            this.label4.Text = "加速电压";
+            // 
+            // btn_setMagnification
+            // 
+            this.btn_setMagnification.Location = new System.Drawing.Point(200, 175);
+            this.btn_setMagnification.Name = "btn_setMagnification";
+            this.btn_setMagnification.Size = new System.Drawing.Size(75, 23);
+            this.btn_setMagnification.TabIndex = 14;
+            this.btn_setMagnification.Text = "设定";
+            this.btn_setMagnification.UseVisualStyleBackColor = true;
+            this.btn_setMagnification.Click += new System.EventHandler(this.btn_setMagnification_Click);
+            // 
+            // tB_Magnification
+            // 
+            this.tB_Magnification.Location = new System.Drawing.Point(79, 175);
+            this.tB_Magnification.Name = "tB_Magnification";
+            this.tB_Magnification.Size = new System.Drawing.Size(100, 21);
+            this.tB_Magnification.TabIndex = 13;
+            this.tB_Magnification.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(10, 178);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(53, 12);
+            this.label5.TabIndex = 12;
+            this.label5.Text = "放大倍数";
+            // 
+            // btn_setXYR
+            // 
+            this.btn_setXYR.Location = new System.Drawing.Point(150, 16);
+            this.btn_setXYR.Name = "btn_setXYR";
+            this.btn_setXYR.Size = new System.Drawing.Size(75, 105);
+            this.btn_setXYR.TabIndex = 17;
+            this.btn_setXYR.Text = "设定";
+            this.btn_setXYR.UseVisualStyleBackColor = true;
+            this.btn_setXYR.Click += new System.EventHandler(this.btn_setXYR_Click);
+            // 
+            // tB_X
+            // 
+            this.tB_X.Location = new System.Drawing.Point(29, 18);
+            this.tB_X.Name = "tB_X";
+            this.tB_X.Size = new System.Drawing.Size(100, 21);
+            this.tB_X.TabIndex = 16;
+            this.tB_X.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(10, 23);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(11, 12);
+            this.label6.TabIndex = 15;
+            this.label6.Text = "X";
+            // 
+            // tB_Y
+            // 
+            this.tB_Y.Location = new System.Drawing.Point(29, 61);
+            this.tB_Y.Name = "tB_Y";
+            this.tB_Y.Size = new System.Drawing.Size(100, 21);
+            this.tB_Y.TabIndex = 19;
+            this.tB_Y.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(10, 64);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(11, 12);
+            this.label7.TabIndex = 18;
+            this.label7.Text = "Y";
+            // 
+            // tB_R
+            // 
+            this.tB_R.Location = new System.Drawing.Point(29, 100);
+            this.tB_R.Name = "tB_R";
+            this.tB_R.Size = new System.Drawing.Size(100, 21);
+            this.tB_R.TabIndex = 22;
+            this.tB_R.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(10, 105);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(11, 12);
+            this.label8.TabIndex = 21;
+            this.label8.Text = "R";
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.btn_setXYR);
+            this.panel1.Controls.Add(this.tB_R);
+            this.panel1.Controls.Add(this.label6);
+            this.panel1.Controls.Add(this.label8);
+            this.panel1.Controls.Add(this.tB_X);
+            this.panel1.Controls.Add(this.tB_Y);
+            this.panel1.Controls.Add(this.label7);
+            this.panel1.Location = new System.Drawing.Point(312, 8);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(239, 134);
+            this.panel1.TabIndex = 23;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.label1);
+            this.panel2.Controls.Add(this.tB_distance);
+            this.panel2.Controls.Add(this.btn_setMagnification);
+            this.panel2.Controls.Add(this.btn_distance);
+            this.panel2.Controls.Add(this.tB_Magnification);
+            this.panel2.Controls.Add(this.label2);
+            this.panel2.Controls.Add(this.label5);
+            this.panel2.Controls.Add(this.tB_Brightness);
+            this.panel2.Controls.Add(this.btn_setAcceleratingVoltage);
+            this.panel2.Controls.Add(this.btn_setbrightness);
+            this.panel2.Controls.Add(this.tB_AcceleratingVoltage);
+            this.panel2.Controls.Add(this.label3);
+            this.panel2.Controls.Add(this.label4);
+            this.panel2.Controls.Add(this.tB_Contrast);
+            this.panel2.Controls.Add(this.btn_setContrast);
+            this.panel2.Location = new System.Drawing.Point(11, 8);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(285, 205);
+            this.panel2.TabIndex = 24;
+            // 
+            // SetSEMDATAMParameterWindows
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(563, 221);
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.panel1);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(579, 260);
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(579, 260);
+            this.Name = "SetSEMDATAMParameterWindows";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "SetSEMDATAMParameter";
+            this.Load += new System.EventHandler(this.SetSEMDATAMParameter_Load);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox tB_distance;
+        private System.Windows.Forms.Button btn_distance;
+        private System.Windows.Forms.Button btn_setbrightness;
+        private System.Windows.Forms.TextBox tB_Brightness;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Button btn_setContrast;
+        private System.Windows.Forms.TextBox tB_Contrast;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Button btn_setAcceleratingVoltage;
+        private System.Windows.Forms.TextBox tB_AcceleratingVoltage;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Button btn_setMagnification;
+        private System.Windows.Forms.TextBox tB_Magnification;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Button btn_setXYR;
+        private System.Windows.Forms.TextBox tB_X;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox tB_Y;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.TextBox tB_R;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Panel panel2;
+    }
+}

+ 173 - 0
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/SetSEMDATAMParameterWindows.cs

@@ -0,0 +1,173 @@
+using NLog.Fluent;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics.Contracts;
+using System.Drawing;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
+{
+    public partial class SetSEMDATAMParameterWindows : Form
+    {
+        SEMControlService _SEMDATAService;
+        NLog.Logger log;
+        public SetSEMDATAMParameterWindows(SEMControlService a_SEMDATAService)
+        {
+            InitializeComponent();
+            _SEMDATAService = a_SEMDATAService;
+            log = NLog.LogManager.GetCurrentClassLogger();
+        }
+
+        private void SetSEMDATAMParameter_Load(object sender, EventArgs e)
+        {
+            //获取Field操作类对象
+            if (_SEMDATAService == null)
+            {
+                _SEMDATAService = new SEMControlService();
+            }
+            //判断是否连接电镜
+            if (_SEMDATAService.InitAndConnection())
+            {
+                List<double> semParameters = _SEMDATAService.GetSEMMagAndWDParameter();
+                double mag = semParameters[0];
+                double wd = semParameters[1];
+                double bri = semParameters[2];
+                double contra = semParameters[3];
+                double kv = semParameters[4];
+                tB_AcceleratingVoltage.Text=kv.ToString();
+                tB_Brightness.Text= bri.ToString();
+                tB_Contrast.Text= contra.ToString();
+                tB_Magnification.Text= mag.ToString();
+                tB_distance.Text= wd.ToString();
+                semParameters=new List<double>();
+
+                _SEMDATAService.GetSemLocation(ref semParameters);
+                tB_X.Text= semParameters[0].ToString();
+                tB_Y.Text= semParameters[1].ToString();
+                tB_R.Text= semParameters[2].ToString();
+            }
+        }
+
+        private void btn_distance_Click(object sender, EventArgs e)
+        {
+            double obj = 0;
+            if(double.TryParse(tB_distance.Text,out obj)&& obj>0)
+            {
+                try
+                {
+                    _SEMDATAService.SetSemWorkingDistance(obj);
+                    log.Warn("Set WD:" + tB_distance.Text);
+                }
+                catch(Exception ex)
+                {
+                    log.Error(ex);
+                }
+                
+            }
+            else { log.Error("parameter error!"); }
+        }
+
+        private void btn_setbrightness_Click(object sender, EventArgs e)
+        {
+            double obj = 0;
+            if (double.TryParse(tB_Brightness.Text, out obj) && obj > 0)
+            {
+                try
+                {
+                    _SEMDATAService.SetSembrightness(obj);
+                    log.Warn("Set Brightness:" + tB_Brightness.Text);
+                }
+                catch (Exception ex)
+                {
+                    log.Error(ex);
+                }
+
+            }
+            else { log.Error("parameter error!"); }
+        }
+
+        private void btn_setContrast_Click(object sender, EventArgs e)
+        {
+            double obj = 0;
+            if (double.TryParse(tB_Contrast.Text, out obj) && obj > 0)
+            {
+                try
+                {
+                    _SEMDATAService.SetSemContrast(obj);
+                    log.Warn("Set Contrast:" + tB_Contrast.Text);
+                }
+                catch (Exception ex)
+                {
+                    log.Error(ex);
+                }
+
+            }
+            else { log.Error("parameter error!"); }
+        }
+
+        private void btn_setAcceleratingVoltage_Click(object sender, EventArgs e)
+        {
+            double obj = 0;
+            if (double.TryParse(tB_AcceleratingVoltage.Text, out obj) && obj > 0)
+            {
+                try
+                {
+                    _SEMDATAService.SetSemHT(obj);
+                    log.Warn("Set AcceleratingVoltage:" + tB_AcceleratingVoltage.Text);
+                }
+                catch (Exception ex)
+                {
+                    log.Error(ex);
+                }
+
+            }
+            else { log.Error("parameter error!"); }
+        }
+
+        private void btn_setMagnification_Click(object sender, EventArgs e)
+        {
+            double obj = 0;
+            if (double.TryParse(tB_Magnification.Text, out obj) && obj > 0)
+            {
+                try
+                {
+                    _SEMDATAService.SetGMagnification(obj);
+                    log.Warn("Set Magnification:" + tB_Magnification.Text);
+                }
+                catch (Exception ex)
+                {
+                    log.Error(ex);
+                }
+
+            }
+            else { log.Error("parameter error!"); }
+        }
+
+        private void btn_setXYR_Click(object sender, EventArgs e)
+        {
+            double objx = 0,objy=0,objr=0;
+            if (double.TryParse(tB_X.Text, out objx)&& double.TryParse(tB_Y.Text, out objy) && double.TryParse(tB_R.Text, out objr))
+            {
+                try
+                {
+                    _SEMDATAService.MoveSEMToPoint(objx, objy, objr);
+                    log.Warn("MoveSEMToPoint:" + tB_X.Text+","+ tB_Y.Text+","+ tB_R.Text);
+                }
+                catch (Exception ex)
+                {
+                    log.Error(ex);
+                }
+            }
+            else { log.Error("parameter error!"); }
+        }
+    }
+}
+
+
+            

+ 120 - 0
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/SetSEMDATAMParameterWindows.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

+ 9 - 0
OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -403,6 +403,12 @@
     <Compile Include="4-OTSSamplespaceGraphicsPanel\frmInitializeTwoPointRectangle.Designer.cs">
       <DependentUpon>frmInitializeTwoPointRectangle.cs</DependentUpon>
     </Compile>
+    <Compile Include="4-OTSSamplespaceGraphicsPanel\SetSEMDATAMParameterWindows.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="4-OTSSamplespaceGraphicsPanel\SetSEMDATAMParameterWindows.Designer.cs">
+      <DependentUpon>SetSEMDATAMParameterWindows.cs</DependentUpon>
+    </Compile>
     <Compile Include="4-OTSSamplespaceGraphicsPanel\VisualGDIObjects\CMeasureArea.cs" />
     <Compile Include="4-OTSSamplespaceGraphicsPanel\VisualGDIObjects\CRingGDIObject.cs" />
     <Compile Include="4-OTSSamplespaceGraphicsPanel\VisualGDIObjects\CVisualFieldGDIObject.cs" />
@@ -681,6 +687,9 @@
     <EmbeddedResource Include="4-OTSSamplespaceGraphicsPanel\RingGdiDataInput.resx">
       <DependentUpon>RingGdiDataInput.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="4-OTSSamplespaceGraphicsPanel\SetSEMDATAMParameterWindows.resx">
+      <DependentUpon>SetSEMDATAMParameterWindows.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="5-OTSMeasureStatuImageFun\Control_Ruler.resx">
       <DependentUpon>Control_Ruler.cs</DependentUpon>
     </EmbeddedResource>