Browse Source

修改重新分类部分codes

cxs 3 years ago
parent
commit
55a85e2740

+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="3">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="1">
   <Collection RegName="Stagelist">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />

+ 15 - 7
OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/COTSMsrPrjResultData.cs

@@ -1493,13 +1493,20 @@ namespace OTSModelSharp
                 doc.Load(filename);
                 doc.Load(filename);
 
 
                 XmlNode  root = doc.SelectSingleNode("XMLData");
                 XmlNode  root = doc.SelectSingleNode("XMLData");
-                string sem = "Sample";
-               var members = root.SelectNodes(sem);
+               var members = root.SelectNodes("Member");
                 foreach (XmlNode member1 in members)
                 foreach (XmlNode member1 in members)
                 {
                 {
-                    var paramNode = member1.SelectSingleNode("MsrParams");
-
-                      ((XmlElement)paramNode).SetAttribute("STDName",stdFileName);
+                    if(member1.Attributes["RegName"].Value== "Sample")
+                    {
+                        var paramNode = member1.SelectNodes("Member");
+                        foreach (XmlNode member2 in paramNode)
+                        {
+                            if(member2.Attributes["RegName"].Value == "MsrParams")
+                            {
+                                ((XmlElement)member2).SetAttribute("STDName", stdFileName);
+                            }
+                        }
+                    }
                 }
                 }
                 
                 
                 doc.Save(filename);
                 doc.Save(filename);
@@ -1550,7 +1557,7 @@ namespace OTSModelSharp
                         }
                         }
                         else
                         else
                         {
                         {
-                            if (stdFileName != "NoSTDDB")
+                            if (stdFileName != "NoSTDDB.db")
                             {
                             {
                                 var m_classifyEngine = new CClassifyEngine();
                                 var m_classifyEngine = new CClassifyEngine();
                                 IClassifyEngine engine = m_classifyEngine.GetParticleEngine(stdFileName);
                                 IClassifyEngine engine = m_classifyEngine.GetParticleEngine(stdFileName);
@@ -1617,6 +1624,7 @@ namespace OTSModelSharp
             Collection<CHoleBSEImg> xholeBSEImgs = new Collection<CHoleBSEImg>();
             Collection<CHoleBSEImg> xholeBSEImgs = new Collection<CHoleBSEImg>();
             Collection<COTSSample> xsamples = new Collection<COTSSample>();
             Collection<COTSSample> xsamples = new Collection<COTSSample>();
             Slo slo = new Slo();
             Slo slo = new Slo();
+            slo.Register("Samples", xsamples);
             slo.Register("ProjMgrFileMark", xProjMgrFileMark);
             slo.Register("ProjMgrFileMark", xProjMgrFileMark);
             slo.Register("ProjMgrFileVersion", xProjMgrFileVersion);
             slo.Register("ProjMgrFileVersion", xProjMgrFileVersion);
             slo.Register("strPathName", xstrPathName);
             slo.Register("strPathName", xstrPathName);
@@ -1624,7 +1632,7 @@ namespace OTSModelSharp
             slo.Register("SEMStageData", m_pSEMStageData);
             slo.Register("SEMStageData", m_pSEMStageData);
             slo.Register("Stage", m_pStage);
             slo.Register("Stage", m_pStage);
             slo.Register("HoleBSEImg", xholeBSEImgs);
             slo.Register("HoleBSEImg", xholeBSEImgs);
-            slo.Register("Samples", xsamples);
+            
 
 
             if (isStoring)
             if (isStoring)
             {
             {

+ 2 - 1
OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -425,7 +425,7 @@ namespace OTSMeasureApp
         private void ribbonOrbMenuItem1_OpenWorkspace_Click(object sender, EventArgs e)
         private void ribbonOrbMenuItem1_OpenWorkspace_Click(object sender, EventArgs e)
         {
         {
             OpenMeasureProjectFile();
             OpenMeasureProjectFile();
-            UpdatePropertyVal();
+            //UpdatePropertyVal();
         }
         }
 
 
         //新建样品工作文件
         //新建样品工作文件
@@ -1206,6 +1206,7 @@ namespace OTSMeasureApp
           
           
                 // file open dialog
                 // file open dialog
                 OpenFileDialog openFileDialog = new OpenFileDialog();
                 OpenFileDialog openFileDialog = new OpenFileDialog();
+                openFileDialog.Filter = "Probject Files (*.prj)|*.prj";
                 if (openFileDialog.ShowDialog() != DialogResult.OK)
                 if (openFileDialog.ShowDialog() != DialogResult.OK)
                 {
                 {
                     return ;
                     return ;