Commit a71a5e1c authored by Torsten Rahn's avatar Torsten Rahn

    * src/lib/AbstractScanlineTextureMapper.cpp: Small fix by Jan Becker
    * src/lib/MarbleControlBox.cpp: Fix by Casper Boeman for QToolBox 
issue
    * src/lib/MarbleModel.cpp: "Fix" to improve Marble speed

    All changes are trivial. Hope they will make it into RC2 still ..



svn path=/trunk/KDE/kdeedu/marble/; revision=745096
parent 4ad1068a
2007-12-05 Torsten Rahn <rahn@kde.org>
* src/lib/AbstractScanlineTextureMapper.cpp: Small fix by Jan Becker
* src/lib/MarbleControlBox.cpp: Fix by Casper Boeman for QToolBox issue
* src/lib/MarbleModel.cpp: "Fix" to improve Marble speed
All changes are trivial.
2007-11-13 Torsten Rahn <rahn@kde.org>
* src/lib/PlaceMarkPainter.{h,cpp}: Fix black labels on dark maps
......
......@@ -79,6 +79,7 @@ AbstractScanlineTextureMapper::~AbstractScanlineTextureMapper()
void AbstractScanlineTextureMapper::setMapTheme( const QString& theme )
{
m_tileLoader->setMapTheme(theme);
m_tileLevel = -1;
detectMaxTileLevel();
}
......
......@@ -78,11 +78,6 @@ MarbleControlBox::MarbleControlBox(QWidget *parent)
setFocusPolicy( Qt::NoFocus );
// setFocusProxy( d->uiWidget.searchLineEdit );
d->uiWidget.NavigationTab->setBackgroundRole( QPalette::Window );
d->uiWidget.LegendTab->setBackgroundRole( QPalette::Window );
d->uiWidget.MapViewTab->setBackgroundRole( QPalette::Window );
d->uiWidget.CurrentLocationTab->setBackgroundRole( QPalette::Window );
// Iterate through all of the Side Widget values //
d->uiWidget.toolBox->setCurrentIndex( 0 );
d->m_navigationWidget = d->uiWidget.toolBox->currentWidget();
......
......@@ -325,31 +325,31 @@ void MarbleModel::paintGlobe( ClipPainter* painter,
// Paint the grid around the earth.
if ( viewParams->m_showGrid ) {
QPen gridpen( QColor( 255, 255, 255, 128 ) );
QPen gridpen( QColor( 231, 231, 231, 255 ) );
// Create and paint a grid
d->m_gridmap->createGrid( viewParams->m_radius,
viewParams->m_planetAxis,
viewParams->m_projection );
d->m_gridmap->setPen( gridpen );
d->m_gridmap->paintGridMap( painter, true );
d->m_gridmap->paintGridMap( painter, false );
// Create and paint the tropics and polar circles
d->m_gridmap->createTropics( viewParams->m_radius,
viewParams->m_planetAxis,
viewParams->m_projection );
gridpen.setStyle( Qt::DotLine );
gridpen.setWidthF( 1.5f );
// gridpen.setWidthF( 1.5f );
d->m_gridmap->setPen( gridpen );
d->m_gridmap->paintGridMap( painter, true );
d->m_gridmap->paintGridMap( painter, false );
// Create Equator
d->m_gridmap->createEquator( viewParams->m_radius,
viewParams->m_planetAxis,
viewParams->m_projection );
gridpen.setWidthF( 2.0f );
// gridpen.setWidthF( 2.0f );
d->m_gridmap->setPen( gridpen );
d->m_gridmap->paintGridMap( painter, true );
d->m_gridmap->paintGridMap( painter, false );
}
// Paint the GeoDataPlaceMark layer
......
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