Attachment #2121 for bug #2170

View | Details | Raw Unified | Return to bug 2170
Collapse All | Expand All

(-)a/src/netanim/model/animation-interface.cc (-18 / +25 lines)

Lines 2012-2017	Link Here

2012

2013

2014

void

2014

void

2015

AnimationInterface::AnimXmlElement::CloseElement ()

2016

2017

  m_elementString += "/>\n";

2018

2019

2020

void

2015

AnimationInterface::AnimXmlElement::CloseTag ()

2021

AnimationInterface::AnimXmlElement::CloseTag ()

2016

2022

2017

  m_elementString += ">";

2023

  m_elementString += ">";

Lines 2077-2083	Link Here

2077

  element.AddAttribute ("sysId", sysId);

2083

  element.AddAttribute ("sysId", sysId);

2078

  element.AddAttribute ("locX", locX);

2084

  element.AddAttribute ("locX", locX);

2079

  element.AddAttribute ("locY", locY);

2085

  element.AddAttribute ("locY", locY);

2080

  element.Close ();

2086

  element.CloseElement ();

2081

  WriteN (element.GetElementString (), m_f);

2087

  WriteN (element.GetElementString (), m_f);

2082

2088

2083

2089

Lines 2089-2095	Link Here

2089

  element.AddAttribute ("fromId", fromId);

2095

  element.AddAttribute ("fromId", fromId);

2090

  element.AddAttribute ("toId", toId);

2096

  element.AddAttribute ("toId", toId);

2091

  element.AddAttribute ("ld", linkDescription);

2097

  element.AddAttribute ("ld", linkDescription);

2092

  element.Close ();

2098

  element.CloseElement ();

2093

  WriteN (element.GetElementString (), m_f);

2099

  WriteN (element.GetElementString (), m_f);

2094

2100

2095

2101

Lines 2119-2125	Link Here

2119

  element.AddAttribute ("fd", lprop.fromNodeDescription);

2125

  element.AddAttribute ("fd", lprop.fromNodeDescription);

2120

  element.AddAttribute ("td", lprop.toNodeDescription);

2126

  element.AddAttribute ("td", lprop.toNodeDescription);

2121

  element.AddAttribute ("ld", lprop.linkDescription);

2127

  element.AddAttribute ("ld", lprop.linkDescription);

2122

  element.Close ();

2128

  element.CloseElement ();

2123

  WriteN (element.GetElementString (), m_f);

2129

  WriteN (element.GetElementString (), m_f);

2124

2130

2125

2131

Lines 2130-2136	Link Here

2130

  element.AddAttribute ("t", Simulator::Now ().GetSeconds ());

2136

  element.AddAttribute ("t", Simulator::Now ().GetSeconds ());

2131

  element.AddAttribute ("id", nodeId);

2137

  element.AddAttribute ("id", nodeId);

2132

  element.AddAttribute ("info", routingInfo.c_str ());

2138

  element.AddAttribute ("info", routingInfo.c_str ());

2133

  element.Close ();

2139

  element.CloseElement ();

2134

  WriteN (element.GetElementString (), m_routingF);

2140

  WriteN (element.GetElementString (), m_routingF);

2135

2141

2136

2142

Lines 2152-2160	Link Here

2152

      AnimXmlElement rpeElement ("rpe");

2158

      AnimXmlElement rpeElement ("rpe");

2153

      rpeElement.AddAttribute ("n", rpElement.nodeId);

2159

      rpeElement.AddAttribute ("n", rpElement.nodeId);

2154

      rpeElement.AddAttribute ("nH", rpElement.nextHop.c_str ());

2160

      rpeElement.AddAttribute ("nH", rpElement.nextHop.c_str ());

2155

      rpeElement.Close ();

2161

      rpeElement.CloseElement ();

2156

      element.Add (rpeElement);

2162

      element.Add (rpeElement);

2157

2163

2164

  WriteXmlClose("rp", m_routingF);

2158

  WriteN (element.GetElementString (),  m_routingF);

2165

  WriteN (element.GetElementString (),  m_routingF);

2159

2166

2160

2167

Lines 2170-2176	Link Here

2170

2177

2171

      element.AddAttribute ("meta-info", metaInfo.c_str ());

2178

      element.AddAttribute ("meta-info", metaInfo.c_str ());

2172

2179

2173

  element.Close ();

2180

  element.CloseElement ();

2174

  WriteN (element.GetElementString (),  m_f);

2181

  WriteN (element.GetElementString (),  m_f);

2175

2182

2176

2183

Lines 2182-2188	Link Here

2182

  element.AddAttribute ("tId", tId);

2189

  element.AddAttribute ("tId", tId);

2183

  element.AddAttribute ("fbRx", fbRx);

2190

  element.AddAttribute ("fbRx", fbRx);

2184

  element.AddAttribute ("lbRx", lbRx);

2191

  element.AddAttribute ("lbRx", lbRx);

2185

  element.Close ();

2192

  element.CloseElement ();

2186

  WriteN (element.GetElementString (),  m_f);

2193

  WriteN (element.GetElementString (),  m_f);

2187

2194

2188

2195

Lines 2201-2207	Link Here

2201

  element.AddAttribute ("tId", tId);

2208

  element.AddAttribute ("tId", tId);

2202

  element.AddAttribute ("fbRx", fbRx);

2209

  element.AddAttribute ("fbRx", fbRx);

2203

  element.AddAttribute ("lbRx", lbRx);

2210

  element.AddAttribute ("lbRx", lbRx);

2204

  element.Close ();

2211

  element.CloseElement ();

2205

  WriteN (element.GetElementString (),  m_f);

2212

  WriteN (element.GetElementString (),  m_f);

2206

2213

2207

2214

Lines 2212-2218	Link Here

2212

  element.AddAttribute ("ncId", nodeCounterId);

2219

  element.AddAttribute ("ncId", nodeCounterId);

2213

  element.AddAttribute ("n", counterName);

2220

  element.AddAttribute ("n", counterName);

2214

  element.AddAttribute ("t", CounterTypeToString (counterType));

2221

  element.AddAttribute ("t", CounterTypeToString (counterType));

2215

  element.Close ();

2222

  element.CloseElement ();

2216

  WriteN (element.GetElementString (), m_f);

2223

  WriteN (element.GetElementString (), m_f);

2217

2224

2218

2225

Lines 2222-2228	Link Here

2222

  AnimXmlElement element ("res");

2229

  AnimXmlElement element ("res");

2223

  element.AddAttribute ("rid", resourceId);

2230

  element.AddAttribute ("rid", resourceId);

2224

  element.AddAttribute ("p", resourcePath);

2231

  element.AddAttribute ("p", resourcePath);

2225

  element.Close ();

2232

  element.CloseElement ();

2226

  WriteN (element.GetElementString (), m_f);

2233

  WriteN (element.GetElementString (), m_f);

2227

2234

2228

2235

Lines 2234-2240	Link Here

2234

  element.AddAttribute ("t", Simulator::Now ().GetSeconds ());

2241

  element.AddAttribute ("t", Simulator::Now ().GetSeconds ());

2235

  element.AddAttribute ("id", nodeId);

2242

  element.AddAttribute ("id", nodeId);

2236

  element.AddAttribute ("rid", resourceId);

2243

  element.AddAttribute ("rid", resourceId);

2237

  element.Close ();

2244

  element.CloseElement ();

2238

  WriteN (element.GetElementString (), m_f);

2245

  WriteN (element.GetElementString (), m_f);

2239

2246

2240

2247

Lines 2247-2253	Link Here

2247

  element.AddAttribute ("id", nodeId);

2254

  element.AddAttribute ("id", nodeId);

2248

  element.AddAttribute ("w", width);

2255

  element.AddAttribute ("w", width);

2249

  element.AddAttribute ("h", height);

2256

  element.AddAttribute ("h", height);

2250

  element.Close ();

2257

  element.CloseElement ();

2251

  WriteN (element.GetElementString (),  m_f);

2258

  WriteN (element.GetElementString (),  m_f);

2252

2259

2253

2260

Lines 2260-2266	Link Here

2260

  element.AddAttribute ("id", nodeId);

2267

  element.AddAttribute ("id", nodeId);

2261

  element.AddAttribute ("x", x);

2268

  element.AddAttribute ("x", x);

2262

  element.AddAttribute ("y", y);

2269

  element.AddAttribute ("y", y);

2263

  element.Close ();

2270

  element.CloseElement ();

2264

  WriteN (element.GetElementString (), m_f);

2271

  WriteN (element.GetElementString (), m_f);

2265

2272

2266

2273

Lines 2274-2280	Link Here

2274

  element.AddAttribute ("r", (uint32_t) r);

2281

  element.AddAttribute ("r", (uint32_t) r);

2275

  element.AddAttribute ("g", (uint32_t) g);

2282

  element.AddAttribute ("g", (uint32_t) g);

2276

  element.AddAttribute ("b", (uint32_t) b);

2283

  element.AddAttribute ("b", (uint32_t) b);

2277

  element.Close ();

2284

  element.CloseElement ();

2278

  WriteN (element.GetElementString (), m_f);

2285

  WriteN (element.GetElementString (), m_f);

2279

2286

2280

2287

Lines 2289-2295	Link Here

2289

2296

2290

      element.AddAttribute ("descr", m_nodeDescriptions[nodeId]);

2297

      element.AddAttribute ("descr", m_nodeDescriptions[nodeId]);

2291

2298

2292

  element.Close ();

2299

  element.CloseElement ();

2293

  WriteN (element.GetElementString (), m_f);

2300

  WriteN (element.GetElementString (), m_f);

2294

2301

2295

2302

Lines 2302-2308	Link Here

2302

  element.AddAttribute ("i", nodeId);

2309

  element.AddAttribute ("i", nodeId);

2303

  element.AddAttribute ("t", Simulator::Now ().GetSeconds ());

2310

  element.AddAttribute ("t", Simulator::Now ().GetSeconds ());

2304

  element.AddAttribute ("v", counterValue);

2311

  element.AddAttribute ("v", counterValue);

2305

  element.Close ();

2312

  element.CloseElement ();

2306

  WriteN (element.GetElementString (), m_f);

2313

  WriteN (element.GetElementString (), m_f);

2307

2314

2308

2315

Lines 2316-2322	Link Here

2316

  element.AddAttribute ("sx", scaleX);

2323

  element.AddAttribute ("sx", scaleX);

2317

  element.AddAttribute ("sy", scaleY);

2324

  element.AddAttribute ("sy", scaleY);

2318

  element.AddAttribute ("o", opacity);

2325

  element.AddAttribute ("o", opacity);

2319

  element.Close ();

2326

  element.CloseElement ();

2320

  WriteN (element.GetElementString (), m_f);

2327

  WriteN (element.GetElementString (), m_f);

2321

2328

2322

2329

Lines 2327-2333	Link Here

2327

  element.AddAttribute ("id", id);

2334

  element.AddAttribute ("id", id);

2328

  element.AddAttribute ("ipv4Address", ipv4Address);

2335

  element.AddAttribute ("ipv4Address", ipv4Address);

2329

  element.AddAttribute ("channelType", channelType);

2336

  element.AddAttribute ("channelType", channelType);

2330

  element.Close ();

2337

  element.CloseElement ();

2331

  WriteN (element.GetElementString (), m_f);

2338

  WriteN (element.GetElementString (), m_f);

2332

2339

2333

2340

(-)a/src/netanim/model/animation-interface.h (+1 lines)

Lines 522-527	Link Here

522

    template <typename T>

522

    template <typename T>

523

    void AddAttribute (std::string attribute, T value);

523

    void AddAttribute (std::string attribute, T value);

524

    void Close ();

524

    void Close ();

525

    void CloseElement ();

525

    void CloseTag ();

526

    void CloseTag ();

526

    void AddLineBreak ();

527

    void AddLineBreak ();

527

    void Add (AnimXmlElement e);

528

    void Add (AnimXmlElement e);

Return to bug 2170