mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-30 04:40:53 +00:00
Merge with develop
This commit is contained in:
parent
2962e88e7f
commit
3324471931
1 changed files with 3 additions and 3 deletions
|
@ -423,7 +423,7 @@ inline
|
||||||
std::string CStateInstance::getStrNelVar(std::string const& varId)
|
std::string CStateInstance::getStrNelVar(std::string const& varId)
|
||||||
{
|
{
|
||||||
TStrNelVarList::iterator it = _StrNelVar.find(varId);
|
TStrNelVarList::iterator it = _StrNelVar.find(varId);
|
||||||
if (it!=_StrNelVar.end()) return it->second->get();
|
if (it != _StrNelVar.end()) return it->second->get();
|
||||||
|
|
||||||
if (NLMISC::CVariable<float>::exists(varId))
|
if (NLMISC::CVariable<float>::exists(varId))
|
||||||
{
|
{
|
||||||
|
@ -431,8 +431,8 @@ std::string CStateInstance::getStrNelVar(std::string const& varId)
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
_StrNelVar[varId] = new NLMISC::CVariable<std::string>("StateInstanceVar", varId.c_str(), "", std::string());
|
_StrNelVar[varId] = new NLMISC::CVariable<std::string>("StateInstanceStrVar", varId.c_str(), "", std::string());
|
||||||
return _NelVar[varId]->get();
|
return _StrNelVar[varId]->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
inline
|
inline
|
||||||
|
|
Loading…
Reference in a new issue