Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -2743,7 +2743,7 @@ namespace OTSMeasureApp
                     #region 计算标尺尺寸部份-----缩小
                     f_ruler_size =f_old_ruler_size * m_GlobalZoomNum;
                     control_Ruler2.RulerWidth = Convert.ToInt32(f_ruler_size);
-                    control_Ruler2.Value = 1000;
+                    control_Ruler2.Value = 1;
                     //control_Ruler2.SetValue(control_Ruler2.RulerWidth);
                     while (control_Ruler2.Width > 300)
                     {
@@ -2795,7 +2795,7 @@ namespace OTSMeasureApp
                         f_ruler_size = f_old_ruler_size;
 
                         control_Ruler2.RulerWidth = Convert.ToInt32(f_ruler_size);
-                        control_Ruler2.ShowString = "1000um";
+                        control_Ruler2.ShowString = "1mm";
                         control_Ruler2.SetValue(control_Ruler2.RulerWidth);
                     }
 

OTSIncAMeasureApp/About.cs

@@ -20,7 +20,7 @@ namespace OTSMeasureApp
         private void About_Load(object sender, EventArgs e)
         {
 
-            richTextBox1.Text = "Version : 2.1";
+            richTextBox1.Text = "Version : 2.3";
             richTextBox1.Select(0, richTextBox1.Text.Length);
             //richTextBox1.SelectionColor = Color.DarkBlue;
             richTextBox1.SelectionAlignment = HorizontalAlignment.Center;