|
@@ -55,43 +55,12 @@ namespace OTSClassifyEngine
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- /*ParticleSTDPtr m_std = ParticleSTDPtr(new ParticleSTD());
|
|
|
|
- if (!pLibFileMgr->LoadPartSTD(m_std))
|
|
|
|
- {
|
|
|
|
- return FALSE;
|
|
|
|
- }*/
|
|
|
|
-
|
|
|
|
if (!pLibFileMgr->LoadSTDSpectrumItems(m_listSTDItems,true))
|
|
if (!pLibFileMgr->LoadSTDSpectrumItems(m_listSTDItems,true))
|
|
{
|
|
{
|
|
return FALSE;
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
|
|
- //int itmNum = m_std->GetSTDItems().size();
|
|
|
|
-
|
|
|
|
- /*for (auto itm:m_listSTDItems)
|
|
|
|
- {
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- auto expstditm = m_std->GetSTDItemById(itm->GetID());
|
|
|
|
- if (expstditm != nullptr)
|
|
|
|
- {
|
|
|
|
- itm->SetName(expstditm->GetName().c_str());
|
|
|
|
-
|
|
|
|
- DWORD r, g, b;
|
|
|
|
- sscanf(expstditm->GetColor().c_str(), "#%2X%2X%2X", &r, &g, &b);
|
|
|
|
- COLORREF rgb = RGB(r, g, b);
|
|
|
|
- itm->SetColor(rgb);
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- itm->SetBSEValue(expstditm->GetBSE());
|
|
|
|
-
|
|
|
|
- itm->SetDensity(expstditm->GetDensity());
|
|
|
|
-
|
|
|
|
- itm->SetFormula(expstditm->GetFormula().c_str());
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- }*/
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|