Merge branch 'Release2.3' into dev

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

@@ -1441,6 +1441,7 @@ namespace OTSModelSharp
               
                 pMsrParam.SetSTDName(stdFileName);
                 XmlNode root = doc.SelectSingleNode("XMLData");
+                root.RemoveAll();
                 Serialize(true, doc, root);
               
 
@@ -1471,10 +1472,10 @@ namespace OTSModelSharp
               
                         if (spl.IfUsingSysSTD())
                         {
-                            if (stdFileName != "NoSTDDB")
+                            if (stdFileName != "NoSTDDB.db")
                             {
                               
-                           var  m_classifyEngine = new CClassifyEngine();
+                                var  m_classifyEngine = new CClassifyEngine();
                                 IClassifyEngine engine = m_classifyEngine.GetParticleEngine(stdFileName);
 
                                 if (!engine.Classify(part))
@@ -1547,6 +1548,7 @@ namespace OTSModelSharp
 
         void Serialize(bool isStoring, XmlDocument classDoc, XmlNode rootNode)
         {
+           
             // copy data over
             if (m_pSEMStageData == null)
             {

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -139,9 +139,21 @@ namespace OTSMeasureApp
 
         private void OTSIncAMeasureAppForm_Load(object sender, EventArgs e)
         {
-           
             try
             {
+
+/*
+                try
+                {
+                    SenseShield.DogDecrypting.decrypting(101);//参数为许可号
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "错误：", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    System.Environment.Exit(0);
+                    return;
+                }
+*/
                 ArrangWorkspaceWindow();
 
                 log = NLog.LogManager.GetCurrentClassLogger();