Merge branch 'Release3.3' of http://36.129.169.60:30080/gogsadmin/OTS into Release3.3

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -526,7 +526,6 @@ namespace OTSMeasureApp
                 PrepareVisualMeasureField(GetWorkingVisualSample());
             }
         }
-       
         public void SetWorkSampleMeasureArea(SampleMeasurePara SMeasurePara)
         {
             COTSSample WSample = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample();

OTSPartA_STDEditor/BaseClass/STDInfo.cs

@@ -131,11 +131,11 @@ namespace OTSPartA_STDEditor.BaseClass
                     new_data.name = "Default";
                     new_data.color = "#C9C9C9";
                     new_data.iorder = 10000;
-                    GroupDictionary.Add(0, new_data);
-                    if (dt.Select("id='0'").Length == 0)
+                    GroupDictionary.Add(10000, new_data);
+                    if (dt.Select("id='10000'").Length == 0)
                     {
-                        GroupIdDictionaryFromId.Add(0, "Default");
-                        GroupIdDictionaryFromName.Add("Default", 0);
+                        GroupIdDictionaryFromId.Add(10000, "Default");
+                        GroupIdDictionaryFromName.Add("Default", 10000);
                     }
 
                     if (dt.Rows.Count > 0)

OTSPartA_STDEditor/UI/STDRuleslist.cs

@@ -147,18 +147,30 @@ namespace OTSPartA_STDEditor
             m_MainForm._sTDEditor.GroupIdDictionaryFromId.Clear();
             m_MainForm._sTDEditor.GroupIdDictionaryFromName.Clear();
             m_MainForm._sTDEditor.STDDictionary.Clear();
+            m_MainForm._sTDEditor.GroupDictionary.Clear();
             foreach (TreeNode treeNode in treeView_G.Nodes)
             {
                 STDGroups tDGroups = (STDGroups)treeNode.Tag;
-                GroupViewDic[tDGroups.id].iorder = treeNode.Index;
+                if (tDGroups.name != "Default")
+                {
+                    tDGroups.id = treeNode.Index + 1;
+                    tDGroups.iorder = treeNode.Index + 1;
+                }
+                else
+                {
+                    tDGroups.id = 10000;
+                    tDGroups.iorder = 10000;
+                }
                 foreach (TreeNode treeNode1 in treeNode.Nodes)
                 {
                     STDdata Ddata = (STDdata)treeNode1.Tag;
                     Ddata.ListNum = treeNode1.Index.ToString();
+                    Ddata.GroupId = tDGroups.id;
                     m_MainForm._sTDEditor.STDDictionary.Add(Ddata.STDId, Ddata);
                 }
                 m_MainForm._sTDEditor.GroupIdDictionaryFromName.Add(tDGroups.name.ToString(), int.Parse(tDGroups.id.ToString()));
                 m_MainForm._sTDEditor.GroupIdDictionaryFromId.Add(int.Parse(tDGroups.id.ToString()), tDGroups.name.ToString());
+                m_MainForm._sTDEditor.GroupDictionary.Add(tDGroups.id, tDGroups);
             }
         }
         private void ToolStripMenuItem_NewGroup_Click(object sender, EventArgs e)