F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetAnim: Support for system id associated with nodes

Browse Source
This commit is contained in:
Dmitrii Shakshin
2014-07-10 08:19:06 -07:00
parent 9fd85ad079
commit 005ea81ecf
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/netanim/model/animation-interface.cc
View File

@@ -1616,7 +1616,7 @@ AnimationInterface::WriteNodes ()
Ptr<Node> n = *i;
NS_LOG_INFO ("Update Position for Node: " << n->GetId ());
Vector v = UpdatePosition (n);
WriteXmlNode (n->GetId (), v.x, v.y);
WriteXmlNode (n->GetId (), n->GetSystemId (), v.x, v.y);
}
}
@@ -2072,10 +2072,11 @@ AnimationInterface::WriteXmlClose (std::string name, bool routing)
}
void
AnimationInterface::WriteXmlNode (uint32_t id, double locX, double locY)
AnimationInterface::WriteXmlNode (uint32_t id, uint32_t sysId, double locX, double locY)
{
AnimXmlElement element ("node");
element.AddAttribute ("id", id);
element.AddAttribute ("sysId", sysId);
element.AddAttribute ("locX", locX);
element.AddAttribute ("locY", locY);
element.Close ();

2
src/netanim/model/animation-interface.h
View File

@@ -780,7 +780,7 @@ private:
void WriteXmlAddNodeCounter (uint32_t counterId, std::string counterName, CounterType counterType);
void WriteXmlUpdateNodeImage (uint32_t nodeId, uint32_t resourceId);
void WriteXmlUpdateNodeCounter (uint32_t counterId, uint32_t nodeId, double value);
void WriteXmlNode (uint32_t id, double locX, double locY);
void WriteXmlNode (uint32_t id, uint32_t sysId, double locX, double locY);
void WriteXmlLink (uint32_t fromId, uint32_t toLp, uint32_t toId);
void WriteXmlUpdateLink (uint32_t fromId, uint32_t toId, std::string);
void WriteXmlP (std::string pktType,