Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_text.h

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_text.h (modified) (7 diffs)

trunk/BNC/qwt/qwt_text.h

@@ -2 +2 @@
  * Qwt Widget Library
  * Copyright (C) 1997   Josef Wilgen
- * Copyright (C) 2003   Uwe Rathmann
+ * Copyright (C) 2002   Uwe Rathmann
  *
  * This library is free software; you can redistribute it and/or
@@ -15 +15 @@
 #include <qsize.h>
 #include <qfont.h>
+#include <qmetatype.h>
 
 class QColor;
@@ -32 +33 @@
     how to render it. Each format (f.e MathML, TeX, Qt Rich Text)
     has its own set of control sequences, that can be handles by
-    a QwtTextEngine for this format.
+    a special QwtTextEngine for this format.
   - Background\n
     A text might have a background, defined by a QPen and QBrush
-    to improve its visibility.
+    to improve its visibility. The corners of the background might
+    be rounded.
   - Font\n
     A text might have an individual font.
@@ -42 +44 @@
   - Render Flags\n
     Flags from Qt::AlignmentFlag and Qt::TextFlag used like in
-    QPainter::drawText.
+    QPainter::drawText().
 
   \sa QwtTextEngine, QwtTextLabel
@@ -63 +65 @@
     {
         /*!
-          The text format is determined using QwtTextEngine::mightRender for
+          The text format is determined using QwtTextEngine::mightRender() for
           all available text engines in increasing order > PlainText.
           If none of the text engines can render the text is rendered
@@ -168 +170 @@
     QColor usedColor( const QColor & ) const;
 
-    void setBackgroundPen( const QPen & );
-    QPen backgroundPen() const;
+    void setBorderRadius( double );
+    double borderRadius() const;
+
+    void setBorderPen( const QPen & );
+    QPen borderPen() const;
 
     void setBackgroundBrush( const QBrush & );
@@ -214 +219 @@
 Q_DECLARE_OPERATORS_FOR_FLAGS( QwtText::LayoutAttributes )
 
+Q_DECLARE_METATYPE( QwtText )
+
 #endif