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

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -1258,7 +1258,7 @@
 	  <Control name="radioButton_StandardsampleSqare" text="Sqare" />
 	  <Control name="label13" text="CenterPointCoordinates: " />
 	  <Control name="label10" text="Width:" />
-	  <Control name="groupBox3" text="SampleHoleInformation:" />
+	  <Control name="groupBox3" text="SampleHoleInformation(um):" />
 	  <Control name="button_AddHole" text="AddHole" />
 	  <Control name="button_DelHole" text="DelHole" />
 	  <Control name="button_Generate" text="Generate" />

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -1177,7 +1177,7 @@
 	  <Control name="label2" text="坐标系统：" />
 	  <Control name="radioButton_OTS" text="OTS坐标系统" />
 	  <Control name="radioButton_SEM" text="SEM坐标系统" />
-	  <Control name="groupBox1" text="样品台边框" />
+	  <Control name="groupBox1" text="样品台边框(微米)" />
 	  <Control name="label3" text="样品台边框形状：" />
 	  <Control name="radioButton_BoundaryCircle" text="圆形" />
 	  <Control name="radioButton_BoundarySquare" text="方形" />
@@ -1193,14 +1193,14 @@
 	  <Control name="str9" text="样品台名不能为空字串，不能含\',\'字符!" />
 	  <Control name="label7" text="宽度：" />
 	  <Control name="label8" text="高度：" />
-	  <Control name="groupBox2" text="标样" />
+	  <Control name="groupBox2" text="标样(微米)" />
 	  <Control name="label14" text="标样形状：" />
 	  <Control name="radioButton_StandardsampleCircle" text="圆形" />
 	  <Control name="radioButton_StandardsampleSqare" text="方形" />
 	  <Control name="label13" text="中心点坐标：" />
 	  <Control name="label10" text="宽度：" />
 	  <Control name="label9" text="高度：" />
-	  <Control name="groupBox3" text="样品孔信息：" />
+	  <Control name="groupBox3" text="样品孔信息(微米)：" />
 	  <Control name="button_AddHole" text="增加样品孔" />
 	  <Control name="button_DelHole" text="删除样品孔" />
 	  <Control name="button_Generate" text="生成" />

OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/StageParam.cs

@@ -129,6 +129,15 @@ namespace OTSModelSharp
 
                 if (strTitle.CompareTo(STAGE_ITEMS.NAME.ToString()) == 0)
                 {
+                    foreach (var ite in m_listStages)
+                    {
+                        if (ite.GetName() == strValue.Trim())
+                        {
+                            MessageBox.Show("Already exist " + strValue.Trim()+"!", "Error");
+                            return false;
+                        }
+                    }
+
                     strName = strValue.Trim();
                 }
 

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageEdit.Designer.cs

@@ -69,6 +69,8 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             this.button_Ok = new System.Windows.Forms.Button();
             this.helpProvider1 = new System.Windows.Forms.HelpProvider();
             this.button_Coordinate = new System.Windows.Forms.Button();
+            this.btn_reght90 = new System.Windows.Forms.Button();
+            this.btn_left90 = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.m_ctrlStagePicture)).BeginInit();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -79,10 +81,10 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // m_ctrlStagePicture
             // 
             this.m_ctrlStagePicture.BackColor = System.Drawing.Color.White;
-            this.m_ctrlStagePicture.Location = new System.Drawing.Point(692, 12);
+            this.m_ctrlStagePicture.Location = new System.Drawing.Point(554, 10);
             this.m_ctrlStagePicture.Margin = new System.Windows.Forms.Padding(2);
             this.m_ctrlStagePicture.Name = "m_ctrlStagePicture";
-            this.m_ctrlStagePicture.Size = new System.Drawing.Size(712, 708);
+            this.m_ctrlStagePicture.Size = new System.Drawing.Size(570, 566);
             this.m_ctrlStagePicture.TabIndex = 2;
             this.m_ctrlStagePicture.TabStop = false;
             this.m_ctrlStagePicture.Paint += new System.Windows.Forms.PaintEventHandler(this.m_ctrlStagePicture_Paint);
@@ -90,38 +92,38 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(22, 14);
+            this.label1.Location = new System.Drawing.Point(18, 11);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(97, 15);
+            this.label1.Size = new System.Drawing.Size(77, 12);
             this.label1.TabIndex = 3;
             this.label1.Text = "样品台名称：";
             // 
             // tStageName
             // 
-            this.tStageName.Location = new System.Drawing.Point(122, 10);
+            this.tStageName.Location = new System.Drawing.Point(98, 8);
             this.tStageName.Margin = new System.Windows.Forms.Padding(2);
             this.tStageName.Name = "tStageName";
-            this.tStageName.Size = new System.Drawing.Size(554, 25);
+            this.tStageName.Size = new System.Drawing.Size(444, 21);
             this.tStageName.TabIndex = 4;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(22, 52);
+            this.label2.Location = new System.Drawing.Point(18, 42);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(82, 15);
+            this.label2.Size = new System.Drawing.Size(65, 12);
             this.label2.TabIndex = 5;
             this.label2.Text = "坐标系统：";
             // 
             // radioButton_OTS
             // 
             this.radioButton_OTS.AutoSize = true;
-            this.radioButton_OTS.Location = new System.Drawing.Point(122, 52);
+            this.radioButton_OTS.Location = new System.Drawing.Point(98, 42);
             this.radioButton_OTS.Margin = new System.Windows.Forms.Padding(2);
             this.radioButton_OTS.Name = "radioButton_OTS";
-            this.radioButton_OTS.Size = new System.Drawing.Size(112, 19);
+            this.radioButton_OTS.Size = new System.Drawing.Size(89, 16);
             this.radioButton_OTS.TabIndex = 6;
             this.radioButton_OTS.TabStop = true;
             this.radioButton_OTS.Text = "OTS坐标系统";
@@ -130,10 +132,10 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // radioButton_SEM
             // 
             this.radioButton_SEM.AutoSize = true;
-            this.radioButton_SEM.Location = new System.Drawing.Point(262, 52);
+            this.radioButton_SEM.Location = new System.Drawing.Point(210, 42);
             this.radioButton_SEM.Margin = new System.Windows.Forms.Padding(2);
             this.radioButton_SEM.Name = "radioButton_SEM";
-            this.radioButton_SEM.Size = new System.Drawing.Size(112, 19);
+            this.radioButton_SEM.Size = new System.Drawing.Size(89, 16);
             this.radioButton_SEM.TabIndex = 10;
             this.radioButton_SEM.TabStop = true;
             this.radioButton_SEM.Text = "SEM坐标系统";
@@ -143,10 +145,10 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(18, 32);
+            this.label3.Location = new System.Drawing.Point(14, 26);
             this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(127, 15);
+            this.label3.Size = new System.Drawing.Size(101, 12);
             this.label3.TabIndex = 8;
             this.label3.Text = "样品台边框形状：";
             // 
@@ -164,104 +166,104 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             this.groupBox1.Controls.Add(this.radioButton_BoundarySquare);
             this.groupBox1.Controls.Add(this.radioButton_BoundaryCircle);
             this.groupBox1.Controls.Add(this.label3);
-            this.groupBox1.Location = new System.Drawing.Point(5, 78);
+            this.groupBox1.Location = new System.Drawing.Point(4, 62);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox1.Size = new System.Drawing.Size(672, 142);
+            this.groupBox1.Size = new System.Drawing.Size(538, 114);
             this.groupBox1.TabIndex = 12;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "样品台边框";
             // 
             // tBoundaryHeight
             // 
-            this.tBoundaryHeight.Location = new System.Drawing.Point(445, 95);
+            this.tBoundaryHeight.Location = new System.Drawing.Point(356, 76);
             this.tBoundaryHeight.Margin = new System.Windows.Forms.Padding(2);
             this.tBoundaryHeight.Name = "tBoundaryHeight";
-            this.tBoundaryHeight.Size = new System.Drawing.Size(102, 25);
+            this.tBoundaryHeight.Size = new System.Drawing.Size(82, 21);
             this.tBoundaryHeight.TabIndex = 19;
             // 
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(372, 98);
+            this.label8.Location = new System.Drawing.Point(298, 78);
             this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(52, 15);
+            this.label8.Size = new System.Drawing.Size(41, 12);
             this.label8.TabIndex = 18;
             this.label8.Text = "高度：";
             // 
             // tBoundaryWide
             // 
-            this.tBoundaryWide.Location = new System.Drawing.Point(445, 58);
+            this.tBoundaryWide.Location = new System.Drawing.Point(356, 46);
             this.tBoundaryWide.Margin = new System.Windows.Forms.Padding(2);
             this.tBoundaryWide.Name = "tBoundaryWide";
-            this.tBoundaryWide.Size = new System.Drawing.Size(102, 25);
+            this.tBoundaryWide.Size = new System.Drawing.Size(82, 21);
             this.tBoundaryWide.TabIndex = 17;
             // 
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(372, 62);
+            this.label7.Location = new System.Drawing.Point(298, 50);
             this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(52, 15);
+            this.label7.Size = new System.Drawing.Size(41, 12);
             this.label7.TabIndex = 16;
             this.label7.Text = "宽度：";
             // 
             // tBoundaryY
             // 
-            this.tBoundaryY.Location = new System.Drawing.Point(188, 95);
+            this.tBoundaryY.Location = new System.Drawing.Point(150, 76);
             this.tBoundaryY.Margin = new System.Windows.Forms.Padding(2);
             this.tBoundaryY.Name = "tBoundaryY";
-            this.tBoundaryY.Size = new System.Drawing.Size(102, 25);
+            this.tBoundaryY.Size = new System.Drawing.Size(82, 21);
             this.tBoundaryY.TabIndex = 15;
             // 
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(155, 98);
+            this.label6.Location = new System.Drawing.Point(124, 78);
             this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(30, 15);
+            this.label6.Size = new System.Drawing.Size(23, 12);
             this.label6.TabIndex = 14;
             this.label6.Text = "Y：";
             // 
             // tBoundaryX
             // 
-            this.tBoundaryX.Location = new System.Drawing.Point(188, 58);
+            this.tBoundaryX.Location = new System.Drawing.Point(150, 46);
             this.tBoundaryX.Margin = new System.Windows.Forms.Padding(2);
             this.tBoundaryX.Name = "tBoundaryX";
-            this.tBoundaryX.Size = new System.Drawing.Size(102, 25);
+            this.tBoundaryX.Size = new System.Drawing.Size(82, 21);
             this.tBoundaryX.TabIndex = 13;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(155, 62);
+            this.label5.Location = new System.Drawing.Point(124, 50);
             this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(30, 15);
+            this.label5.Size = new System.Drawing.Size(23, 12);
             this.label5.TabIndex = 12;
             this.label5.Text = "X：";
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(18, 62);
+            this.label4.Location = new System.Drawing.Point(14, 50);
             this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(97, 15);
+            this.label4.Size = new System.Drawing.Size(77, 12);
             this.label4.TabIndex = 11;
             this.label4.Text = "中心点坐标：";
             // 
             // radioButton_BoundarySquare
             // 
             this.radioButton_BoundarySquare.AutoSize = true;
-            this.radioButton_BoundarySquare.Location = new System.Drawing.Point(232, 28);
+            this.radioButton_BoundarySquare.Location = new System.Drawing.Point(186, 22);
             this.radioButton_BoundarySquare.Margin = new System.Windows.Forms.Padding(2);
             this.radioButton_BoundarySquare.Name = "radioButton_BoundarySquare";
-            this.radioButton_BoundarySquare.Size = new System.Drawing.Size(58, 19);
+            this.radioButton_BoundarySquare.Size = new System.Drawing.Size(47, 16);
             this.radioButton_BoundarySquare.TabIndex = 10;
             this.radioButton_BoundarySquare.TabStop = true;
             this.radioButton_BoundarySquare.Text = "方形";
@@ -271,10 +273,10 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // radioButton_BoundaryCircle
             // 
             this.radioButton_BoundaryCircle.AutoSize = true;
-            this.radioButton_BoundaryCircle.Location = new System.Drawing.Point(158, 28);
+            this.radioButton_BoundaryCircle.Location = new System.Drawing.Point(126, 22);
             this.radioButton_BoundaryCircle.Margin = new System.Windows.Forms.Padding(2);
             this.radioButton_BoundaryCircle.Name = "radioButton_BoundaryCircle";
-            this.radioButton_BoundaryCircle.Size = new System.Drawing.Size(58, 19);
+            this.radioButton_BoundaryCircle.Size = new System.Drawing.Size(47, 16);
             this.radioButton_BoundaryCircle.TabIndex = 9;
             this.radioButton_BoundaryCircle.TabStop = true;
             this.radioButton_BoundaryCircle.Text = "圆形";
@@ -295,104 +297,104 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             this.groupBox2.Controls.Add(this.radioButton_StandardsampleSqare);
             this.groupBox2.Controls.Add(this.radioButton_StandardsampleCircle);
             this.groupBox2.Controls.Add(this.label14);
-            this.groupBox2.Location = new System.Drawing.Point(5, 222);
+            this.groupBox2.Location = new System.Drawing.Point(4, 178);
             this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox2.Size = new System.Drawing.Size(672, 132);
+            this.groupBox2.Size = new System.Drawing.Size(538, 106);
             this.groupBox2.TabIndex = 13;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "标样";
             // 
             // tStandardsampleHeight
             // 
-            this.tStandardsampleHeight.Location = new System.Drawing.Point(445, 95);
+            this.tStandardsampleHeight.Location = new System.Drawing.Point(356, 76);
             this.tStandardsampleHeight.Margin = new System.Windows.Forms.Padding(2);
             this.tStandardsampleHeight.Name = "tStandardsampleHeight";
-            this.tStandardsampleHeight.Size = new System.Drawing.Size(102, 25);
+            this.tStandardsampleHeight.Size = new System.Drawing.Size(82, 21);
             this.tStandardsampleHeight.TabIndex = 19;
             // 
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(372, 98);
+            this.label9.Location = new System.Drawing.Point(298, 78);
             this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(52, 15);
+            this.label9.Size = new System.Drawing.Size(41, 12);
             this.label9.TabIndex = 18;
             this.label9.Text = "高度：";
             // 
             // tStandardsampleWide
             // 
-            this.tStandardsampleWide.Location = new System.Drawing.Point(445, 58);
+            this.tStandardsampleWide.Location = new System.Drawing.Point(356, 46);
             this.tStandardsampleWide.Margin = new System.Windows.Forms.Padding(2);
             this.tStandardsampleWide.Name = "tStandardsampleWide";
-            this.tStandardsampleWide.Size = new System.Drawing.Size(102, 25);
+            this.tStandardsampleWide.Size = new System.Drawing.Size(82, 21);
             this.tStandardsampleWide.TabIndex = 17;
             // 
             // label10
             // 
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(372, 62);
+            this.label10.Location = new System.Drawing.Point(298, 50);
             this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(52, 15);
+            this.label10.Size = new System.Drawing.Size(41, 12);
             this.label10.TabIndex = 16;
             this.label10.Text = "宽度：";
             // 
             // tStandardsampleY
             // 
-            this.tStandardsampleY.Location = new System.Drawing.Point(188, 95);
+            this.tStandardsampleY.Location = new System.Drawing.Point(150, 76);
             this.tStandardsampleY.Margin = new System.Windows.Forms.Padding(2);
             this.tStandardsampleY.Name = "tStandardsampleY";
-            this.tStandardsampleY.Size = new System.Drawing.Size(102, 25);
+            this.tStandardsampleY.Size = new System.Drawing.Size(82, 21);
             this.tStandardsampleY.TabIndex = 15;
             // 
             // label11
             // 
             this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(155, 98);
+            this.label11.Location = new System.Drawing.Point(124, 78);
             this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(30, 15);
+            this.label11.Size = new System.Drawing.Size(23, 12);
             this.label11.TabIndex = 14;
             this.label11.Text = "Y：";
             // 
             // tStandardsampleX
             // 
-            this.tStandardsampleX.Location = new System.Drawing.Point(188, 58);
+            this.tStandardsampleX.Location = new System.Drawing.Point(150, 46);
             this.tStandardsampleX.Margin = new System.Windows.Forms.Padding(2);
             this.tStandardsampleX.Name = "tStandardsampleX";
-            this.tStandardsampleX.Size = new System.Drawing.Size(102, 25);
+            this.tStandardsampleX.Size = new System.Drawing.Size(82, 21);
             this.tStandardsampleX.TabIndex = 13;
             // 
             // label12
             // 
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(155, 62);
+            this.label12.Location = new System.Drawing.Point(124, 50);
             this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(30, 15);
+            this.label12.Size = new System.Drawing.Size(23, 12);
             this.label12.TabIndex = 12;
             this.label12.Text = "X：";
             // 
             // label13
             // 
             this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(18, 62);
+            this.label13.Location = new System.Drawing.Point(14, 50);
             this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(97, 15);
+            this.label13.Size = new System.Drawing.Size(77, 12);
             this.label13.TabIndex = 11;
             this.label13.Text = "中心点坐标：";
             // 
             // radioButton_StandardsampleSqare
             // 
             this.radioButton_StandardsampleSqare.AutoSize = true;
-            this.radioButton_StandardsampleSqare.Location = new System.Drawing.Point(232, 28);
+            this.radioButton_StandardsampleSqare.Location = new System.Drawing.Point(186, 22);
             this.radioButton_StandardsampleSqare.Margin = new System.Windows.Forms.Padding(2);
             this.radioButton_StandardsampleSqare.Name = "radioButton_StandardsampleSqare";
-            this.radioButton_StandardsampleSqare.Size = new System.Drawing.Size(58, 19);
+            this.radioButton_StandardsampleSqare.Size = new System.Drawing.Size(47, 16);
             this.radioButton_StandardsampleSqare.TabIndex = 10;
             this.radioButton_StandardsampleSqare.TabStop = true;
             this.radioButton_StandardsampleSqare.Text = "方形";
@@ -402,10 +404,10 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // radioButton_StandardsampleCircle
             // 
             this.radioButton_StandardsampleCircle.AutoSize = true;
-            this.radioButton_StandardsampleCircle.Location = new System.Drawing.Point(158, 28);
+            this.radioButton_StandardsampleCircle.Location = new System.Drawing.Point(126, 22);
             this.radioButton_StandardsampleCircle.Margin = new System.Windows.Forms.Padding(2);
             this.radioButton_StandardsampleCircle.Name = "radioButton_StandardsampleCircle";
-            this.radioButton_StandardsampleCircle.Size = new System.Drawing.Size(58, 19);
+            this.radioButton_StandardsampleCircle.Size = new System.Drawing.Size(47, 16);
             this.radioButton_StandardsampleCircle.TabIndex = 9;
             this.radioButton_StandardsampleCircle.TabStop = true;
             this.radioButton_StandardsampleCircle.Text = "圆形";
@@ -415,19 +417,19 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // label14
             // 
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(18, 32);
+            this.label14.Location = new System.Drawing.Point(14, 26);
             this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(82, 15);
+            this.label14.Size = new System.Drawing.Size(65, 12);
             this.label14.TabIndex = 8;
             this.label14.Text = "标样形状：";
             // 
             // button_Generate
             // 
-            this.button_Generate.Location = new System.Drawing.Point(692, 730);
+            this.button_Generate.Location = new System.Drawing.Point(554, 586);
             this.button_Generate.Margin = new System.Windows.Forms.Padding(2);
             this.button_Generate.Name = "button_Generate";
-            this.button_Generate.Size = new System.Drawing.Size(407, 38);
+            this.button_Generate.Size = new System.Drawing.Size(127, 30);
             this.button_Generate.TabIndex = 16;
             this.button_Generate.Text = "生成";
             this.button_Generate.UseVisualStyleBackColor = true;
@@ -441,24 +443,24 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             this.dataGridView_Holes.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.dataGridView_Holes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView_Holes.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataGridView_Holes.Location = new System.Drawing.Point(2, 20);
+            this.dataGridView_Holes.Location = new System.Drawing.Point(2, 16);
             this.dataGridView_Holes.Margin = new System.Windows.Forms.Padding(2);
             this.dataGridView_Holes.Name = "dataGridView_Holes";
             this.dataGridView_Holes.RowHeadersVisible = false;
             this.dataGridView_Holes.RowHeadersWidth = 62;
             this.dataGridView_Holes.RowTemplate.Height = 20;
             this.dataGridView_Holes.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dataGridView_Holes.Size = new System.Drawing.Size(644, 390);
+            this.dataGridView_Holes.Size = new System.Drawing.Size(514, 312);
             this.dataGridView_Holes.TabIndex = 17;
             this.dataGridView_Holes.CurrentCellChanged += new System.EventHandler(this.dataGridView_Holes_CurrentCellChanged);
             this.dataGridView_Holes.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dataGridView_Holes_Scroll);
             // 
             // button_AddHole
             // 
-            this.button_AddHole.Location = new System.Drawing.Point(658, 378);
+            this.button_AddHole.Location = new System.Drawing.Point(526, 302);
             this.button_AddHole.Margin = new System.Windows.Forms.Padding(2);
             this.button_AddHole.Name = "button_AddHole";
-            this.button_AddHole.Size = new System.Drawing.Size(28, 108);
+            this.button_AddHole.Size = new System.Drawing.Size(22, 86);
             this.button_AddHole.TabIndex = 18;
             this.button_AddHole.Text = "增加样品孔";
             this.button_AddHole.UseVisualStyleBackColor = true;
@@ -466,10 +468,10 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // 
             // button_DelHole
             // 
-            this.button_DelHole.Location = new System.Drawing.Point(658, 488);
+            this.button_DelHole.Location = new System.Drawing.Point(526, 390);
             this.button_DelHole.Margin = new System.Windows.Forms.Padding(2);
             this.button_DelHole.Name = "button_DelHole";
-            this.button_DelHole.Size = new System.Drawing.Size(28, 108);
+            this.button_DelHole.Size = new System.Drawing.Size(22, 86);
             this.button_DelHole.TabIndex = 19;
             this.button_DelHole.Text = "删除样品孔";
             this.button_DelHole.UseVisualStyleBackColor = true;
@@ -478,11 +480,11 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // groupBox3
             // 
             this.groupBox3.Controls.Add(this.dataGridView_Holes);
-            this.groupBox3.Location = new System.Drawing.Point(5, 358);
+            this.groupBox3.Location = new System.Drawing.Point(4, 286);
             this.groupBox3.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox3.Size = new System.Drawing.Size(648, 412);
+            this.groupBox3.Size = new System.Drawing.Size(518, 330);
             this.groupBox3.TabIndex = 20;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "样品孔信息：";
@@ -490,10 +492,10 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // button_Ok
             // 
             this.button_Ok.Enabled = false;
-            this.button_Ok.Location = new System.Drawing.Point(1256, 730);
+            this.button_Ok.Location = new System.Drawing.Point(1005, 584);
             this.button_Ok.Margin = new System.Windows.Forms.Padding(2);
             this.button_Ok.Name = "button_Ok";
-            this.button_Ok.Size = new System.Drawing.Size(148, 38);
+            this.button_Ok.Size = new System.Drawing.Size(118, 30);
             this.button_Ok.TabIndex = 21;
             this.button_Ok.Text = "保存";
             this.button_Ok.UseVisualStyleBackColor = true;
@@ -501,19 +503,46 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             // 
             // button_Coordinate
             // 
-            this.button_Coordinate.Location = new System.Drawing.Point(1104, 730);
+            this.button_Coordinate.Location = new System.Drawing.Point(861, 586);
+            this.button_Coordinate.Margin = new System.Windows.Forms.Padding(2);
             this.button_Coordinate.Name = "button_Coordinate";
-            this.button_Coordinate.Size = new System.Drawing.Size(125, 38);
+            this.button_Coordinate.Size = new System.Drawing.Size(100, 30);
             this.button_Coordinate.TabIndex = 22;
             this.button_Coordinate.Text = "坐标系显示";
             this.button_Coordinate.UseVisualStyleBackColor = true;
             this.button_Coordinate.Click += new System.EventHandler(this.button_Coordinate_Click);
             // 
+            // btn_reght90
+            // 
+            this.btn_reght90.Enabled = false;
+            this.btn_reght90.Location = new System.Drawing.Point(771, 586);
+            this.btn_reght90.Margin = new System.Windows.Forms.Padding(2);
+            this.btn_reght90.Name = "btn_reght90";
+            this.btn_reght90.Size = new System.Drawing.Size(86, 30);
+            this.btn_reght90.TabIndex = 23;
+            this.btn_reght90.Text = "向右偏转90度";
+            this.btn_reght90.UseVisualStyleBackColor = true;
+            this.btn_reght90.Click += new System.EventHandler(this.btn_reght90_Click);
+            // 
+            // btn_left90
+            // 
+            this.btn_left90.Enabled = false;
+            this.btn_left90.Location = new System.Drawing.Point(685, 586);
+            this.btn_left90.Margin = new System.Windows.Forms.Padding(2);
+            this.btn_left90.Name = "btn_left90";
+            this.btn_left90.Size = new System.Drawing.Size(86, 30);
+            this.btn_left90.TabIndex = 24;
+            this.btn_left90.Text = "向左偏转90度";
+            this.btn_left90.UseVisualStyleBackColor = true;
+            this.btn_left90.Click += new System.EventHandler(this.btn_left90_Click);
+            // 
             // DlgStageEdit
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(1407, 773);
+            this.ClientSize = new System.Drawing.Size(1127, 625);
+            this.Controls.Add(this.btn_left90);
+            this.Controls.Add(this.btn_reght90);
             this.Controls.Add(this.button_Coordinate);
             this.Controls.Add(this.button_Ok);
             this.Controls.Add(this.button_DelHole);
@@ -531,9 +560,9 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             this.HelpButton = true;
             this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(1425, 820);
+            this.MaximumSize = new System.Drawing.Size(1143, 664);
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(1425, 820);
+            this.MinimumSize = new System.Drawing.Size(1143, 664);
             this.Name = "DlgStageEdit";
             this.ShowIcon = false;
             this.ShowInTaskbar = false;
@@ -596,5 +625,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
         private System.Windows.Forms.Button button_Ok;
         private System.Windows.Forms.HelpProvider helpProvider1;
         private System.Windows.Forms.Button button_Coordinate;
+        private System.Windows.Forms.Button btn_reght90;
+        private System.Windows.Forms.Button btn_left90;
     }
 }

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageEdit.cs

@@ -18,19 +18,22 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
     {
         // stage file
         //CStageParam m_pStageFile;
-        public CStage m_pStage;
+        public CStage Stage;
         StageDisplayHelp stageDisplayHelp;
         OTSCommon.Language lan;
         System.Collections.Hashtable hashtable;
-        public DlgStageEdit()
+        List<string> StageNames = new List<string>();
+        public DlgStageEdit(List<string> a_StageNames)
         {
             InitializeComponent();
+            StageNames = a_StageNames;
         }
         
-        public DlgStageEdit(CStage cStage)
+        public DlgStageEdit(CStage a_Stage,List<string> a_StageNames)
         {
             InitializeComponent();
-            m_pStage = cStage;
+            Stage = a_Stage;
+            StageNames = a_StageNames;
         }
         ComboBox cmb_Temp = new ComboBox();
         private void DlgStageEdit_Load(object sender, EventArgs e)
@@ -62,12 +65,13 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             cmb_Temp.SelectedIndexChanged += new EventHandler(cmb_Temp_SelectedIndexChanged);
             dataGridView_Holes.Controls.Add(cmb_Temp);
             stageDisplayHelp = new StageDisplayHelp();
-            if(m_pStage!=null)
+            if(Stage!=null)
             {
-                LoadStageData(m_pStage);
+                LoadStageData(Stage);
             }
             SetHelp();
-       
+
+            StageNames.Remove(tStageName.Text.Trim());
         }
         void SetHelp()
         {
@@ -79,69 +83,73 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
         }
         void LoadStageData(CStage cStage)
         {
-            tStageName.Text = m_pStage.GetName();
-            if(m_pStage.GetBoundary().GetShape()== otsdataconst.DOMAIN_SHAPE.ROUND)
+            tStageName.Text = Stage.GetName();
+            if(Stage.GetBoundary().GetShape()== otsdataconst.DOMAIN_SHAPE.ROUND)
             {
                 radioButton_BoundaryCircle.Checked = true;
-                tBoundaryWide.Text = m_pStage.GetBoundary().GetDiameter().ToString();
+                tBoundaryWide.Text = Stage.GetBoundary().GetDiameter().ToString();
+                tBoundaryWide.Enabled = false;
                 tBoundaryHeight.Text = "0";
             }
             else
             {
                 radioButton_BoundarySquare.Checked = true;
-                tBoundaryWide.Text = m_pStage.GetBoundary().GetRectDomain().Width.ToString();
-                tBoundaryHeight.Text = m_pStage.GetBoundary().GetRectDomain().Height.ToString();
+                tBoundaryWide.Text = Stage.GetBoundary().GetRectDomain().Width.ToString();
+                tBoundaryWide.Enabled = true;
+                tBoundaryHeight.Text = Stage.GetBoundary().GetRectDomain().Height.ToString();
             }
-            tBoundaryX.Text= m_pStage.GetBoundary().GetDomainCenter().X.ToString();
-            tBoundaryY.Text = m_pStage.GetBoundary().GetDomainCenter().Y.ToString();
-            if(m_pStage.GetSTD().GetShape()== otsdataconst.DOMAIN_SHAPE.ROUND)
+            tBoundaryX.Text= Stage.GetBoundary().GetDomainCenter().X.ToString();
+            tBoundaryY.Text = Stage.GetBoundary().GetDomainCenter().Y.ToString();
+            if(Stage.GetSTD().GetShape()== otsdataconst.DOMAIN_SHAPE.ROUND)
             {
                 radioButton_StandardsampleCircle.Checked = true;
-                tStandardsampleWide.Text = m_pStage.GetSTD().GetDiameter().ToString();
+                tStandardsampleHeight.Enabled = false;
+                tStandardsampleWide.Text = Stage.GetSTD().GetDiameter().ToString();
             }
             else
             {
                 radioButton_StandardsampleSqare.Checked = true;
-                tStandardsampleWide.Text = m_pStage.GetSTD().GetRectDomain().Width.ToString();
+                tStandardsampleHeight.Enabled =true;
+                tStandardsampleWide.Text = Stage.GetSTD().GetRectDomain().Width.ToString();
             }
-            tStandardsampleX.Text = m_pStage.GetSTD().GetDomainCenter().X.ToString();
-            tStandardsampleY.Text = m_pStage.GetSTD().GetDomainCenter().Y.ToString();
-            tStandardsampleHeight.Text = m_pStage.GetSTD().GetRectDomain().Height.ToString();
-            dataGridView_Holes.Rows[0].Cells[0].Value = m_pStage.GetHoleList()[0].GetName();
-            if (m_pStage.GetHoleList()[0].GetShape() == otsdataconst.DOMAIN_SHAPE.ROUND)
+            tStandardsampleX.Text = Stage.GetSTD().GetDomainCenter().X.ToString();
+            tStandardsampleY.Text = Stage.GetSTD().GetDomainCenter().Y.ToString();
+            tStandardsampleHeight.Text = Stage.GetSTD().GetRectDomain().Height.ToString();
+            dataGridView_Holes.Rows[0].Cells[0].Value = Stage.GetHoleList()[0].GetName();
+            if (Stage.GetHoleList()[0].GetShape() == otsdataconst.DOMAIN_SHAPE.ROUND)
             {
                 dataGridView_Holes.Rows[0].Cells[1].Value = "圆形";
-                dataGridView_Holes.Rows[0].Cells[4].Value = m_pStage.GetHoleList()[0].GetDiameter().ToString();
+                dataGridView_Holes.Rows[0].Cells[4].Value = Stage.GetHoleList()[0].GetDiameter().ToString();
                 dataGridView_Holes.Rows[0].Cells[5].Value = "0";
             }
             else
             {
                 dataGridView_Holes.Rows[0].Cells[1].Value = "方形";
-                dataGridView_Holes.Rows[0].Cells[4].Value = m_pStage.GetHoleList()[0].GetRectDomain().Width.ToString();
-                dataGridView_Holes.Rows[0].Cells[5].Value = m_pStage.GetHoleList()[0].GetRectDomain().Height.ToString();
+                dataGridView_Holes.Rows[0].Cells[4].Value = Stage.GetHoleList()[0].GetRectDomain().Width.ToString();
+                dataGridView_Holes.Rows[0].Cells[5].Value = Stage.GetHoleList()[0].GetRectDomain().Height.ToString();
             }
             
-            dataGridView_Holes.Rows[0].Cells[2].Value = m_pStage.GetHoleList()[0].GetDomainCenter().X.ToString();
-            dataGridView_Holes.Rows[0].Cells[3].Value = m_pStage.GetHoleList()[0].GetDomainCenter().Y.ToString();
+            dataGridView_Holes.Rows[0].Cells[2].Value = Stage.GetHoleList()[0].GetDomainCenter().X.ToString();
+            dataGridView_Holes.Rows[0].Cells[3].Value = Stage.GetHoleList()[0].GetDomainCenter().Y.ToString();
             
-            for (int i=1;i< m_pStage.GetHoleList().Count;i++)
+            for (int i=1;i< Stage.GetHoleList().Count;i++)
             {
                 string sr = "";
                 string pra1 = "";
                 string pra2 = "";
-                if (m_pStage.GetHoleList()[i].GetShape() == otsdataconst.DOMAIN_SHAPE.ROUND)
+                if (Stage.GetHoleList()[i].GetShape() == otsdataconst.DOMAIN_SHAPE.ROUND)
                 {
                     sr= "圆形";
-                    pra1 = m_pStage.GetHoleList()[i].GetDiameter().ToString();
+                    pra1 = Stage.GetHoleList()[i].GetDiameter().ToString();
                     pra2 = "0";
                 }
                 else
                 {
                     sr= "方形";
-                    pra1 = m_pStage.GetHoleList()[i].GetRectDomain().Width.ToString();
-                    pra2 = m_pStage.GetHoleList()[i].GetRectDomain().Height.ToString();
+                    pra1 = Stage.GetHoleList()[i].GetRectDomain().Width.ToString();
+                    pra2 = Stage.GetHoleList()[i].GetRectDomain().Height.ToString();
                 }
-                dataGridView_Holes.Rows.Add(m_pStage.GetHoleList()[i].GetName(), sr, m_pStage.GetHoleList()[i].GetDomainCenter().X.ToString(), m_pStage.GetHoleList()[i].GetDomainCenter().Y.ToString(), pra1, pra2);
+                dataGridView_Holes.Rows.Add(Stage.GetHoleList()[i].GetName(), sr, Stage.GetHoleList()[i].GetDomainCenter().X.ToString(), Stage.GetHoleList()[i].GetDomainCenter().Y.ToString(), pra1, pra2);
             }
         }
         private void radioButton_BoundaryCircle_Click(object sender, EventArgs e)
@@ -222,6 +230,11 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
 
         private void button_Generate_Click(object sender, EventArgs e)
         {
+            if(StageNames.Contains(tStageName.Text.Trim()))
+            {
+                MessageBox.Show("Already exist " + tStageName.Text.Trim() + "!", "Error");
+                return;
+            }
             if (!CheckParams())
             {
                 this.button_Ok.Enabled = false;
@@ -252,8 +265,8 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             m_DefaultParam.LoadInfoFromProgMgrFile();
             a_pCSEMStageData = m_DefaultParam.GetStageDataParam();
 
-            m_pStage = new CStage();
-            m_pStage.SetName(tStageName.Text);
+            Stage = new CStage();
+            Stage.SetName(tStageName.Text);
             // boundary
             string strValue = "";
             if(radioButton_BoundaryCircle.Checked)
@@ -383,10 +396,12 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             }
 
 
-            m_pStage.SetBoundary(pBoundary);
-            m_pStage.SetSTD(pSTD);
-            m_pStage.SetHoleList(listStageHoles, true);
+            Stage.SetBoundary(pBoundary);
+            Stage.SetSTD(pSTD);
+            Stage.SetHoleList(listStageHoles, true);
             DrawStage();
+            btn_reght90.Enabled = true;
+            btn_left90.Enabled = true;
             this.button_Ok.Enabled = true;
         }
 
@@ -413,7 +428,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             ((Graphics)pDC).InterpolationMode = InterpolationMode.HighQualityBicubic;//高质量
             ((Graphics)pDC).CompositingQuality = CompositingQuality.HighQuality;//再加一点
                                                                                 //get stage information              
-            CDomain pBoundery = m_pStage.GetBoundary();// GetBoundary();
+            CDomain pBoundery = Stage.GetBoundary();// GetBoundary();
             System.Drawing.RectangleF BounderyRect = pBoundery.GetDomainRect();
             int nBounderyWidth = (int)(BounderyRect.Width);//um,，pixle is （nWidth - PIC_EDGE * 2 ）
             int nBounderyHeight = 0;
@@ -437,17 +452,17 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             }
             //draw boundery
             Brush pLTGrayBrush = new SolidBrush(Color.FromArgb(255, 0, 0));
-            stageDisplayHelp.DrawStageBoundery(m_pStage, nWidth, nHeight, pDC, PixSize);
+            stageDisplayHelp.DrawStageBoundery(Stage, nWidth, nHeight, pDC, PixSize);
 
             //draw STD
             Brush pBlackBrush = new SolidBrush(Color.FromArgb(255, 0, 0));
 
-            stageDisplayHelp.DrawStageSTD(m_pStage, nWidth, nHeight, pDC, PixSize);
+            stageDisplayHelp.DrawStageSTD(Stage, nWidth, nHeight, pDC, PixSize);
 
             ////draw holes
             //Brush pWriteBrush = new SolidBrush(Color.FromArgb(255, 0, 0)); ;
 
-            stageDisplayHelp.DrawStageHole(m_pStage, nWidth, nHeight, pDC, PixSize);
+            stageDisplayHelp.DrawStageHole(Stage, nWidth, nHeight, pDC, PixSize);
 
             // draw ratio
             stageDisplayHelp.DrawRatio(nBounderyWidth, nWidth, nHeight, pDC, (IntPtr)pWnd, rc);
@@ -613,7 +628,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             else
             {
                 button_Coordinate.Text = "坐标系显示";
-                if(m_pStage != null)
+                if(Stage != null)
                 {
                     DrawStage();
                 }
@@ -623,5 +638,33 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
                 }
             }
         }
+
+        private void btn_reght90_Click(object sender, EventArgs e)
+        {
+            double it = 0;
+            for (int i = 0; i < dataGridView_Holes.Rows.Count; i++)
+            {
+                it = Convert.ToDouble(dataGridView_Holes.Rows[i].Cells[3].Value);
+                dataGridView_Holes.Rows[i].Cells[3].Value= -Convert.ToDouble(dataGridView_Holes.Rows[i].Cells[2].Value);
+                dataGridView_Holes.Rows[i].Cells[2].Value = it;
+            }
+            dataGridView_Holes.Refresh();
+
+            button_Generate_Click(null, null);
+        }
+
+        private void btn_left90_Click(object sender, EventArgs e)
+        {
+            double it = 0;
+            for (int i = 0; i < dataGridView_Holes.Rows.Count; i++)
+            {
+                it = -Convert.ToDouble(dataGridView_Holes.Rows[i].Cells[3].Value);
+                dataGridView_Holes.Rows[i].Cells[3].Value = Convert.ToDouble(dataGridView_Holes.Rows[i].Cells[2].Value);
+                dataGridView_Holes.Rows[i].Cells[2].Value = it;
+            }
+            dataGridView_Holes.Refresh();
+
+            button_Generate_Click(null, null);
+        }
     }
 }

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageMgr.cs

@@ -508,12 +508,17 @@ namespace OTSModelSharp.Measure.GetStageInfo
 
         private void button_edit_Click(object sender, EventArgs e)
         {
-            DlgStageEdit dlgStageEdit = new DlgStageEdit(m_pStageFile.GetStagesList()[m_ctrlListBoxStageList.SelectedIndex]);
+            List<string> StageNames = new List<string>();
+            foreach (var it in m_ctrlListBoxStageList.Items)
+            {
+                StageNames.Add(it.ToString());
+            }
+            DlgStageEdit dlgStageEdit = new DlgStageEdit(m_pStageFile.GetStagesList()[m_ctrlListBoxStageList.SelectedIndex], StageNames);
 
             if (dlgStageEdit.ShowDialog() == DialogResult.OK)
             {
                 List<CStage> cli = m_pStageFile.GetStagesList();
-                cli[m_ctrlListBoxStageList.SelectedIndex]=dlgStageEdit.m_pStage;
+                cli[m_ctrlListBoxStageList.SelectedIndex]=dlgStageEdit.Stage;
                 //m_pStageFile.SetStagesList(cli, true);
                 m_pStageFile.SetModify(true);
                 SetStageListControlData();
@@ -526,12 +531,18 @@ namespace OTSModelSharp.Measure.GetStageInfo
 
         private void button_New_Click(object sender, EventArgs e)
         {
-            DlgStageEdit dlgStageEdit = new DlgStageEdit();
+            List<string> StageNames = new List<string>();
+            foreach(var it in m_ctrlListBoxStageList.Items)
+            {
+                StageNames.Add(it.ToString());
+            }
+            
+            DlgStageEdit dlgStageEdit = new DlgStageEdit(StageNames);
 
             if (dlgStageEdit.ShowDialog() == DialogResult.OK)
             {
                 List<CStage> cli = m_pStageFile.GetStagesList();
-                cli.Add(dlgStageEdit.m_pStage);
+                cli.Add(dlgStageEdit.Stage);
                 //m_pStageFile.SetStagesList(cli, true);
                 m_pStageFile.SetModify(true);
                 SetStageListControlData();