Skip to content
Snippets Groups Projects
Commit 7fd86b3f authored by Rainer Kartmann's avatar Rainer Kartmann Committed by Fabian Tërnava
Browse files

Add suggestions from rainers review

parent b6d452c6
No related branches found
No related tags found
1 merge request!326Allow loading of LTM exports to the Viewer, although the memory servers have not been started
......@@ -34,8 +34,8 @@ namespace armarx::armem::server::ltm
return _id.getLeafItem();
}
void MemoryItem::setMemoryName(const std::string& m)
void MemoryItem::setMemoryName(const std::string& memoryName)
{
_id.memoryName = m;
_id.memoryName = memoryName;
}
} // namespace armarx::armem::server::ltm
......@@ -21,7 +21,7 @@ namespace armarx::armem::server::ltm
std::string name() const;
virtual void setMemoryID(const MemoryID&);
void setMemoryName(const std::string&);
void setMemoryName(const std::string& memoryName);
protected:
std::shared_ptr<Processors> processors;
......
......@@ -436,11 +436,11 @@ namespace armarx::armem::gui
}
else
{
ARMARX_INFO << "No memory with name " << name << " available for commit. Create new virtual memory.";
ARMARX_INFO << "No memory with name '" << name << "' available for commit. Create new virtual memory.";
// Please note: Here we assume that a memory server with the same name does not exist.
// I think this assumption is ok, since nobody should use filepaths as memory name.
// Nontheless, we did not restrict the user to do so...
// Nonetheless, we did not restrict the user to do so...
std::string virtualMemoryName = name + " (at " + path.string() + ")";
wm::Memory virtualMemory(virtualMemoryName);
virtualMemory.update(commit, true, false);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment