merge
authorTom Henderson <tomh@tomh.org>
Sun, 26 Aug 2012 12:58:00 -0700
changeset 9016 505ccef514a0
parent 9015 8fc6c7d42f85 (current diff)
parent 9012 e1353799d7c6 (diff)
child 9017 ada0e58b1f58
merge
--- a/src/netanim/model/animation-interface.cc	Sun Aug 26 12:56:51 2012 -0700
+++ b/src/netanim/model/animation-interface.cc	Sun Aug 26 12:58:00 2012 -0700
@@ -53,6 +53,7 @@
 namespace ns3 {
 
 #define PURGE_INTERVAL 5
+
 static bool initialized = false;
 std::map <uint32_t, std::string> AnimationInterface::nodeDescriptions;
 std::map <uint32_t, Rgb> AnimationInterface::nodeColors;
@@ -101,6 +102,12 @@
   ++i;
 
 }
+
+std::string AnimationInterface::GetNetAnimVersion ()
+{
+  return "netanim-3.101";
+}
+
 void AnimationInterface::SetStartTime (Time t)
 {
   m_startTime = t;
@@ -1327,6 +1334,7 @@
     Description of attributes:\n\
     =========================\n\
     anim\n\
+    * ver = Current version\n\
     topology\n\
     * minX = minimum X coordinate of the canvas\n\
     * minY = minimum Y coordinate of the canvas\n\
@@ -1579,7 +1587,7 @@
 std::string AnimationInterface::GetXMLOpen_anim (uint32_t lp)
 {
   std::ostringstream oss;
-  oss <<"<anim lp = \"" << lp << "\" >\n";
+  oss <<"<anim ver=\"" << GetNetAnimVersion () << "\">\n";
   return oss.str ();
 }
 std::string AnimationInterface::GetXMLOpen_topology (double minX, double minY, double maxX, double maxY)
--- a/src/netanim/model/animation-interface.h	Sun Aug 26 12:56:51 2012 -0700
+++ b/src/netanim/model/animation-interface.h	Sun Aug 26 12:58:00 2012 -0700
@@ -553,6 +553,7 @@
   void StartNewTraceFile();
 
   std::string GetIpv4Address (Ptr <NetDevice> nd);
+  std::string GetNetAnimVersion ();
 
   // XML helpers
   std::string GetPreamble (void);
--- a/src/netanim/wscript	Sun Aug 26 12:56:51 2012 -0700
+++ b/src/netanim/wscript	Sun Aug 26 12:58:00 2012 -0700
@@ -3,7 +3,7 @@
 import wutils
 
 # Required NetAnim version
-NETANIM_RELEASE_NAME = "netanim-3.100"
+NETANIM_RELEASE_NAME = "netanim-3.101"
 
 
 def build (bld) :