Merge branch 'cxs_Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into cxs_Release2.4

OTSPartA_STDEditor/Form_ConstantsEditor2.cs

@@ -619,28 +619,6 @@ namespace OTSPartA_STDEditor
             {
                 STDDictionary[(int)m_STDRuleslist.Grid_Minerals[i,0].Tag].ListNum = i.ToString();
             }
-            #region 数据库存贮方式一
-            //System.Data.SQLite.SQLiteConnection m_dbConnection = new System.Data.SQLite.SQLiteConnection("data source='" + STDDBAddress + "'");
-            //System.Data.SQLite.SQLiteCommand cmm = m_dbConnection.CreateCommand();
-            //cmm.CommandText = "delete from ClassifySTD";
-            //try
-            //{
-            //    m_dbConnection.Open();
-            //    cmm.ExecuteNonQuery();
-            //    foreach (KeyValuePair<int, STDdata> kv in STDDictionary)
-            //    {
-            //        string insertstr = "Insert into ClassifySTD(STDId,StrName,Color,KeyElementList,SubElementList,UsingImgPropertyList,UsingOtherPropertyList,Expression,Hardness,Density,Electrical_conductivity,BSE,Formula,Element)";
-            //        string aa="values(" + kv.Value.STDId + ",'" + kv.Value.StrName + "','" + kv.Value.Color + "','" + kv.Value.KeyElementList + "','" + kv.Value.SubElementList + "','" + kv.Value.UsingImgPropertyList + "','" + kv.Value.UsingOtherPropertyList + "','" + kv.Value.Expression + "'," + kv.Value.Hardness + "," + kv.Value.Density + "," + kv.Value.Electrical_conductivity + "," + kv.Value.BSE + ",'" + kv.Value.Formula + "','" + kv.Value.Element + "')";
-            //        cmm.CommandText = insertstr+aa;
-            //        cmm.ExecuteNonQuery();
-            //    }
-            //}
-            //catch (Exception ex)
-            //{
-            //    MessageBox.Show(ex.ToString());
-            //}
-            //m_dbConnection.Close();
-            #endregion
             try
             {
                 System.Data.SQLite.SQLiteConnection m_dbConnection = new System.Data.SQLite.SQLiteConnection("data source='" + DBAddress + "'");

OTSPartA_STDEditor/STDEditor.cs

@@ -117,7 +117,7 @@ namespace OTSPartA_STDEditor
             comboBox_PeriodicTable.Items.AddRange(PeriodicTable);
             AutoCompleteStringCollection sc = new AutoCompleteStringCollection();
             sc.AddRange(PeriodicTable);
-            this.comboBox_PeriodicTable.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
+            this.comboBox_PeriodicTable.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
             this.comboBox_PeriodicTable.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
             this.comboBox_PeriodicTable.AutoCompleteCustomSource = sc;