Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_plot_svgitem.cpp

Timestamp:

May 10, 2017, 3:20:54 PM (7 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/qwt/qwt_plot_svgitem.cpp (modified) (6 diffs)

trunk/BNC/qwt/qwt_plot_svgitem.cpp

@@ -10 +10 @@
 #include "qwt_plot_svgitem.h"
 #include "qwt_scale_map.h"
-#include "qwt_legend.h"
-#include "qwt_legend_item.h"
 #include "qwt_painter.h"
 #include <qpainter.h>
@@ -66 +64 @@
 {
     d_data = new PrivateData();
+    d_data->boundingRect = QwtPlotItem::boundingRect();
 
     setItemAttribute( QwtPlotItem::AutoScale, true );
@@ -92 +91 @@
     d_data->boundingRect = rect;
     const bool ok = d_data->renderer.load( fileName );
+
+    legendChanged();
     itemChanged();
+
     return ok;
 }
@@ -109 +111 @@
     d_data->boundingRect = rect;
     const bool ok = d_data->renderer.load( data );
+
+    legendChanged();
     itemChanged();
+
     return ok;
 }
 
-//! Bounding rect of the item
+//! Bounding rectangle of the item
 QRectF QwtPlotSvgItem::boundingRect() const
 {
@@ -161 +166 @@
 
   \param painter Painter
-  \param viewBox View Box, see QSvgRenderer::viewBox
-  \param rect Traget rectangle on the paint device
+  \param viewBox View Box, see QSvgRenderer::viewBox()
+  \param rect Target rectangle on the paint device
 */
 void QwtPlotSvgItem::render( QPainter *painter,
@@ -185 +190 @@
 
 /*!
-  Calculate the viewBox from an rect and boundingRect().
+  Calculate the view box from rect and boundingRect().
 
   \param rect Rectangle in scale coordinates
-  \return viewBox View Box, see QSvgRenderer::viewBox
+  \return View box, see QSvgRenderer::viewBox()
 */
 QRectF QwtPlotSvgItem::viewBox( const QRectF &rect ) const