From de4f4ceed38a1c7ee468791cabcb5cc3fbdd3b1f Mon Sep 17 00:00:00 2001 From: John Abraham Date: Sat, 25 Aug 2012 23:57:19 -0700 Subject: [PATCH] NetAnim: Bump version --- src/netanim/model/animation-interface.cc | 10 +++++++++- src/netanim/model/animation-interface.h | 1 + src/netanim/wscript | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/netanim/model/animation-interface.cc b/src/netanim/model/animation-interface.cc index 17bda4533..ed4f05842 100644 --- a/src/netanim/model/animation-interface.cc +++ b/src/netanim/model/animation-interface.cc @@ -53,6 +53,7 @@ NS_LOG_COMPONENT_DEFINE ("AnimationInterface"); namespace ns3 { #define PURGE_INTERVAL 5 + static bool initialized = false; std::map AnimationInterface::nodeDescriptions; std::map AnimationInterface::nodeColors; @@ -101,6 +102,12 @@ void AnimationInterface::StartNewTraceFile () ++i; } + +std::string AnimationInterface::GetNetAnimVersion () +{ + return "netanim-3.101"; +} + void AnimationInterface::SetStartTime (Time t) { m_startTime = t; @@ -1327,6 +1334,7 @@ std::string AnimationInterface::GetPreamble () 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 @@ void AnimationInterface::SetNodeDescription (NodeContainer nc, std::string descr std::string AnimationInterface::GetXMLOpen_anim (uint32_t lp) { std::ostringstream oss; - oss <<"\n"; + oss <<"\n"; return oss.str (); } std::string AnimationInterface::GetXMLOpen_topology (double minX, double minY, double maxX, double maxY) diff --git a/src/netanim/model/animation-interface.h b/src/netanim/model/animation-interface.h index 8d9f3b3e4..5f05ed04c 100644 --- a/src/netanim/model/animation-interface.h +++ b/src/netanim/model/animation-interface.h @@ -553,6 +553,7 @@ private: void StartNewTraceFile(); std::string GetIpv4Address (Ptr nd); + std::string GetNetAnimVersion (); // XML helpers std::string GetPreamble (void); diff --git a/src/netanim/wscript b/src/netanim/wscript index 045aab016..3743313d0 100644 --- a/src/netanim/wscript +++ b/src/netanim/wscript @@ -3,7 +3,7 @@ import wutils # Required NetAnim version -NETANIM_RELEASE_NAME = "netanim-3.100" +NETANIM_RELEASE_NAME = "netanim-3.101" def build (bld) :