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

(-)a/src/visualizer/model/pyviz.cc (+6 lines)
 Lines 134-139   PyViz::PyViz () Link Here 
134 
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Mac/MacRx",
 134 
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Mac/MacRx",
135 
                   MakeCallback (&PyViz::TraceNetDevRxWifi, this));
 135 
                   MakeCallback (&PyViz::TraceNetDevRxWifi, this));
136 

          136
          

        

            

              
              
              137
              
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WaveNetDevice/MacEntities/*/MacTx",

            

            

              138
              
                   MakeCallback (&PyViz::TraceNetDevTxWifi, this));

            

            

              139
              

            

            

              140
              
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WaveNetDevice/MacEntities/*/MacRx",

            

            

              141
              
                   MakeCallback (&PyViz::TraceNetDevRxWifi, this));

            

            

              142
              

            

        

          137
          
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::CsmaNetDevice/MacTx",

          143
          
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::CsmaNetDevice/MacTx",

        

        

          138
          
                   MakeCallback (&PyViz::TraceNetDevTxCsma, this));

          144
          
                   MakeCallback (&PyViz::TraceNetDevTxCsma, this));

        

        

          139
          

          145
          

        



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




  

    

    

       Lines 7-12
      import ns.mesh 
    
  Link Here 
    

  

        

          7
          
import ns.wimax

          7
          
import ns.wimax

        

        

          8
          
import ns.wimax

          8
          
import ns.wimax

        

        

          9
          
import ns.lte

          9
          
import ns.lte

        

            

              
              
              10
              
import ns.wave

            

        

          10
          

          11
          

        

        

          11
          
import gobject

          12
          
import gobject

        

        

          12
          
import os.path

          13
          
import os.path

        

  

    

    

       Lines 45-50
      netdevice_traits = { 
    
  Link Here 
    

  

        

          45
          
    ns.wimax.BaseStationNetDevice: NetDeviceTraits(is_wireless=True),

          46
          
    ns.wimax.BaseStationNetDevice: NetDeviceTraits(is_wireless=True),

        

        

          46
          
    ns.lte.LteUeNetDevice: NetDeviceTraits(is_wireless=True),

          47
          
    ns.lte.LteUeNetDevice: NetDeviceTraits(is_wireless=True),

        

        

          47
          
    ns.lte.LteEnbNetDevice: NetDeviceTraits(is_wireless=True),

          48
          
    ns.lte.LteEnbNetDevice: NetDeviceTraits(is_wireless=True),

        

            

              
              
              49
              
    ns.wave.WaveNetDevice: NetDeviceTraits(is_wireless=True),

            

        

          48
          
}

          50
          
}

        

        

          49
          

          51
          

        

        

          50
          
def lookup_netdevice_traits(class_type):

          52
          
def lookup_netdevice_traits(class_type):

        



(-)a/src/visualizer/wscript
      (-1 / +1 lines)




  

    

    

       Lines 37-43
      def configure(conf): 
    
  Link Here 
    

  

        

          37
          

          37
          

        

        

          38
          
def build(bld):

          38
          
def build(bld):

        

        

          39
          

          39
          

        

          
            

              40
              
    module = bld.create_ns3_module('visualizer', ['internet', 'wifi', 'point-to-point'])


              40
              
    module = bld.create_ns3_module('visualizer', ['internet', 'wifi', 'wave', 'point-to-point'])

            

        

          41
          
    headers = bld(features='ns3header')

          41
          
    headers = bld(features='ns3header')

        

        

          42
          
    headers.module = 'visualizer'

          42
          
    headers.module = 'visualizer'

        

        

          43
          

          43
          

        






  

  Return to bug 2504