Commit 0dbb34e0 authored by Tobias Koenig's avatar Tobias Koenig
Browse files

[sS]ymbolPos -> [sS]ymbolPosition

svn path=/trunk/KDE/kdeedu/marble/; revision=717213
parent c872f681
......@@ -129,7 +129,7 @@ QVector<QPersistentModelIndex> PlaceMarkLayout::whichPlaceMarkAt( const QPoint&
const VisiblePlaceMark *mark = *it; // no cast
if ( mark->labelRect().contains( curpos )
|| QRect( mark->symbolPos(), mark->symbolSize() ).contains( curpos ) ) {
|| QRect( mark->symbolPosition(), mark->symbolSize() ).contains( curpos ) ) {
ret.append( mark->modelIndex() );
}
}
......@@ -226,8 +226,8 @@ void PlaceMarkLayout::paintPlaceFolder(QPainter* painter,
}
// Finally save the label position on the map.
mark->setSymbolPos( QPoint( x - mark->symbolSize().width() / 2,
y - mark->symbolSize().height() / 2) );
mark->setSymbolPosition( QPoint( x - mark->symbolSize().width() / 2,
y - mark->symbolSize().height() / 2) );
mark->setLabelRect( labelRect );
// Add the current placemark to the matching row and it's
......@@ -343,8 +343,8 @@ void PlaceMarkLayout::paintPlaceFolder(QPainter* painter,
}
// Finally save the label position on the map.
mark->setSymbolPos( QPoint( x - mark->symbolSize().width() / 2,
y - mark->symbolSize().height() / 2) );
mark->setSymbolPosition( QPoint( x - mark->symbolSize().width() / 2,
y - mark->symbolSize().height() / 2) );
mark->setLabelRect( labelRect );
// Add the current placemark to the matching row and it's
......@@ -422,6 +422,8 @@ inline bool PlaceMarkLayout::locatedOnScreen ( const QPersistentModelIndex &inde
return true;
}
return true;
}
// Set font and textWidth according to the type of the PlaceMark.
......
......@@ -70,7 +70,7 @@ void PlaceMarkPainter::drawPlaceMarks( QPainter* painter,
drawLabelPixmap( mark, isSelected );
}
painter->drawPixmap( mark->symbolPos(), mark->symbolPixmap() );
painter->drawPixmap( mark->symbolPosition(), mark->symbolPixmap() );
painter->drawPixmap( mark->labelRect(), mark->labelPixmap() );
}
......@@ -87,10 +87,10 @@ void PlaceMarkPainter::drawPlaceMarks( QPainter* painter,
drawLabelPixmap( mark, isSelected );
}
painter->drawPixmap( mark->symbolPos(), mark->symbolPixmap() );
painter->drawPixmap( mark->symbolPosition(), mark->symbolPixmap() );
painter->drawPixmap( mark->labelRect(), mark->labelPixmap() );
int tempSymbol = mark->symbolPos().x();
int tempSymbol = mark->symbolPosition().x();
int tempText = mark->labelRect().x();
for ( int i = tempSymbol - 4 * viewParams->m_radius;
......@@ -101,11 +101,11 @@ void PlaceMarkPainter::drawPlaceMarks( QPainter* painter,
labelRect.moveLeft(i - tempSymbol + tempText );
mark->setLabelRect( labelRect );
QPoint symbolPos( mark->symbolPos() );
QPoint symbolPos( mark->symbolPosition() );
symbolPos.setX( i );
mark->setSymbolPos( symbolPos );
mark->setSymbolPosition( symbolPos );
painter->drawPixmap( mark->symbolPos(), mark->symbolPixmap() );
painter->drawPixmap( mark->symbolPosition(), mark->symbolPixmap() );
painter->drawPixmap( mark->labelRect(), mark->labelPixmap() );
}
......@@ -117,11 +117,11 @@ void PlaceMarkPainter::drawPlaceMarks( QPainter* painter,
labelRect.moveLeft(i - tempSymbol + tempText );
mark->setLabelRect( labelRect );
QPoint symbolPos( mark->symbolPos() );
QPoint symbolPos( mark->symbolPosition() );
symbolPos.setX( i );
mark->setSymbolPos( symbolPos );
mark->setSymbolPosition( symbolPos );
painter->drawPixmap( mark->symbolPos(), mark->symbolPixmap() );
painter->drawPixmap( mark->symbolPosition(), mark->symbolPixmap() );
painter->drawPixmap( mark->labelRect(), mark->labelPixmap() );
}
}
......
......@@ -51,14 +51,14 @@ const QSize& VisiblePlaceMark::symbolSize() const
return m_symbolSize;
}
const QPoint& VisiblePlaceMark::symbolPos() const
const QPoint& VisiblePlaceMark::symbolPosition() const
{
return m_symbolPos;
return m_symbolPosition;
}
void VisiblePlaceMark::setSymbolPos( const QPoint& sympos )
void VisiblePlaceMark::setSymbolPosition( const QPoint& position )
{
m_symbolPos = sympos;
m_symbolPosition = position;
}
const QPixmap& VisiblePlaceMark::labelPixmap() const
......
......@@ -73,12 +73,12 @@ class VisiblePlaceMark
/**
* Returns the position of the place mark symbol on the map.
*/
const QPoint& symbolPos() const;
const QPoint& symbolPosition() const;
/**
* Sets the position of the place mark symbol on the map.
* Sets the @p position of the place mark symbol on the map.
*/
void setSymbolPos( const QPoint& sympos );
void setSymbolPosition( const QPoint& position );
/**
* Returns the pixmap of the place mark name label.
......@@ -114,10 +114,10 @@ class VisiblePlaceMark
QPersistentModelIndex m_modelIndex;
// View stuff
QPoint m_symbolPos; // position of the placemark's symbol
QPixmap m_labelPixmap; // the text label (most often name)
QFont m_labelFont; // the text label font (most often name)
QRect m_labelRect; // bounding box of label
QPoint m_symbolPosition; // position of the placemark's symbol
QPixmap m_labelPixmap; // the text label (most often name)
QFont m_labelFont; // the text label font (most often name)
QRect m_labelRect; // bounding box of label
mutable QString m_name; // cached value
mutable QSize m_symbolSize; // cached value
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment