Attachment #3214 for bug #2734

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




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




import ns.internet
import ns.mesh
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 (-4 / +4 lines)

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

(-)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/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