Attachment #3245 for bug #2734

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

(-)a/bindings/python/ns3modulegen.py (-1 / +1 lines)

Lines 81-87 class MyMultiSectionFactory(MultiSectionFactory):	Link Here

    def close(self):

    def close(self):

        self.header_sink.file.close()

        self.header_sink.file.close()

        self.main_sink.file.close()

        self.main_sink.file.close()

        for sink in self.section_sinks.itervalues():

        for sink in self.section_sinks.values():

            sink.file.close()

            sink.file.close()

(-)a/src/lte/examples/d2d-examples/wns3-2017-pssch.cc (-1 / +1 lines)

Lines 139-145 main (int argc, char *argv[])	Link Here

139

  NS_LOG_LOGIC ("UL freq: " << ulFreq);

139

  NS_LOG_LOGIC ("UL freq: " << ulFreq);

140

  Ptr<Object> uplinkPathlossModel = lteHelper->GetUplinkPathlossModel ();

140

  Ptr<Object> uplinkPathlossModel = lteHelper->GetUplinkPathlossModel ();

141

  Ptr<PropagationLossModel> lossModel = uplinkPathlossModel->GetObject<PropagationLossModel> ();

141

  Ptr<PropagationLossModel> lossModel = uplinkPathlossModel->GetObject<PropagationLossModel> ();

142

  NS_ASSERT_MSG (lossModel > 0, "No PathLossModel");

142

  NS_ASSERT_MSG (lossModel != nullptr, "No PathLossModel");

143

  bool ulFreqOk = uplinkPathlossModel->SetAttributeFailSafe ("Frequency", DoubleValue (ulFreq));

143

  bool ulFreqOk = uplinkPathlossModel->SetAttributeFailSafe ("Frequency", DoubleValue (ulFreq));

144

  if (!ulFreqOk)

144

  if (!ulFreqOk)

145

(-)a/src/lte/examples/lte-wrap-around-hex-topology.cc (-1 / +1 lines)

Lines 543-549 int main (int argc, char *argv[])	Link Here

543

  Ptr<Object> downlinkPathlossModel = lteHelper->GetDownlinkPathlossModel ();

543

  Ptr<Object> downlinkPathlossModel = lteHelper->GetDownlinkPathlossModel ();

544

  Ptr<PropagationLossModel> lossModel = downlinkPathlossModel->GetObject<PropagationLossModel> ();

544

  Ptr<PropagationLossModel> lossModel = downlinkPathlossModel->GetObject<PropagationLossModel> ();

545

546

  NS_ASSERT_MSG (lossModel > 0, "No PathLossModel");

546

  NS_ASSERT_MSG (lossModel != nullptr, "No PathLossModel");

547

  topoHelper->AttachWithWrapAround (lossModel, ueDevs, enbDevs);

547

  topoHelper->AttachWithWrapAround (lossModel, ueDevs, enbDevs);

548

  NS_LOG_DEBUG ("Attached UE's to the eNB with wrap-around");

548

  NS_LOG_DEBUG ("Attached UE's to the eNB with wrap-around");

549

(-)a/src/lte/test/test-wrap-around-hex-topology.cc (-1 / +1 lines)

Lines 237-243 WrapAroundTopologyTestCase::DoRun ()	Link Here

237

  Ptr<Object> downlinkPathlossModel = lteHelper->GetDownlinkPathlossModel ();

237

  Ptr<Object> downlinkPathlossModel = lteHelper->GetDownlinkPathlossModel ();

238

  Ptr<PropagationLossModel> lossModel = downlinkPathlossModel->GetObject<PropagationLossModel> ();

238

  Ptr<PropagationLossModel> lossModel = downlinkPathlossModel->GetObject<PropagationLossModel> ();

239

240

  NS_ASSERT_MSG (lossModel > 0, "No PathLossModel");

240

  NS_ASSERT_MSG (lossModel != nullptr, "No PathLossModel");

241

  topoHelper->AttachWithWrapAround (lossModel, ueDevs, enbDevs);

241

  topoHelper->AttachWithWrapAround (lossModel, ueDevs, enbDevs);

242

  NS_LOG_INFO ("Attached UE's to the eNB with wrap-around");

242

  NS_LOG_INFO ("Attached UE's to the eNB with wrap-around");

243




void
VisualSimulatorImpl::Run (void)
{
  if (!Py_IsInitialized ())
    {
      #if PY_MAJOR_VERSION >= 3
        const wchar_t *argv[] = { L"python", NULL};
        Py_Initialize ();
        PySys_SetArgv (1, (wchar_t**) argv);
      #else
        const char *argv[] = { "python", NULL};
        Py_Initialize ();
        PySys_SetArgv (1, (char**) argv);
      #endif
      PyRun_SimpleString (
                          "import visualizer\n"
                          "visualizer.start();\n"

(-)a/src/visualizer/visualizer/__init__.py (-1 / +1 lines)

Lines 1-3	Link Here

from core import start, register_plugin, set_bounds, add_initialization_hook

from .core import start, register_plugin, set_bounds, add_initialization_hook




except:
    ns_mesh_loaded = False
import ns.wimax
import ns.wimax
import ns.lte

from gi.repository import GObject

            continue
        try:
            plugin_module = __import__(name)
        except ImportError as ex:
            print("Could not load plugin %r: %s" % (filename, str(ex)), file=sys.stderr)
            continue
        try:
            plugin_func = plugin_module.register
        except AttributeError:
            print("Plugin %r has no 'register' function" % name, file=sys.stderr)
        else:
            #print("Plugin %r registered" % name, file=sys.stderr)
            register_plugin(plugin_func, name, plugin_module)
    sys.path = old_path


(-)a/src/visualizer/visualizer/core.py (-12 / +16 lines)

Lines 31-36 import math	Link Here

import os

import os

import sys

import sys

if sys.version_info > (3,):

    long = int

try:

try:

    import gi

    import gi

    gi.require_version('GooCanvas', '2.0')

    gi.require_version('GooCanvas', '2.0')

Lines 45-57 try:	Link Here

    from gi.repository import Pango

    from gi.repository import Pango

    from gi.repository import GooCanvas

    from gi.repository import GooCanvas

    import threading

    import threading

    import hud

    from . import hud

    #import time

    #import time

    try:

    try:

        import svgitem

        import svgitem

    except ImportError:

    except ImportError:

        svgitem = None

        svgitem = None

except ImportError as _import_error:

except ImportError as e:

    _import_error = e

    import dummy_threading as threading

    import dummy_threading as threading

else:

else:

    _import_error = None

    _import_error = None

Lines 61-70 try:	Link Here

except ImportError:

except ImportError:

    ipython_view = None

    ipython_view = None

from base import InformationWindow, PyVizObject, Link, lookup_netdevice_traits, PIXELS_PER_METER

from .base import InformationWindow, PyVizObject, Link, lookup_netdevice_traits, PIXELS_PER_METER

from base import transform_distance_simulation_to_canvas, transform_point_simulation_to_canvas

from .base import transform_distance_simulation_to_canvas, transform_point_simulation_to_canvas

from base import transform_distance_canvas_to_simulation, transform_point_canvas_to_simulation

from .base import transform_distance_canvas_to_simulation, transform_point_canvas_to_simulation

from base import load_plugins, register_plugin, plugins

from .base import load_plugins, register_plugin, plugins

PI_OVER_2 = math.pi/2

PI_OVER_2 = math.pi/2

PI_TIMES_2 = math.pi*2

PI_TIMES_2 = math.pi*2

Lines 773-779 class Visualizer(GObject.GObject):	Link Here

773

        assert isinstance(mode, ShowTransmissionsMode)

777

        assert isinstance(mode, ShowTransmissionsMode)

774

        self._show_transmissions_mode = mode

778

        self._show_transmissions_mode = mode

775

        if self._show_transmissions_mode == ShowTransmissionsMode.ALL:

779

        if self._show_transmissions_mode == ShowTransmissionsMode.ALL:

776

            self.simulation.set_nodes_of_interest(range(ns.network.NodeList.GetNNodes()))

780

            self.simulation.set_nodes_of_interest(list(range(ns.network.NodeList.GetNNodes())))

777

        elif self._show_transmissions_mode == ShowTransmissionsMode.NONE:

781

        elif self._show_transmissions_mode == ShowTransmissionsMode.NONE:

778

            self.simulation.set_nodes_of_interest([])

782

            self.simulation.set_nodes_of_interest([])

779

        elif self._show_transmissions_mode == ShowTransmissionsMode.SELECTED:

783

        elif self._show_transmissions_mode == ShowTransmissionsMode.SELECTED:

Lines 854-860 class Visualizer(GObject.GObject):	Link Here

854

        settings_hbox.pack_start(vbox, False, False, 6)

858

        settings_hbox.pack_start(vbox, False, False, 6)

855

        self.node_size_adjustment = scale.get_adjustment()

859

        self.node_size_adjustment = scale.get_adjustment()

856

        def node_size_changed(adj):

860

        def node_size_changed(adj):

857

            for node in self.nodes.itervalues():

861

            for node in self.nodes.values():

858

                node.set_size(adj.get_value())

862

                node.set_size(adj.get_value())

859

        self.node_size_adjustment.connect("value-changed", node_size_changed)

863

        self.node_size_adjustment.connect("value-changed", node_size_changed)

860

        self.node_size_adjustment.set_lower(0.01)

864

        self.node_size_adjustment.set_lower(0.01)

Lines 1237-1243 class Visualizer(GObject.GObject):	Link Here

1237

        self.emit("update-view")

1241

        self.emit("update-view")

1238

1242

1239

    def _update_node_positions(self):

1243

    def _update_node_positions(self):

1240

        for node in self.nodes.itervalues():

1244

        for node in self.nodes.values():

1241

            if node.has_mobility:

1245

            if node.has_mobility:

1242

                ns3_node = ns.network.NodeList.GetNode(node.node_index)

1246

                ns3_node = ns.network.NodeList.GetNode(node.node_index)

1243

                mobility = ns.mobility.MobilityModel.GetMobilityModel (ns3_node)

1247

                mobility = ns.mobility.MobilityModel.GetMobilityModel (ns3_node)

Lines 1319-1325 class Visualizer(GObject.GObject):	Link Here

1319

1323

1320

        k = self.node_size_adjustment.get_value()/5

1324

        k = self.node_size_adjustment.get_value()/5

1321

1325

1322

        for (transmitter_id, receiver_id), (rx_bytes, rx_count) in transmissions_average.iteritems():

1326

        for (transmitter_id, receiver_id), (rx_bytes, rx_count) in transmissions_average.items():

1323

            transmitter = self.get_node(transmitter_id)

1327

            transmitter = self.get_node(transmitter_id)

1324

            receiver = self.get_node(receiver_id)

1328

            receiver = self.get_node(receiver_id)

1325

            try:

1329

            try:

Lines 1405-1411 class Visualizer(GObject.GObject):	Link Here

1405

1409

1406

        k = self.node_size_adjustment.get_value()/5

1410

        k = self.node_size_adjustment.get_value()/5

1407

1411

1408

        for transmitter_id, (drop_bytes, drop_count) in drops_average.iteritems():

1412

        for transmitter_id, (drop_bytes, drop_count) in drops_average.items():

1409

            transmitter = self.get_node(transmitter_id)

1413

            transmitter = self.get_node(transmitter_id)

1410

            try:

1414

            try:

1411

                arrow, label = old_arrows.pop()

1415

                arrow, label = old_arrows.pop()

Lines 1521-1527 class Visualizer(GObject.GObject):	Link Here

1521

        if not self.nodes:

1525

        if not self.nodes:

1522

            return

1526

            return

1523

        self._update_node_positions()

1527

        self._update_node_positions()

1524

        positions = [node.get_position() for node in self.nodes.itervalues()]

1528

        positions = [node.get_position() for node in self.nodes.values()]

1525

        min_x, min_y = min(x for (x,y) in positions), min(y for (x,y) in positions)

1529

        min_x, min_y = min(x for (x,y) in positions), min(y for (x,y) in positions)

1526

        max_x, max_y = max(x for (x,y) in positions), max(y for (x,y) in positions)

1530

        max_x, max_y = max(x for (x,y) in positions), max(y for (x,y) in positions)

1527

        min_x_px, min_y_px = self.canvas.convert_to_pixels(min_x, min_y)

1531

        min_x_px, min_y_px = self.canvas.convert_to_pixels(min_x, min_y)

(-)a/src/visualizer/visualizer/hud.py (-1 / +1 lines)

Lines 1-5	Link Here

import core

import math

import math

from . import core

from gi.repository import Pango

from gi.repository import Pango

from gi.repository import Gtk

from gi.repository import Gtk

from gi.repository import GooCanvas

from gi.repository import GooCanvas

(-)a/src/visualizer/visualizer/ipython_view.py (-2 / +2 lines)

Lines 319-329 class IterableIPShell:	Link Here

319

    @return none

319

    @return none

320

"""

320

"""

321

    stat = 0

321

    stat = 0

322

    if verbose or debug: print header+cmd

322

    if verbose or debug: print(header+cmd)

323

    # flush stdout so we don't mangle python's buffering

323

    # flush stdout so we don't mangle python's buffering

324

    if not debug:

324

    if not debug:

325

      input, output = os.popen4(cmd)

325

      input, output = os.popen4(cmd)

326

      print output.read()

326

      print(output.read())

327

      output.close()

327

      output.close()

328

      input.close()

328

      input.close()

329

(-)a/src/visualizer/visualizer/plugins/olsr.py (-1 / +1 lines)

Lines 120-126 def populate_node_menu(viz, node, menu):	Link Here

120

    ns3_node = ns.network.NodeList.GetNode(node.node_index)

120

    ns3_node = ns.network.NodeList.GetNode(node.node_index)

121

    olsr = ns3_node.GetObject(ns.olsr.olsr.RoutingProtocol.GetTypeId())

121

    olsr = ns3_node.GetObject(ns.olsr.olsr.RoutingProtocol.GetTypeId())

122

    if olsr is None:

122

    if olsr is None:

123

        print "No OLSR"

123

        print("No OLSR")

124

        return

124

        return

125

126

    menu_item = Gtk.MenuItem("Show OLSR Routing Table")

126

    menu_item = Gtk.MenuItem("Show OLSR Routing Table")

(-)a/src/visualizer/visualizer/plugins/wifi_intrastructure_link.py (-1 / +1 lines)

Lines 131-137 class WifiLinkMonitor(object):	Link Here

131

        self.access_points = {}

131

        self.access_points = {}

132

        self.stations = []

132

        self.stations = []

133

134

        for node in viz.nodes.itervalues():

134

        for node in viz.nodes.values():

135

            ns3_node = ns.network.NodeList.GetNode(node.node_index)

135

            ns3_node = ns.network.NodeList.GetNode(node.node_index)

136

            for devI in range(ns3_node.GetNDevices()):

136

            for devI in range(ns3_node.GetNDevices()):

137

                dev = ns3_node.GetDevice(devI)

137

                dev = ns3_node.GetDevice(devI)

(-)a/src/visualizer/visualizer/svgitem.py (-3 / +2 lines)

Lines 120-126 class SvgItem(GooCanvas.ItemSimple):	Link Here

120

            self.changed(True)

120

            self.changed(True)

121

122

        else:

122

        else:

123

            raise AttributeError, 'unknown property %s' % pspec.name

123

            raise AttributeError('unknown property %s' % pspec.name)

124

125

    def _size_changed(self):

125

    def _size_changed(self):

126

        """!

126

        """!

Lines 172-178 class SvgItem(GooCanvas.ItemSimple):	Link Here

172

            return self.height

172

            return self.height

173

174

        else:

174

        else:

175

            raise AttributeError, 'unknown property %s' % pspec.name

175

            raise AttributeError('unknown property %s' % pspec.name)

176

177

    def do_simple_paint(self, cr, bounds):

177

    def do_simple_paint(self, cr, bounds):

178

        """!

178

        """!

179

Return to bug 2734