Skip to content

Commit dc1fe50

Browse files
ZoltanBojtheZoltanBojthe
committed
follow 'NetworkNodeCanvasVisualization: also store the top-left coordinates of annotations for calculate correct offsets at transformation'
1 parent bb3ab37 commit dc1fe50

10 files changed

Lines changed: 21 additions & 19 deletions

‎src/inet/visualizer/canvas/common/GateScheduleCanvasVisualizer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void GateScheduleCanvasVisualizer::addGateVisualization(const GateVisualization
6060
GateScheduleVisualizerBase::addGateVisualization(gateVisualization);
6161
auto gateCanvasVisualization = static_cast<const GateCanvasVisualization *>(gateVisualization);
6262
auto figure = gateCanvasVisualization->figure;
63-
gateCanvasVisualization->networkNodeVisualization->addAnnotation(figure, figure->getBounds().getSize(), placementHint, placementPriority);
63+
gateCanvasVisualization->networkNodeVisualization->addAnnotation(figure, figure->getBounds(), placementHint, placementPriority);
6464
}
6565

6666
void GateScheduleCanvasVisualizer::removeGateVisualization(const GateVisualization *gateVisualization)

‎src/inet/visualizer/canvas/common/InfoCanvasVisualizer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void InfoCanvasVisualizer::addInfoVisualization(const InfoVisualization *infoVis
6363
InfoVisualizerBase::addInfoVisualization(infoVisualization);
6464
auto infoCanvasVisualization = static_cast<const InfoCanvasVisualization *>(infoVisualization);
6565
auto figure = infoCanvasVisualization->figure;
66-
infoCanvasVisualization->networkNodeVisualization->addAnnotation(figure, figure->getBounds().getSize(), placementHint, placementPriority);
66+
infoCanvasVisualization->networkNodeVisualization->addAnnotation(figure, figure->getBounds(), placementHint, placementPriority);
6767
}
6868

6969
void InfoCanvasVisualizer::removeInfoVisualization(const InfoVisualization *infoVisualization)

‎src/inet/visualizer/canvas/common/QueueCanvasVisualizer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void QueueCanvasVisualizer::addQueueVisualization(const QueueVisualization *queu
6161
QueueVisualizerBase::addQueueVisualization(queueVisualization);
6262
auto queueCanvasVisualization = static_cast<const QueueCanvasVisualization *>(queueVisualization);
6363
auto figure = queueCanvasVisualization->figure;
64-
queueCanvasVisualization->networkNodeVisualization->addAnnotation(figure, figure->getBounds().getSize(), placementHint, placementPriority);
64+
queueCanvasVisualization->networkNodeVisualization->addAnnotation(figure, figure->getBounds(), placementHint, placementPriority);
6565
}
6666

6767
void QueueCanvasVisualizer::removeQueueVisualization(const QueueVisualization *queueVisualization)

‎src/inet/visualizer/canvas/common/StatisticCanvasVisualizer.cc‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,12 @@ void StatisticCanvasVisualizer::addStatisticVisualization(const StatisticVisuali
9090
StatisticVisualizerBase::addStatisticVisualization(statisticVisualization);
9191
auto statisticCanvasVisualization = static_cast<const StatisticCanvasVisualization *>(statisticVisualization);
9292
auto figure = statisticCanvasVisualization->figure;
93-
if (auto indicatorFigure = dynamic_cast<IIndicatorFigure *>(figure))
94-
statisticCanvasVisualization->networkNodeVisualization->addAnnotation(statisticCanvasVisualization->figure, indicatorFigure->getSize(), placementHint, placementPriority);
93+
if (auto indicatorFigure = dynamic_cast<IIndicatorFigure *>(figure)) {
94+
auto size = indicatorFigure->getSize();
95+
statisticCanvasVisualization->networkNodeVisualization->addAnnotation(statisticCanvasVisualization->figure, cFigure::Rectangle(0.0, 0.0, size.x, size.y), placementHint, placementPriority);
96+
}
9597
else if (auto boxedLabelFigure = check_and_cast<BoxedLabelFigure *>(figure))
96-
statisticCanvasVisualization->networkNodeVisualization->addAnnotation(statisticCanvasVisualization->figure, boxedLabelFigure->getBounds().getSize(), placementHint, placementPriority);
98+
statisticCanvasVisualization->networkNodeVisualization->addAnnotation(statisticCanvasVisualization->figure, boxedLabelFigure->getBounds(), placementHint, placementPriority);
9799
}
98100

99101
void StatisticCanvasVisualizer::removeStatisticVisualization(const StatisticVisualization *statisticVisualization)

‎src/inet/visualizer/canvas/linklayer/Ieee80211CanvasVisualizer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void Ieee80211CanvasVisualizer::addIeee80211Visualization(const Ieee80211Visuali
9494
{
9595
Ieee80211VisualizerBase::addIeee80211Visualization(ieee80211Visualization);
9696
auto ieee80211CanvasVisualization = static_cast<const Ieee80211CanvasVisualization *>(ieee80211Visualization);
97-
ieee80211CanvasVisualization->networkNodeVisualization->addAnnotation(ieee80211CanvasVisualization->figure, ieee80211CanvasVisualization->figure->getBounds().getSize(), placementHint, placementPriority);
97+
ieee80211CanvasVisualization->networkNodeVisualization->addAnnotation(ieee80211CanvasVisualization->figure, ieee80211CanvasVisualization->figure->getBounds(), placementHint, placementPriority);
9898
}
9999

100100
void Ieee80211CanvasVisualizer::removeIeee80211Visualization(const Ieee80211Visualization *ieee80211Visualization)

‎src/inet/visualizer/canvas/linklayer/InterfaceTableCanvasVisualizer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void InterfaceTableCanvasVisualizer::addInterfaceVisualization(const InterfaceVi
9090
}
9191
}
9292
else
93-
interfaceCanvasVisualization->networkNodeVisualization->addAnnotation(interfaceCanvasVisualization->figure, interfaceCanvasVisualization->figure->getBounds().getSize(), placementHint, placementPriority);
93+
interfaceCanvasVisualization->networkNodeVisualization->addAnnotation(interfaceCanvasVisualization->figure, interfaceCanvasVisualization->figure->getBounds(), placementHint, placementPriority);
9494
}
9595

9696
void InterfaceTableCanvasVisualizer::removeInterfaceVisualization(const InterfaceVisualization *interfaceVisualization)

‎src/inet/visualizer/canvas/physicallayer/MediumCanvasVisualizer.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ void MediumCanvasVisualizer::initialize(int stage)
125125
powerDensityMapFigure->setPlotSize(cFigure::Point(powerDensityMapFigureWidth, powerDensityMapFigureHeight), cFigure::Point(powerDensityMapPixmapWidth, powerDensityMapPixmapHeight));
126126
// TODO center on node to align in space coordinates
127127
powerDensityMapFigure->refreshDisplay();
128-
networkNodeVisualization->addAnnotation(powerDensityMapFigure, powerDensityMapFigure->getPlotSize(), PLACEMENT_CENTER_CENTER, -1);
128+
networkNodeVisualization->addAnnotation(powerDensityMapFigure, powerDensityMapFigure->getBounds(), PLACEMENT_CENTER_CENTER, -1);
129129
powerDensityMapFigures[networkNode->getId()] = powerDensityMapFigure;
130130
}
131131
if (displaySpectrums) {
@@ -143,7 +143,7 @@ void MediumCanvasVisualizer::initialize(int stage)
143143
spectrumFigure->setYValueFormat("%.3g");
144144
spectrumFigure->setPlotSize(cFigure::Point(spectrumFigureWidth, spectrumFigureHeight));
145145
spectrumFigure->refreshDisplay();
146-
networkNodeVisualization->addAnnotation(spectrumFigure, spectrumFigure->getSize(), spectrumPlacementHint, spectrumPlacementPriority);
146+
networkNodeVisualization->addAnnotation(spectrumFigure, spectrumFigure->getBounds(), spectrumPlacementHint, spectrumPlacementPriority);
147147
spectrumFigures[networkNode->getId()] = spectrumFigure;
148148
}
149149
if (displaySpectrograms) {
@@ -158,7 +158,7 @@ void MediumCanvasVisualizer::initialize(int stage)
158158
spectrogramFigure->invertYAxis();
159159
spectrogramFigure->setPlotSize(cFigure::Point(spectrogramFigureWidth, spectrogramFigureHeight), cFigure::Point(spectrogramPixmapWidth, spectrogramPixmapHeight));
160160
spectrogramFigure->refreshDisplay();
161-
networkNodeVisualization->addAnnotation(spectrogramFigure, spectrogramFigure->getSize(), spectrogramPlacementHint, spectrogramPlacementPriority);
161+
networkNodeVisualization->addAnnotation(spectrogramFigure, spectrogramFigure->getBounds(), spectrogramPlacementHint, spectrogramPlacementPriority);
162162
spectrogramFigures[networkNode->getId()] = spectrogramFigure;
163163
}
164164
if (displayPowerDensityMaps || displaySpectrums || displaySpectrograms)
@@ -954,7 +954,7 @@ void MediumCanvasVisualizer::handleRadioAdded(const IRadio *radio)
954954
iconFigure->setAnchor(cFigure::ANCHOR_NW);
955955
auto labelFigure = signalDepartureFigure->getLabelFigure();
956956
labelFigure->setPosition(iconFigure->getBounds().getSize() / 2);
957-
networkNodeVisualization->addAnnotation(signalDepartureFigure, signalDepartureFigure->getBounds().getSize(), signalDeparturePlacementHint, signalDeparturePlacementPriority);
957+
networkNodeVisualization->addAnnotation(signalDepartureFigure, signalDepartureFigure->getBounds(), signalDeparturePlacementHint, signalDeparturePlacementPriority);
958958
setSignalDepartureFigure(radio, signalDepartureFigure);
959959
}
960960
if (displaySignalArrivals) {
@@ -968,7 +968,7 @@ void MediumCanvasVisualizer::handleRadioAdded(const IRadio *radio)
968968
iconFigure->setAnchor(cFigure::ANCHOR_NW);
969969
auto labelFigure = signalArrivalFigure->getLabelFigure();
970970
labelFigure->setPosition(iconFigure->getBounds().getSize() / 2);
971-
networkNodeVisualization->addAnnotation(signalArrivalFigure, signalArrivalFigure->getBounds().getSize(), signalArrivalPlacementHint, signalArrivalPlacementPriority);
971+
networkNodeVisualization->addAnnotation(signalArrivalFigure, signalArrivalFigure->getBounds(), signalArrivalPlacementHint, signalArrivalPlacementPriority);
972972
setSignalArrivalFigure(radio, signalArrivalFigure);
973973
}
974974
}

‎src/inet/visualizer/canvas/physicallayer/RadioCanvasVisualizer.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ void RadioCanvasVisualizer::addRadioVisualization(const RadioVisualization *radi
118118
RadioVisualizerBase::addRadioVisualization(radioVisualization);
119119
auto radioCanvasVisualization = static_cast<const RadioCanvasVisualization *>(radioVisualization);
120120
if (displayRadioMode)
121-
radioCanvasVisualization->networkNodeVisualization->addAnnotation(radioCanvasVisualization->radioModeFigure, radioCanvasVisualization->radioModeFigure->getSize(), placementHint, placementPriority);
121+
radioCanvasVisualization->networkNodeVisualization->addAnnotation(radioCanvasVisualization->radioModeFigure, radioCanvasVisualization->radioModeFigure->getBounds(), placementHint, placementPriority);
122122
if (displayReceptionState)
123-
radioCanvasVisualization->networkNodeVisualization->addAnnotation(radioCanvasVisualization->receptionStateFigure, radioCanvasVisualization->receptionStateFigure->getSize(), placementHint, placementPriority);
123+
radioCanvasVisualization->networkNodeVisualization->addAnnotation(radioCanvasVisualization->receptionStateFigure, radioCanvasVisualization->receptionStateFigure->getBounds(), placementHint, placementPriority);
124124
if (displayTransmissionState)
125-
radioCanvasVisualization->networkNodeVisualization->addAnnotation(radioCanvasVisualization->transmissionStateFigure, radioCanvasVisualization->transmissionStateFigure->getSize(), placementHint, placementPriority);
125+
radioCanvasVisualization->networkNodeVisualization->addAnnotation(radioCanvasVisualization->transmissionStateFigure, radioCanvasVisualization->transmissionStateFigure->getBounds(), placementHint, placementPriority);
126126
if (displayAntennaLobes) {
127127
radioCanvasVisualization->networkNodeVisualization->addFigure(radioCanvasVisualization->antennaLobeFigure);
128128
radioCanvasVisualization->networkNodeVisualization->addFigure(radioCanvasVisualization->antennaLobeUnitGainFigure);

‎src/inet/visualizer/canvas/power/EnergyStorageCanvasVisualizer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void EnergyStorageCanvasVisualizer::addEnergyStorageVisualization(const EnergySt
6161
EnergyStorageVisualizerBase::addEnergyStorageVisualization(energyStorageVisualization);
6262
auto energyStorageCanvasVisualization = static_cast<const EnergyStorageCanvasVisualization *>(energyStorageVisualization);
6363
auto figure = energyStorageCanvasVisualization->figure;
64-
energyStorageCanvasVisualization->networkNodeVisualization->addAnnotation(figure, figure->getBounds().getSize(), placementHint, placementPriority);
64+
energyStorageCanvasVisualization->networkNodeVisualization->addAnnotation(figure, figure->getBounds(), placementHint, placementPriority);
6565
}
6666

6767
void EnergyStorageCanvasVisualizer::removeEnergyStorageVisualization(const EnergyStorageVisualization *energyStorageVisualization)

‎src/inet/visualizer/canvas/transportlayer/TransportConnectionCanvasVisualizer.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ void TransportConnectionCanvasVisualizer::addConnectionVisualization(const Trans
7777
auto sourceModule = getSimulation()->getModule(connectionVisualization->sourceModuleId);
7878
if (sourceModule != nullptr) {
7979
auto sourceVisualization = networkNodeVisualizer->getNetworkNodeVisualization(getContainingNode(sourceModule));
80-
sourceVisualization->addAnnotation(connectionCanvasVisualization->sourceFigure, connectionCanvasVisualization->sourceFigure->getBounds().getSize(), placementHint, placementPriority);
80+
sourceVisualization->addAnnotation(connectionCanvasVisualization->sourceFigure, connectionCanvasVisualization->sourceFigure->getBounds(), placementHint, placementPriority);
8181
}
8282
auto destinationModule = getSimulation()->getModule(connectionVisualization->destinationModuleId);
8383
if (destinationModule != nullptr) {
8484
auto destinationVisualization = networkNodeVisualizer->getNetworkNodeVisualization(getContainingNode(destinationModule));
85-
destinationVisualization->addAnnotation(connectionCanvasVisualization->destinationFigure, connectionCanvasVisualization->destinationFigure->getBounds().getSize(), placementHint, placementPriority);
85+
destinationVisualization->addAnnotation(connectionCanvasVisualization->destinationFigure, connectionCanvasVisualization->destinationFigure->getBounds(), placementHint, placementPriority);
8686
}
8787
setConnectionLabelsVisible(connectionVisualizations.size() > iconColorSet.getSize());
8888
}

0 commit comments

Comments
 (0)