From 102f2c788a2db40b0cb955a3deb3e6132ea39ee3 Mon Sep 17 00:00:00 2001 From: Levente Meszaros Date: Wed, 27 Mar 2024 16:39:36 +0100 Subject: [PATCH] Showcases: Replaced IntergratedMultiVisualizer with IntegratedMultiCanvasVisualizer. These showcases should not depend on the OsgVisualization feature. --- showcases/general/pcaprecording/PcapRecordingShowcase.ned | 5 ++--- .../mobility/combining/CombiningMobilityShowcase.ned | 8 +++----- showcases/routing/manet/ManetProtocolsShowcase.ned | 7 +++---- .../datalinkactivity/DatalinkVisualizerShowcase.ned | 4 ++-- showcases/wireless/analogmodel/AnalogModelShowcase.ned | 8 ++++---- showcases/wireless/ieee802154/Ieee802154Showcase.ned | 5 ++--- 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/showcases/general/pcaprecording/PcapRecordingShowcase.ned b/showcases/general/pcaprecording/PcapRecordingShowcase.ned index 014aeb188d7..c4d33a3448f 100644 --- a/showcases/general/pcaprecording/PcapRecordingShowcase.ned +++ b/showcases/general/pcaprecording/PcapRecordingShowcase.ned @@ -6,8 +6,7 @@ import inet.node.inet.AdhocHost; import inet.node.inet.Router; import inet.node.inet.StandardHost; import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; -import inet.visualizer.common.IntegratedMultiVisualizer; - +import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; network PcapRecordingShowcase { @@ -16,7 +15,7 @@ network PcapRecordingShowcase configurator: Ipv4NetworkConfigurator { @display("p=87,57"); } - visualizer: IntegratedMultiVisualizer { + visualizer: IntegratedMultiCanvasVisualizer { @display("p=87,130"); } radioMedium: Ieee80211ScalarRadioMedium { diff --git a/showcases/mobility/combining/CombiningMobilityShowcase.ned b/showcases/mobility/combining/CombiningMobilityShowcase.ned index e512da69f34..31bda4a327f 100644 --- a/showcases/mobility/combining/CombiningMobilityShowcase.ned +++ b/showcases/mobility/combining/CombiningMobilityShowcase.ned @@ -2,8 +2,7 @@ package inet.showcases.mobility.combining; import inet.node.inet.StandardHost; import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; -import inet.visualizer.common.IntegratedMultiVisualizer; - +import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; network CombiningMobilityShowcase { @@ -14,12 +13,11 @@ network CombiningMobilityShowcase host[numHosts]: StandardHost { @display("i=misc/smartphone"); } - visualizer: IntegratedMultiVisualizer { + visualizer: IntegratedMultiCanvasVisualizer { @display("p=47,39"); } } - network AntennaOrientation { @display("bgb=800,800;bgi=showcases/desert,s"); @@ -29,7 +27,7 @@ network AntennaOrientation rover: StandardHost { @display("p=247.632,395.568;b=100,64,rect,$minus,$minus;i=misc/car3"); } - visualizer: IntegratedMultiVisualizer { + visualizer: IntegratedMultiCanvasVisualizer { @display("p=61.104,57.888"); } radioMedium: Ieee80211ScalarRadioMedium { diff --git a/showcases/routing/manet/ManetProtocolsShowcase.ned b/showcases/routing/manet/ManetProtocolsShowcase.ned index 098d8232c72..ca8161b70ec 100644 --- a/showcases/routing/manet/ManetProtocolsShowcase.ned +++ b/showcases/routing/manet/ManetProtocolsShowcase.ned @@ -3,8 +3,7 @@ package inet.showcases.routing.manet; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.ManetRouter; import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; -import inet.visualizer.common.IntegratedMultiVisualizer; - +import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; network ManetprotocolsShowcaseA { @@ -26,7 +25,7 @@ network ManetprotocolsShowcaseA radioMedium: Ieee80211ScalarRadioMedium { @display("p=100,100"); } - visualizer: IntegratedMultiVisualizer { + visualizer: IntegratedMultiCanvasVisualizer { @display("p=100,200"); } configurator: Ipv4NetworkConfigurator { @@ -116,7 +115,7 @@ network ManetprotocolsShowcaseB configurator: Ipv4NetworkConfigurator { @display("p=38.461544,66.863914"); } - visualizer: IntegratedMultiVisualizer { + visualizer: IntegratedMultiCanvasVisualizer { @display("p=38.461544,106.50889"); } } diff --git a/showcases/visualizer/canvas/datalinkactivity/DatalinkVisualizerShowcase.ned b/showcases/visualizer/canvas/datalinkactivity/DatalinkVisualizerShowcase.ned index dd1fd51709e..0db4e0e2cd2 100644 --- a/showcases/visualizer/canvas/datalinkactivity/DatalinkVisualizerShowcase.ned +++ b/showcases/visualizer/canvas/datalinkactivity/DatalinkVisualizerShowcase.ned @@ -12,8 +12,8 @@ import inet.node.inet.AdhocHost; import inet.node.inet.StandardHost; import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; +import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; import inet.visualizer.common.DataLinkVisualizer; -import inet.visualizer.common.IntegratedMultiVisualizer; network DataLinkVisualizerEnablingWiredShowcase { @@ -66,7 +66,7 @@ network DataLinkVisualizerActivityLevelShowcase { @display("bgb=700,250"); submodules: - visualizer: IntegratedMultiVisualizer { + visualizer: IntegratedMultiCanvasVisualizer { parameters: @display("p=100,50"); } diff --git a/showcases/wireless/analogmodel/AnalogModelShowcase.ned b/showcases/wireless/analogmodel/AnalogModelShowcase.ned index e9dc1a038a7..4705e681270 100644 --- a/showcases/wireless/analogmodel/AnalogModelShowcase.ned +++ b/showcases/wireless/analogmodel/AnalogModelShowcase.ned @@ -9,7 +9,7 @@ import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211DimensionalRad import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; import inet.physicallayer.wireless.noise.NoiseSource; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; -import inet.visualizer.common.IntegratedMultiVisualizer; +import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; network AnalogModelShowcaseRoutingNetwork { @@ -33,7 +33,7 @@ network AnalogModelShowcaseRoutingNetwork configurator: Ipv4NetworkConfigurator { @display("p=38.461544,66.863914"); } - visualizer: IntegratedMultiVisualizer { + visualizer: IntegratedMultiCanvasVisualizer { @display("p=38.461544,106.50889"); } } @@ -43,7 +43,7 @@ network AnalogModelShowcaseDistanceNetwork parameters: @display("bgb=901.5187,376.65"); submodules: - visualizer: IntegratedMultiVisualizer { + visualizer: IntegratedMultiCanvasVisualizer { parameters: @display("p=64.256,62.247997"); } @@ -69,7 +69,7 @@ network AnalogModelShowcaseDistanceNetwork_ parameters: @display("bgb=901.5187,376.65"); submodules: - visualizer: IntegratedMultiVisualizer { + visualizer: IntegratedMultiCanvasVisualizer { parameters: @display("p=64.256,62.247997"); } diff --git a/showcases/wireless/ieee802154/Ieee802154Showcase.ned b/showcases/wireless/ieee802154/Ieee802154Showcase.ned index 215a56e5883..50b74261a68 100644 --- a/showcases/wireless/ieee802154/Ieee802154Showcase.ned +++ b/showcases/wireless/ieee802154/Ieee802154Showcase.ned @@ -3,8 +3,7 @@ package inet.showcases.wireless.ieee802154; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.SensorNode; import inet.physicallayer.wireless.ieee802154.packetlevel.Ieee802154NarrowbandScalarRadioMedium; -import inet.visualizer.common.IntegratedMultiVisualizer; - +import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; network Ieee802154Showcase { @@ -58,7 +57,7 @@ network Ieee802154Showcase radioMedium: Ieee802154NarrowbandScalarRadioMedium { @display("p=18,2.25"); } - visualizer: IntegratedMultiVisualizer { + visualizer: IntegratedMultiCanvasVisualizer { @display("p=18,3.75"); } }