|
@@ -1493,13 +1493,20 @@ namespace OTSModelSharp
|
|
|
doc.Load(filename);
|
|
|
|
|
|
XmlNode root = doc.SelectSingleNode("XMLData");
|
|
|
- string sem = "Sample";
|
|
|
- var members = root.SelectNodes(sem);
|
|
|
+ var members = root.SelectNodes("Member");
|
|
|
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);
|
|
@@ -1550,7 +1557,7 @@ namespace OTSModelSharp
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if (stdFileName != "NoSTDDB")
|
|
|
+ if (stdFileName != "NoSTDDB.db")
|
|
|
{
|
|
|
var m_classifyEngine = new CClassifyEngine();
|
|
|
IClassifyEngine engine = m_classifyEngine.GetParticleEngine(stdFileName);
|
|
@@ -1617,6 +1624,7 @@ namespace OTSModelSharp
|
|
|
Collection<CHoleBSEImg> xholeBSEImgs = new Collection<CHoleBSEImg>();
|
|
|
Collection<COTSSample> xsamples = new Collection<COTSSample>();
|
|
|
Slo slo = new Slo();
|
|
|
+ slo.Register("Samples", xsamples);
|
|
|
slo.Register("ProjMgrFileMark", xProjMgrFileMark);
|
|
|
slo.Register("ProjMgrFileVersion", xProjMgrFileVersion);
|
|
|
slo.Register("strPathName", xstrPathName);
|
|
@@ -1624,7 +1632,7 @@ namespace OTSModelSharp
|
|
|
slo.Register("SEMStageData", m_pSEMStageData);
|
|
|
slo.Register("Stage", m_pStage);
|
|
|
slo.Register("HoleBSEImg", xholeBSEImgs);
|
|
|
- slo.Register("Samples", xsamples);
|
|
|
+
|
|
|
|
|
|
if (isStoring)
|
|
|
{
|