Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b84d333d
Commit
b84d333d
authored
Jan 11, 2016
by
nopeppermint
Browse files
change back qwt corrections
parent
3c48c8c1
Changes
2
Show whitespace changes
Inline
Side-by-side
libs/qwt/qwt_text.cpp
View file @
b84d333d
...
@@ -529,7 +529,7 @@ double QwtText::heightForWidth( double width, const QFont &defaultFont ) const
...
@@ -529,7 +529,7 @@ double QwtText::heightForWidth( double width, const QFont &defaultFont ) const
Returns the size, that is needed to render text
Returns the size, that is needed to render text
\param defaultFont Font of the text
\param defaultFont Font of the text
\return Cal
c
ulated size
\return Calu
c
lated size
*/
*/
QSizeF
QwtText
::
textSize
(
const
QFont
&
defaultFont
)
const
QSizeF
QwtText
::
textSize
(
const
QFont
&
defaultFont
)
const
{
{
...
@@ -637,7 +637,7 @@ void QwtText::draw( QPainter *painter, const QRectF &rect ) const
...
@@ -637,7 +637,7 @@ void QwtText::draw( QPainter *painter, const QRectF &rect ) const
returns true. If there is none QwtPlainTextEngine is returned.
returns true. If there is none QwtPlainTextEngine is returned.
If no text engine is registered for the format QwtPlainTextEngine
If no text engine is registered for the format QwtPlainTextEngine
is return
e
d.
is returnd.
\param text Text, needed in case of AutoText
\param text Text, needed in case of AutoText
\param format Text format
\param format Text format
...
...
libs/qwt/qwt_text_engine.cpp
View file @
b84d333d
...
@@ -181,7 +181,7 @@ double QwtPlainTextEngine::heightForWidth( const QFont& font, int flags,
...
@@ -181,7 +181,7 @@ double QwtPlainTextEngine::heightForWidth( const QFont& font, int flags,
\param flags Bitwise OR of the flags used like in QPainter::drawText
\param flags Bitwise OR of the flags used like in QPainter::drawText
\param text Text to be rendered
\param text Text to be rendered
\return Cal
c
ulated size
\return Calu
c
lated size
*/
*/
QSizeF
QwtPlainTextEngine
::
textSize
(
const
QFont
&
font
,
QSizeF
QwtPlainTextEngine
::
textSize
(
const
QFont
&
font
,
int
flags
,
const
QString
&
text
)
const
int
flags
,
const
QString
&
text
)
const
...
@@ -270,7 +270,7 @@ double QwtRichTextEngine::heightForWidth( const QFont& font, int flags,
...
@@ -270,7 +270,7 @@ double QwtRichTextEngine::heightForWidth( const QFont& font, int flags,
\param flags Bitwise OR of the flags used like in QPainter::drawText()
\param flags Bitwise OR of the flags used like in QPainter::drawText()
\param text Text to be rendered
\param text Text to be rendered
\return Cal
c
ulated size
\return Calu
c
lated size
*/
*/
QSizeF
QwtRichTextEngine
::
textSize
(
const
QFont
&
font
,
QSizeF
QwtRichTextEngine
::
textSize
(
const
QFont
&
font
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment