소스 검색

加密狗 重新分类部分修改

CXS 3 년 전
부모
커밋
58ce3201c3
2개의 변경된 파일17개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 2
      OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/COTSMsrPrjResultData.cs
  2. 13 1
      OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

+ 4 - 2
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)
             {

+ 13 - 1
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();