NetworkNodeCanvasVisualization: topLeft -> figureOffset

Author: ZoltanBojthe

src/inet/visualizer/canvas/scene/NetworkNodeCanvasVisualization.cc

@@ -19,16 +19,16 @@ namespace visualizer {
 NetworkNodeCanvasVisualization::Annotation::Annotation(cFigure *figure, const cFigure::Point& size, Placement placementHint, double placementPriority) :
     figure(figure),
     bounds(cFigure::Rectangle(NaN, NaN, size.x, size.y)),
-    topLeft(0.0, 0.0),
+    figureOffset(0.0, 0.0),
     placementHint(placementHint),
     placementPriority(placementPriority)
 {
 }
 
-NetworkNodeCanvasVisualization::Annotation::Annotation(cFigure *figure, const cFigure::Point& topLeft, const cFigure::Point& size, Placement placementHint, double placementPriority) :
+NetworkNodeCanvasVisualization::Annotation::Annotation(cFigure *figure, const cFigure::Rectangle& bounds,Placement placementHint, double placementPriority) :
     figure(figure),
-    bounds(cFigure::Rectangle(NaN, NaN, size.x, size.y)),
-    topLeft(topLeft),
+    bounds(cFigure::Rectangle(NaN, NaN, bounds.width, bounds.height)),
+    figureOffset(-bounds.x, -bounds.y),
     placementHint(placementHint),
     placementPriority(placementPriority)
 {
@@ -68,7 +68,7 @@ void NetworkNodeCanvasVisualization::refreshDisplay()
 
 void NetworkNodeCanvasVisualization::addAnnotation(cFigure *figure, cFigure::Rectangle bounds, Placement placementHint, double placementPriority)
 {
-    annotations.push_back(Annotation(figure, cFigure::Point(bounds.x, bounds.y), bounds.getSize(), placementHint, placementPriority));
+    annotations.push_back(Annotation(figure, bounds, placementHint, placementPriority));
     annotationFigure->addFigure(figure);
     isLayoutInvalid = true;
 }
@@ -337,7 +337,7 @@ void NetworkNodeCanvasVisualization::layout()
         // store position and rectangle
         annotation.bounds.x = bestRc.x + annotationSpacing / 2;
         annotation.bounds.y = bestRc.y + annotationSpacing / 2;
-        annotation.figure->setTransform(cFigure::Transform().translate(annotation.bounds.x - annotation.topLeft.x, annotation.bounds.y - annotation.topLeft.y));
+        annotation.figure->setTransform(cFigure::Transform().translate(annotation.bounds.x + annotation.figureOffset.x, annotation.bounds.y + annotation.figureOffset.y));
 
         // delete candidate points covered by best rc
         for (auto j = pts.begin(); j != pts.end();) {

src/inet/visualizer/canvas/scene/NetworkNodeCanvasVisualization.h

@@ -22,13 +22,13 @@ class INET_API NetworkNodeCanvasVisualization : public NetworkNodeVisualizerBase
       public:
         cFigure *figure;
         cFigure::Rectangle bounds;
-        cFigure::Point topLeft;
+        cFigure::Point figureOffset;
         Placement placementHint;
         double placementPriority;
 
       public:
         Annotation(cFigure *figure, const cFigure::Point& size, Placement placement, double placementPriority);
-        Annotation(cFigure *figure, const cFigure::Point& topLeft, const cFigure::Point& size, Placement placement, double placementPriority);
+        Annotation(cFigure *figure, const cFigure::Rectangle& bounds, Placement placement, double placementPriority);
 
         static bool comparePlacementPriority(const Annotation& a1, const Annotation& a2);
     };