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

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.Designer.cs

@@ -35,6 +35,7 @@
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.TSLoad = new System.Windows.Forms.ToolStripButton();
             this.PropGrid = new SourceGrid.Grid();
+            this.toolStripButton_refresh = new System.Windows.Forms.ToolStripButton();
             this.TSGridTitle.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -53,7 +54,8 @@
             this.TSEdit,
             this.TSSaveAs,
             this.toolStripSeparator2,
-            this.TSLoad});
+            this.TSLoad,
+            this.toolStripButton_refresh});
             this.TSGridTitle.Location = new System.Drawing.Point(0, 1);
             this.TSGridTitle.Name = "TSGridTitle";
             this.TSGridTitle.Padding = new System.Windows.Forms.Padding(0);
@@ -117,6 +119,16 @@
             this.PropGrid.ToolTipText = "";
             this.PropGrid.Click += new System.EventHandler(this.PropGrid_Click_1);
             // 
+            // toolStripButton_refresh
+            // 
+            this.toolStripButton_refresh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton_refresh.Image = global::OTSMeasureApp.Properties.Resources.Recover16;
+            this.toolStripButton_refresh.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton_refresh.Name = "toolStripButton_refresh";
+            this.toolStripButton_refresh.Size = new System.Drawing.Size(28, 23);
+            this.toolStripButton_refresh.Text = "toolStripButton1";
+            this.toolStripButton_refresh.Click += new System.EventHandler(this.toolStripButton_refresh_Click);
+            // 
             // OTSPropertyWindow
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -150,5 +162,6 @@
         public SourceGrid.Grid PropGrid;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         public System.Windows.Forms.ToolStripButton TSLoad;
+        private System.Windows.Forms.ToolStripButton toolStripButton_refresh;
     }
 }

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -385,5 +385,13 @@ namespace OTSMeasureApp
                 return;
             }
         }
+
+        private void toolStripButton_refresh_Click(object sender, EventArgs e)
+        {
+            var sample = m_MeasureAppForm.m_ProjParam.GetWorkSample();
+            var stype = m_MeasureAppForm.m_ProjParam.GetDefaultParam().GetSysType();
+            OTSSampleVisualPropertyInfo MeasureInfo = new OTSSampleVisualPropertyInfo(sample, stype);
+            DisplaySampleMeasureInfo(MeasureInfo);
+        }
     }
 }

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.resx

@@ -134,32 +134,32 @@
   <data name="TSEdit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="TSSaveAs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

OTSPartA_STDEditor/UI/Form_Main.cs

@@ -919,7 +919,7 @@ namespace OTSPartA_STDEditor
             new_STDdata.Element = "1";
             new_STDdata.StrName = "NewRuleName";
             //new_STDdata.Expression = "NewRules";
-            new_STDdata.Expression = "";
+            new_STDdata.Expression = "false";
             new_STDdata.KeyElementList = "";
             new_STDdata.SubElementList = "";
 

OTSPartA_STDEditor/UI/STDEditor.cs

@@ -682,13 +682,12 @@ namespace OTSPartA_STDEditor
 
         private void textbox_STDEditor_MouseLeave(object sender, EventArgs e)
         {
-            dataGridView_KeyElements.Rows.Clear();
-            dataGridView_KeyElements.Columns.Clear();
+            dataGridView_SubElements.Rows.Clear();
+            dataGridView_SubElements.Columns.Clear(); 
 
 
             string str_RemoveBlank = textbox_STDEditor.Text.ToString().Replace(" ", "");
             str_RemoveBlank = str_RemoveBlank.Replace("\r\n", "");
-            //str_RemoveBlank = str_RemoveBlank.Replace("fourth_elem", "");
             string[] str_Removeand = System.Text.RegularExpressions.Regex.Split(str_RemoveBlank, "and", System.Text.RegularExpressions.RegexOptions.None);
             List<string> str_Removeandor = new List<string>();
             for (int i = 0; i < str_Removeand.Length; i++)
@@ -712,46 +711,46 @@ namespace OTSPartA_STDEditor
                 }
             }
 
-            List<string> SubElements = new List<string>();
-            for (int i = 0; i < dataGridView_SubElements.ColumnCount; i++)
+            List<string> KeyElements = new List<string>();
+            for (int i = 0; i < dataGridView_KeyElements.ColumnCount; i++)
             {
-                if (UsingElementL.Contains(dataGridView_SubElements.Rows[0].Cells[i].Value))
+                if (UsingElementL.Contains(dataGridView_KeyElements.Rows[0].Cells[i].Value))
                 {
-                    SubElements.Add(dataGridView_SubElements.Rows[0].Cells[i].Value.ToString());
+                    KeyElements.Add(dataGridView_KeyElements.Rows[0].Cells[i].Value.ToString());
                 }
             }
 
-            dataGridView_SubElements.Rows.Clear();
-            dataGridView_SubElements.Columns.Clear();
+            dataGridView_KeyElements.Rows.Clear();
+            dataGridView_KeyElements.Columns.Clear();
 
-            for (int i = 0; i < SubElements.Count; i++)
+            for (int i = 0; i < KeyElements.Count; i++)
             {
                 DataGridViewButtonColumn dataGridViewButtonColumn = new DataGridViewButtonColumn();
-                dataGridViewButtonColumn.Name = dataGridView_SubElements.Columns.Count.ToString();
-                dataGridView_SubElements.Columns.Add(dataGridViewButtonColumn);
-                if (dataGridView_SubElements.Rows.Count == 0)
+                dataGridViewButtonColumn.Name = dataGridView_KeyElements.Columns.Count.ToString();
+                dataGridView_KeyElements.Columns.Add(dataGridViewButtonColumn);
+                if (dataGridView_KeyElements.Rows.Count == 0)
                 {
                     DataGridViewRow row = new DataGridViewRow();
-                    dataGridView_SubElements.Rows.Add(row);
+                    dataGridView_KeyElements.Rows.Add(row);
                 }
-                dataGridView_SubElements.Rows[0].Cells[dataGridView_SubElements.ColumnCount - 1].Value = SubElements[i];
+                dataGridView_KeyElements.Rows[0].Cells[dataGridView_KeyElements.ColumnCount - 1].Value = KeyElements[i];
             }
 
-            if (SubElements.Count > 0)
+            if (KeyElements.Count > 0)
             {
                 for (int i = 0; i < UsingElementL.Count; i++)
                 {
-                    if (!SubElements.Contains(UsingElementL[i]))
+                    if (!KeyElements.Contains(UsingElementL[i]))
                     {
                         DataGridViewButtonColumn dataGridViewButtonColumn = new DataGridViewButtonColumn();
-                        dataGridViewButtonColumn.Name = dataGridView_KeyElements.Columns.Count.ToString();
-                        dataGridView_KeyElements.Columns.Add(dataGridViewButtonColumn);
-                        if (dataGridView_KeyElements.Rows.Count == 0)
+                        dataGridViewButtonColumn.Name = dataGridView_SubElements.Columns.Count.ToString();
+                        dataGridView_SubElements.Columns.Add(dataGridViewButtonColumn);
+                        if (dataGridView_SubElements.Rows.Count == 0)
                         {
                             DataGridViewRow row = new DataGridViewRow();
-                            dataGridView_KeyElements.Rows.Add(row);
+                            dataGridView_SubElements.Rows.Add(row);
                         }
-                        dataGridView_KeyElements.Rows[0].Cells[dataGridView_KeyElements.ColumnCount - 1].Value = UsingElementL[i];
+                        dataGridView_SubElements.Rows[0].Cells[dataGridView_SubElements.ColumnCount - 1].Value = UsingElementL[i];
                     }
                 }
             }
@@ -760,14 +759,14 @@ namespace OTSPartA_STDEditor
                 for (int i = 0; i < UsingElementL.Count; i++)
                 {
                     DataGridViewButtonColumn dataGridViewButtonColumn = new DataGridViewButtonColumn();
-                    dataGridViewButtonColumn.Name = dataGridView_KeyElements.Columns.Count.ToString();
-                    dataGridView_KeyElements.Columns.Add(dataGridViewButtonColumn);
-                    if (dataGridView_KeyElements.Rows.Count == 0)
+                    dataGridViewButtonColumn.Name = dataGridView_SubElements.Columns.Count.ToString();
+                    dataGridView_SubElements.Columns.Add(dataGridViewButtonColumn);
+                    if (dataGridView_SubElements.Rows.Count == 0)
                     {
                         DataGridViewRow row = new DataGridViewRow();
-                        dataGridView_KeyElements.Rows.Add(row);
+                        dataGridView_SubElements.Rows.Add(row);
                     }
-                    dataGridView_KeyElements.Rows[0].Cells[i].Value = UsingElementL[i];
+                    dataGridView_SubElements.Rows[0].Cells[i].Value = UsingElementL[i];
                 }
             }
             dataGridView_KeyElements.ClearSelection();

OTSPartA_STDEditor/UI/STDRuleslist.cs

@@ -84,6 +84,8 @@ namespace OTSPartA_STDEditor
                 i++;
             }
 
+
+
             Grid_Minerals.Controller.AddController(m_ValueChangedEvent);
             Grid_Minerals.FixedRows = 1;// 第一行是列标题不可以滚动
             Grid_Minerals.Selection.FocusStyle = FocusStyle.None;