Attachment #2812 for bug #2509

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




  return m_simulator->IsFinished ();
}


void
VisualSimulatorImpl::Run (void)
{
  std::ostringstream str; 
  str << m_stopTime;
  std::string pystring = std::string("import visualizer\nvisualizer.start(\'") + str.str () + std::string ("\');\n");
  if (!Py_IsInitialized ()) 
    {
      const char *argv[] = { "python", NULL};
      Py_Initialize ();
      PySys_SetArgv (1, (char**) argv);
      PyRun_SimpleString (
                          pystring.c_str()
                          "visualizer.start();\n"
                          );
    }
  else

      PyGILState_STATE __py_gil_state = PyGILState_Ensure ();
    
      PyRun_SimpleString (
                          pystring.c_str()
                          "visualizer.start();\n"
                          );

      PyGILState_Release (__py_gil_state);
    }
}


void 
VisualSimulatorImpl::Stop (void)
{

void 
VisualSimulatorImpl::Stop (Time const &delay)
{
  m_stopTime = delay;
  m_simulator->Stop (delay);
}


(-)a/src/visualizer/model/visual-simulator-impl.h (+1 lines)

Lines 80-85	Link Here

  Ptr<SimulatorImpl> m_simulator;

  Ptr<SimulatorImpl> m_simulator;

  ObjectFactory m_simulatorImplFactory;

  ObjectFactory m_simulatorImplFactory;

  Time m_stopTime;

};

};

} // namespace ns3

} // namespace ns3

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

Lines 365-370	Link Here

365

        self.quit = False

365

        self.quit = False

366

        self.sim_helper = ns.visualizer.PyViz()

366

        self.sim_helper = ns.visualizer.PyViz()

367

        self.pause_messages = []

367

        self.pause_messages = []

368

        self.simtime = ''

368

369

    def set_nodes_of_interest(self, nodes):

370

    def set_nodes_of_interest(self, nodes):

370

        self.lock.acquire()

371

        self.lock.acquire()

Lines 372-380	Link Here

372

            self.sim_helper.SetNodesOfInterest(nodes)

373

            self.sim_helper.SetNodesOfInterest(nodes)

373

        finally:

374

        finally:

374

            self.lock.release()

375

            self.lock.release()

376

377

    def set_sim_time (self, simtime):

378

        self.simtime = simtime

375

379

376

    def run(self):

380

    def run(self):

377

        while not self.quit:

381

        while not self.quit:

382

            if not self.simtime == '':

383

                if ns.core.Simulator.Now () >= ns.core.Time(self.simtime):

384

                    self.viz.play_button.set_sensitive(False)

385

                    break

378

            #print "sim: Wait for go"

386

            #print "sim: Wait for go"

379

            self.go.wait() # wait until the main (view) thread gives us the go signal

387

            self.go.wait() # wait until the main (view) thread gives us the go signal

380

            self.go.clear()

388

            self.go.clear()

Lines 1185-1190	Link Here

1185

1193

1186

        gtk.main()

1194

        gtk.main()

1187

1195

1196

    def setSimTime (self, simtime):

1197

        self.simulation.set_sim_time (simtime)

1198

1188

1199

1189

    def on_root_button_press_event(self, view, target, event):

1200

    def on_root_button_press_event(self, view, target, event):

1190

        if event.button == 1:

1201

        if event.button == 1:

Lines 1479-1485	Link Here

1479

    add_initialization_hook(hook)

1490

    add_initialization_hook(hook)

1480

1491

1481

1492

1482

def start():

1493

def start(simtime):

1483

    assert Visualizer.INSTANCE is None

1494

    assert Visualizer.INSTANCE is None

1484

    if _import_error is not None:

1495

    if _import_error is not None:

1485

        import sys

1496

        import sys

Lines 1491-1494	Link Here

1491

    for hook, args in initialization_hooks:

1502

    for hook, args in initialization_hooks:

1492

        gobject.idle_add(hook, viz, *args)

1503

        gobject.idle_add(hook, viz, *args)

1493

    ns.network.Packet.EnablePrinting()

1504

    ns.network.Packet.EnablePrinting()

1505

    viz.setSimTime(simtime)

1494

    viz.start()

1506

    viz.start()

Return to bug 2509