[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/marble/src
From: Torsten Rahn <tackat () kde ! org>
Date: 2009-07-30 16:33:29
Message-ID: 1248971609.668257.26841.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1004630 by rahn:
This patch fixes the ambiguity of the MapQuality enum values:
http://qt.gitorious.org/qt/pages/ApiDesignPrinciples#Naming+Enum+Types+and+Values
"When declaring enums, we must keep in mind that in C++, the enum values are used without the type."
M +1 -1 MarbleTest.cpp
M +1 -1 lib/AbstractScanlineTextureMapper.cpp
M +4 -4 lib/EquirectScanlineTextureMapper.cpp
M +2 -2 lib/GeoPainter.cpp
M +1 -1 lib/GeoPainter.h
M +5 -4 lib/MarbleMap.cpp
M +2 -1 lib/MarbleWidget.cpp
M +4 -4 lib/MercatorScanlineTextureMapper.cpp
M +4 -2 lib/QtMarbleConfigDialog.cpp
M +4 -4 lib/SphericalScanlineTextureMapper.cpp
M +11 -11 lib/VectorComposer.cpp
M +1 -1 lib/ViewParams.cpp
M +6 -6 lib/global.h
M +1 -1 lib/graphicsview/MarbleGraphicsItem.cpp
M +12 -12 marble.kcfg
M +1 -1 plasmoid/worldclock.cpp
M +2 -1 plugins/render/geodata/GeoRendererView.cpp
M +3 -3 plugins/render/graticule/GraticulePlugin.cpp
--- trunk/KDE/kdeedu/marble/src/MarbleTest.cpp #1004629:1004630
@@ -32,7 +32,7 @@
{
m_marbleWidget->zoomView( 1500 );
m_marbleWidget->setMapThemeId( "earth/srtm/srtm.dgml" );
- m_marbleWidget->setMapQuality( Marble::Normal );
+ m_marbleWidget->setMapQuality( Marble::NormalQuality );
// m_marbleWidget->resize( 800, 600 );
m_marbleWidget->centerOn( 9.4, 54.8 );
--- trunk/KDE/kdeedu/marble/src/lib/AbstractScanlineTextureMapper.cpp #1004629:1004630
@@ -407,7 +407,7 @@
int AbstractScanlineTextureMapper::interpolationStep( ViewParams *viewParams ) const
{
- if ( viewParams->mapQuality() == Marble::Print ) {
+ if ( viewParams->mapQuality() == Marble::PrintQuality ) {
return 1; // Don't interpolate for print quality.
}
--- trunk/KDE/kdeedu/marble/src/lib/EquirectScanlineTextureMapper.cpp #1004629:1004630
@@ -43,9 +43,9 @@
QImage *canvasImage = viewParams->canvasImage();
const qint64 radius = viewParams->radius();
- const bool highQuality = ( viewParams->mapQuality() == Marble::High
- || viewParams->mapQuality() == Marble::Print );
- const bool printQuality = ( viewParams->mapQuality() == Marble::Print );
+ const bool highQuality = ( viewParams->mapQuality() == Marble::HighQuality
+ || viewParams->mapQuality() == Marble::PrintQuality );
+ const bool printQuality = ( viewParams->mapQuality() == Marble::PrintQuality );
// Scanline based algorithm to do texture mapping
@@ -69,7 +69,7 @@
const int n = interpolationStep( viewParams );
bool interlaced = ( m_interlaced
- || viewParams->mapQuality() == Marble::Low );
+ || viewParams->mapQuality() == Marble::LowQuality );
// Calculate translation of center point
qreal centerLon, centerLat;
--- trunk/KDE/kdeedu/marble/src/lib/GeoPainter.cpp #1004629:1004630
@@ -170,8 +170,8 @@
{
bool antialiased = false;
- if ( d->m_mapQuality == Marble::High
- || d->m_mapQuality == Marble::Print ) {
+ if ( d->m_mapQuality == Marble::HighQuality
+ || d->m_mapQuality == Marble::PrintQuality ) {
antialiased = true;
}
--- trunk/KDE/kdeedu/marble/src/lib/GeoPainter.h #1004629:1004630
@@ -110,7 +110,7 @@
*/
GeoPainter( QPaintDevice * paintDevice,
ViewportParams *viewportParams,
- MapQuality mapQuality = Normal,
+ MapQuality mapQuality = NormalQuality,
bool clip = true );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #1004629:1004630
@@ -285,7 +285,7 @@
// PrintQuality. Either cache on a pixmap - or maybe
// better: Add to GlobeScanlineTextureMapper.
- if ( m_viewParams.mapQuality() == Marble::Print )
+ if ( m_viewParams.mapQuality() == Marble::PrintQuality )
drawFog( painter );
}
@@ -302,8 +302,8 @@
bool antialiased = false;
- if ( m_viewParams.mapQuality() == Marble::High
- || m_viewParams.mapQuality() == Marble::Print ) {
+ if ( m_viewParams.mapQuality() == Marble::HighQuality
+ || m_viewParams.mapQuality() == Marble::PrintQuality ) {
antialiased = true;
}
@@ -583,7 +583,8 @@
QPixmap screenshotPixmap( size() );
screenshotPixmap.fill( Qt::transparent );
- GeoPainter painter( &screenshotPixmap, viewParams()->viewport(), Marble::Print );
+ GeoPainter painter( &screenshotPixmap, viewParams()->viewport(),
+ Marble::PrintQuality );
painter.begin( &screenshotPixmap );
QRect dirtyRect( QPoint(), size() );
paint( painter, dirtyRect );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1004629:1004630
@@ -73,7 +73,8 @@
m_map( map ),
m_model( map->model() ),
m_viewContext( Marble::Still ),
- m_stillQuality( Marble::High ), m_animationQuality( Marble::Low ),
+ m_stillQuality( Marble::HighQuality ),
+ m_animationQuality( Marble::LowQuality ),
m_animationsEnabled( false ),
m_inputhandler( 0 ),
m_physics( new MarblePhysics( parent ) ),
--- trunk/KDE/kdeedu/marble/src/lib/MercatorScanlineTextureMapper.cpp #1004629:1004630
@@ -45,9 +45,9 @@
QImage *canvasImage = viewParams->canvasImage();
const qint64 radius = viewParams->radius();
- const bool highQuality = ( viewParams->mapQuality() == Marble::High
- || viewParams->mapQuality() == Marble::Print );
- const bool printQuality = ( viewParams->mapQuality() == Marble::Print );
+ const bool highQuality = ( viewParams->mapQuality() == Marble::HighQuality
+ || viewParams->mapQuality() == Marble::PrintQuality );
+ const bool printQuality = ( viewParams->mapQuality() == Marble::PrintQuality );
// Scanline based algorithm to do texture mapping
@@ -71,7 +71,7 @@
const int n = interpolationStep( viewParams );
bool interlaced = ( m_interlaced
- || viewParams->mapQuality() == Marble::Low );
+ || viewParams->mapQuality() == Marble::LowQuality );
// Calculate translation of center point
qreal centerLon, centerLat;
--- trunk/KDE/kdeedu/marble/src/lib/QtMarbleConfigDialog.cpp #1004629:1004630
@@ -449,12 +449,14 @@
Marble::MapQuality QtMarbleConfigDialog::stillQuality() const
{
- return (Marble::MapQuality) d->m_settings->value( "View/stillQuality", Marble::High ).toInt();
+ return (Marble::MapQuality) d->m_settings->value( "View/stillQuality",
+ Marble::HighQuality ).toInt();
}
Marble::MapQuality QtMarbleConfigDialog::animationQuality() const
{
- return (Marble::MapQuality) d->m_settings->value( "View/animationQuality", Marble::Low ).toInt();
+ return (Marble::MapQuality) d->m_settings->value( "View/animationQuality",
+ Marble::LowQuality ).toInt();
}
int QtMarbleConfigDialog::labelLocalization() const
--- trunk/KDE/kdeedu/marble/src/lib/SphericalScanlineTextureMapper.cpp #1004629:1004630
@@ -40,9 +40,9 @@
QImage *canvasImage = viewParams->canvasImage();
const qint64 radius = viewParams->radius();
- const bool highQuality = ( viewParams->mapQuality() == Marble::High
- || viewParams->mapQuality() == Marble::Print );
- const bool printQuality = ( viewParams->mapQuality() == Marble::Print );
+ const bool highQuality = ( viewParams->mapQuality() == Marble::HighQuality
+ || viewParams->mapQuality() == Marble::PrintQuality );
+ const bool printQuality = ( viewParams->mapQuality() == Marble::PrintQuality );
// Scanline based algorithm to texture map a sphere
@@ -74,7 +74,7 @@
viewParams->planetAxis().toMatrix( planetAxisMatrix );
bool interlaced = ( m_interlaced
- || viewParams->mapQuality() == Marble::Low );
+ || viewParams->mapQuality() == Marble::LowQuality );
int skip = interlaced ? 1 : 0;
--- trunk/KDE/kdeedu/marble/src/lib/VectorComposer.cpp #1004629:1004630
@@ -106,8 +106,8 @@
bool antialiased = false;
- if ( viewParams->mapQuality() == Marble::High
- || viewParams->mapQuality() == Marble::Print )
+ if ( viewParams->mapQuality() == Marble::HighQuality
+ || viewParams->mapQuality() == Marble::PrintQuality )
{
antialiased = true;
}
@@ -180,8 +180,8 @@
bool antialiased = false;
- if ( viewParams->mapQuality() == Marble::High
- || viewParams->mapQuality() == Marble::Print )
+ if ( viewParams->mapQuality() == Marble::HighQuality
+ || viewParams->mapQuality() == Marble::PrintQuality )
{
antialiased = true;
}
@@ -258,8 +258,8 @@
bool antialiased = false;
- if ( viewParams->mapQuality() == Marble::High
- || viewParams->mapQuality() == Marble::Print )
+ if ( viewParams->mapQuality() == Marble::HighQuality
+ || viewParams->mapQuality() == Marble::PrintQuality )
{
antialiased = true;
}
@@ -339,8 +339,8 @@
QPen borderDashPen( Qt::black );
m_vectorMap->setBrush( m_countryBrush );
- if ( viewParams->mapQuality() == Marble::High
- || viewParams->mapQuality() == Marble::Print ) {
+ if ( viewParams->mapQuality() == Marble::HighQuality
+ || viewParams->mapQuality() == Marble::PrintQuality ) {
countryPen.setColor( penColor );
m_vectorMap->setPen( countryPen );
@@ -356,7 +356,7 @@
m_vectorMap->paintMap( painter, antialiased );
}
}
- if ( viewParams->mapQuality() == Marble::Normal ) {
+ if ( viewParams->mapQuality() == Marble::NormalQuality ) {
// Only paint fancy style if the coast line doesn't get painted as well
// (as it looks a bit awkward otherwise)
@@ -374,8 +374,8 @@
m_vectorMap->paintMap( painter, antialiased );
}
}
- if ( viewParams->mapQuality() == Marble::Outline
- || viewParams->mapQuality() == Marble::Low ) {
+ if ( viewParams->mapQuality() == Marble::OutlineQuality
+ || viewParams->mapQuality() == Marble::LowQuality ) {
if ( !showCoastlines ) {
countryPen.setWidthF( 1.0 );
--- trunk/KDE/kdeedu/marble/src/lib/ViewParams.cpp #1004629:1004630
@@ -62,7 +62,7 @@
ViewParamsPrivate::ViewParamsPrivate()
: m_mapTheme( 0 ),
m_viewport(),
- m_mapQuality( Normal ),
+ m_mapQuality( NormalQuality ),
m_planetAxisUpdated(),
m_radiusUpdated( 0 ),
// Show / don't show parameters
--- trunk/KDE/kdeedu/marble/src/lib/global.h #1004629:1004630
@@ -5,7 +5,7 @@
// find a copy of this license in LICENSE.txt in the top directory of
// the source code.
//
-// Copyright 2007 Torsten Rahn <tackat@kde.org>"
+// Copyright 2007-2009 Torsten Rahn <tackat@kde.org>"
// Copyright 2007 Inge Wallin <ingwa@kde.org>"
//
@@ -93,11 +93,11 @@
* @brief This enum is used to choose the map quality shown in the view.
*/
enum MapQuality {
- Outline, ///< Only a wire representation is drawn
- Low, ///< Low resolution (e.g. interlaced)
- Normal, ///< Normal quality
- High, ///< High quality (e.g. antialiasing for lines)
- Print ///< Print quality
+ OutlineQuality, ///< Only a wire representation is drawn
+ LowQuality, ///< Low resolution (e.g. interlaced)
+ NormalQuality, ///< Normal quality
+ HighQuality, ///< High quality (e.g. antialiasing for lines)
+ PrintQuality ///< Print quality
};
/**
--- trunk/KDE/kdeedu/marble/src/lib/graphicsview/MarbleGraphicsItem.cpp #1004629:1004630
@@ -80,7 +80,7 @@
}
cachePixmap.fill( Qt::transparent );
- GeoPainter pixmapPainter( &( cachePixmap ), viewport, Normal );
+ GeoPainter pixmapPainter( &( cachePixmap ), viewport, NormalQuality );
// We paint in best quality here, as we only have to paint once.
pixmapPainter.setRenderHint( QPainter::Antialiasing, true );
// The cache image will get a 0.5 pixel bounding to save antialiasing effects.
--- trunk/KDE/kdeedu/marble/src/marble.kcfg #1004629:1004630
@@ -71,24 +71,24 @@
<entry key="stillQuality" type="Enum" >
<label>The quality at which a still map gets painted.</label>
<choices name="Marble::MapQuality">
- <choice name="MapQuality::Outline"/>
- <choice name="MapQuality::Low"/>
- <choice name="MapQuality::Normal"/>
- <choice name="MapQuality::High"/>
- <choice name="MapQuality::Print"/>
+ <choice name="MapQuality::OutlineQuality"/>
+ <choice name="MapQuality::LowQuality"/>
+ <choice name="MapQuality::NormalQuality"/>
+ <choice name="MapQuality::HighQuality"/>
+ <choice name="MapQuality::PrintQuality"/>
</choices>
- <default>Marble::High</default>
+ <default>Marble::HighQuality</default>
</entry>
<entry key="animationQuality" type="Enum" >
<label>The quality at which an animated map gets painted.</label>
<choices name="Marble::MapQuality">
- <choice name="MapQuality::Outline"/>
- <choice name="MapQuality::Low"/>
- <choice name="MapQuality::Normal"/>
- <choice name="MapQuality::High"/>
- <choice name="MapQuality::Print"/>
+ <choice name="MapQuality::OutlineQuality"/>
+ <choice name="MapQuality::LowQuality"/>
+ <choice name="MapQuality::NormalQuality"/>
+ <choice name="MapQuality::HighQuality"/>
+ <choice name="MapQuality::PrintQuality"/>
</choices>
- <default>Marble::Low</default>
+ <default>Marble::LowQuality</default>
</entry>
<entry key="graphicsSystem" type="Enum" >
<label>The graphics system that is used by Qt to render the graphics.</label>
--- trunk/KDE/kdeedu/marble/src/plasmoid/worldclock.cpp #1004629:1004630
@@ -344,7 +344,7 @@
QPixmap pixmap( m_map->width(), m_map->height() );
pixmap.fill( Qt::transparent );
GeoPainter gp( &pixmap, m_map->viewParams()->viewport(),
- Marble::Normal, true );
+ Marble::NormalQuality, true );
QRect mapRect( 0, 0, m_map->width(), m_map->height() );
m_map->paint(gp, mapRect );
p->drawPixmap( m_t, pixmap );
--- trunk/KDE/kdeedu/marble/src/plugins/render/geodata/GeoRendererView.cpp #1004629:1004630
@@ -186,7 +186,8 @@
m_currentPen.setWidthF( m_root->style( mapped ).lineStyle().width() );
}
- if ( m_painter->mapQuality() != Marble::High && m_painter->mapQuality() != Marble::Print )
+ if ( m_painter->mapQuality() != Marble::HighQuality
+ && m_painter->mapQuality() != Marble::PrintQuality )
{
// m_currentPen.setWidth( 0 );
QColor penColor = m_currentPen.color();
--- trunk/KDE/kdeedu/marble/src/plugins/render/graticule/GraticulePlugin.cpp #1004629:1004630
@@ -143,13 +143,13 @@
Marble::LineStart | Marble::IgnoreYMargin );
// Render some non-cut off longitude lines ..
- renderLongitudeLine( painter, 90.0, viewLatLonAltBox );
+ renderLongitudeLine( painter, +90.0, viewLatLonAltBox );
renderLongitudeLine( painter, -90.0, viewLatLonAltBox );
// Render the bold grid
- if ( painter->mapQuality() == Marble::High
- || painter->mapQuality() == Marble::Print ) {
+ if ( painter->mapQuality() == Marble::HighQuality
+ || painter->mapQuality() == Marble::PrintQuality ) {
QPen boldPen = minorCirclePen;
boldPen.setWidthF( 1.5 );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic