diff --git a/src/netanim/model/animation-interface.cc b/src/netanim/model/animation-interface.cc --- a/src/netanim/model/animation-interface.cc +++ b/src/netanim/model/animation-interface.cc @@ -2012,6 +2012,12 @@ } void +AnimationInterface::AnimXmlElement::CloseElement () +{ + m_elementString += "/>\n"; +} + +void AnimationInterface::AnimXmlElement::CloseTag () { m_elementString += ">"; @@ -2077,7 +2083,7 @@ element.AddAttribute ("sysId", sysId); element.AddAttribute ("locX", locX); element.AddAttribute ("locY", locY); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2089,7 +2095,7 @@ element.AddAttribute ("fromId", fromId); element.AddAttribute ("toId", toId); element.AddAttribute ("ld", linkDescription); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2119,7 +2125,7 @@ element.AddAttribute ("fd", lprop.fromNodeDescription); element.AddAttribute ("td", lprop.toNodeDescription); element.AddAttribute ("ld", lprop.linkDescription); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2130,7 +2136,7 @@ element.AddAttribute ("t", Simulator::Now ().GetSeconds ()); element.AddAttribute ("id", nodeId); element.AddAttribute ("info", routingInfo.c_str ()); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_routingF); } @@ -2152,9 +2158,10 @@ AnimXmlElement rpeElement ("rpe"); rpeElement.AddAttribute ("n", rpElement.nodeId); rpeElement.AddAttribute ("nH", rpElement.nextHop.c_str ()); - rpeElement.Close (); + rpeElement.CloseElement (); element.Add (rpeElement); } + WriteXmlClose("rp", m_routingF); WriteN (element.GetElementString (), m_routingF); } @@ -2170,7 +2177,7 @@ { element.AddAttribute ("meta-info", metaInfo.c_str ()); } - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2182,7 +2189,7 @@ element.AddAttribute ("tId", tId); element.AddAttribute ("fbRx", fbRx); element.AddAttribute ("lbRx", lbRx); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2201,7 +2208,7 @@ element.AddAttribute ("tId", tId); element.AddAttribute ("fbRx", fbRx); element.AddAttribute ("lbRx", lbRx); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2212,7 +2219,7 @@ element.AddAttribute ("ncId", nodeCounterId); element.AddAttribute ("n", counterName); element.AddAttribute ("t", CounterTypeToString (counterType)); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2222,7 +2229,7 @@ AnimXmlElement element ("res"); element.AddAttribute ("rid", resourceId); element.AddAttribute ("p", resourcePath); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2234,7 +2241,7 @@ element.AddAttribute ("t", Simulator::Now ().GetSeconds ()); element.AddAttribute ("id", nodeId); element.AddAttribute ("rid", resourceId); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2247,7 +2254,7 @@ element.AddAttribute ("id", nodeId); element.AddAttribute ("w", width); element.AddAttribute ("h", height); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2260,7 +2267,7 @@ element.AddAttribute ("id", nodeId); element.AddAttribute ("x", x); element.AddAttribute ("y", y); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2274,7 +2281,7 @@ element.AddAttribute ("r", (uint32_t) r); element.AddAttribute ("g", (uint32_t) g); element.AddAttribute ("b", (uint32_t) b); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2289,7 +2296,7 @@ { element.AddAttribute ("descr", m_nodeDescriptions[nodeId]); } - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2302,7 +2309,7 @@ element.AddAttribute ("i", nodeId); element.AddAttribute ("t", Simulator::Now ().GetSeconds ()); element.AddAttribute ("v", counterValue); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2316,7 +2323,7 @@ element.AddAttribute ("sx", scaleX); element.AddAttribute ("sy", scaleY); element.AddAttribute ("o", opacity); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } @@ -2327,7 +2334,7 @@ element.AddAttribute ("id", id); element.AddAttribute ("ipv4Address", ipv4Address); element.AddAttribute ("channelType", channelType); - element.Close (); + element.CloseElement (); WriteN (element.GetElementString (), m_f); } diff --git a/src/netanim/model/animation-interface.h b/src/netanim/model/animation-interface.h --- a/src/netanim/model/animation-interface.h +++ b/src/netanim/model/animation-interface.h @@ -522,6 +522,7 @@ template void AddAttribute (std::string attribute, T value); void Close (); + void CloseElement (); void CloseTag (); void AddLineBreak (); void Add (AnimXmlElement e);