[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/base/marble
From: Inge Wallin <inge () lysator ! liu ! se>
Date: 2007-05-06 20:23:01
Message-ID: 1178482981.755325.4305.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 661856 by ingwa:
Clean KAtlasView:
- m_ prefix for all members
- getFoo() --> foo()
M +1 -1 ChangeLog
M +1 -1 src/katlasglobe.cpp
M +22 -21 src/katlasview.cpp
M +13 -10 src/katlasview.h
M +4 -4 src/katlasviewinputhandler.cpp
M +2 -2 src/katlasviewpopupmenu.cpp
--- trunk/playground/base/marble/ChangeLog #661855:661856
@@ -1,5 +1,5 @@
06.05.07 - ingwa
- Cleaning: Make KAtlasGlobe use m_ for all members.
+ Cleaning: Make KAtlasGlobe use m_ for all members.
05.05.07 - tackat
Added the KDE interface
--- trunk/playground/base/marble/src/katlasglobe.cpp #661855:661856
@@ -232,7 +232,7 @@
int imgrx = ( m_canvasimg->width() ) >> 1;
int imgry = ( m_canvasimg->height() ) >> 1;
- if ( radius*radius < imgrx * imgrx + imgry * imgry
+ if ( radius * radius < imgrx * imgrx + imgry * imgry
&& radius != m_radius )
{
m_canvasimg->fill( Qt::transparent );
--- trunk/playground/base/marble/src/katlasview.cpp #661855:661856
@@ -51,15 +51,15 @@
QImage::Format_ARGB32_Premultiplied );
m_pGlobe->setCanvasImage( m_pCanvasImage );
- inputhandler = new KAtlasViewInputHandler( this, m_pGlobe );
- installEventFilter( inputhandler );
+ m_inputhandler = new KAtlasViewInputHandler( this, m_pGlobe );
+ installEventFilter( m_inputhandler );
setMouseTracking( true );
m_popupmenu = new KAtlasViewPopupMenu( this, m_pGlobe );
- connect( inputhandler, SIGNAL( lmbRequest( int, int ) ),
- m_popupmenu, SLOT( showLmbMenu( int, int ) ) );
- connect( inputhandler, SIGNAL( rmbRequest( int, int ) ),
- m_popupmenu, SLOT( showRmbMenu( int, int ) ) );
+ connect( m_inputhandler, SIGNAL( lmbRequest( int, int ) ),
+ m_popupmenu, SLOT( showLmbMenu( int, int ) ) );
+ connect( m_inputhandler, SIGNAL( rmbRequest( int, int ) ),
+ m_popupmenu, SLOT( showRmbMenu( int, int ) ) );
m_pMeasureTool = new MeasureTool( this );
@@ -71,7 +71,7 @@
m_logzoom = 0;
m_zoomStep = 40;
goHome();
- minimumzoom = 50;
+ m_minimumzoom = 50;
}
@@ -104,7 +104,7 @@
int zoom = m_pGlobe->radius();
int tryZoom = toLogScale(zoom) + zoomstep;
// qDebug() << QString::number(tryZoom) << " " << QString::number(minimumzoom);
- if ( tryZoom >= minimumzoom ) {
+ if ( tryZoom >= m_minimumzoom ) {
zoom = tryZoom;
zoomView(zoom);
}
@@ -166,23 +166,23 @@
void KAtlasView::moveLeft()
{
- rotateBy( 0, getMoveStep() );
+ rotateBy( 0, moveStep() );
}
void KAtlasView::moveRight()
{
- rotateBy( 0, -getMoveStep() );
+ rotateBy( 0, -moveStep() );
}
void KAtlasView::moveUp()
{
- rotateBy( getMoveStep(), 0 );
+ rotateBy( moveStep(), 0 );
}
void KAtlasView::moveDown()
{
- rotateBy( -getMoveStep(), 0 );
+ rotateBy( -moveStep(), 0 );
}
void KAtlasView::resizeEvent (QResizeEvent*)
@@ -201,7 +201,7 @@
}
-bool KAtlasView::getGlobeSphericals(int x, int y, float& alpha, float& beta)
+bool KAtlasView::globeSphericals(int x, int y, float& alpha, float& beta)
{
int radius = m_pGlobe->radius();
@@ -234,18 +234,18 @@
{
int zoom = m_pGlobe->radius();
- activeRegion = QRegion( 25, 25, width() - 50, height() - 50,
- QRegion::Rectangle );
+ m_activeRegion = QRegion( 25, 25, width() - 50, height() - 50,
+ QRegion::Rectangle );
if ( zoom < sqrt( width() * width() + height() * height() ) / 2 ) {
- activeRegion &= QRegion( width() / 2 - zoom, height() / 2 - zoom,
- 2 * zoom, 2 * zoom, QRegion::Ellipse );
+ m_activeRegion &= QRegion( width() / 2 - zoom, height() / 2 - zoom,
+ 2 * zoom, 2 * zoom, QRegion::Ellipse );
}
}
-const QRegion KAtlasView::getActiveRegion()
+const QRegion KAtlasView::activeRegion()
{
- return activeRegion;
+ return m_activeRegion;
}
@@ -340,12 +340,13 @@
}
-float KAtlasView::getMoveStep()
+float KAtlasView::moveStep()
{
if ( m_pGlobe->radius() < sqrt( width() * width() + height() * height() ) )
return 0.1f;
else
- return atanf((float)width() / (float)(2 * m_pGlobe->radius())) * 0.2f;
+ return atanf( (float)width()
+ / (float)( 2 * m_pGlobe->radius() ) ) * 0.2f;
}
int KAtlasView::fromLogScale(int zoom)
--- trunk/playground/base/marble/src/katlasview.h #661855:661856
@@ -1,6 +1,7 @@
#ifndef KATLASVIEW_H
#define KATLASVIEW_H
+
#include <QtGui/QWidget>
#include <QtGui/QImage>
@@ -29,15 +30,17 @@
// The model this view shows.
KAtlasGlobe* globe() const { return m_pGlobe; }
- const QRegion getActiveRegion();
+ const QRegion activeRegion();
- bool getGlobeSphericals( int x, int y,
- float& alpha, float& beta );
- QAbstractListModel *placeMarkModel(){ return m_pGlobe->getPlaceMarkModel(); };
+ bool globeSphericals( int x, int y,
+ float& alpha, float& beta );
+ QAbstractListModel *placeMarkModel(){
+ return m_pGlobe->getPlaceMarkModel();
+ }
- float getMoveStep();
+ float moveStep();
- void setMinimumZoom( int zoom ){ minimumzoom = zoom; }
+ void setMinimumZoom( int zoom ){ m_minimumzoom = zoom; }
void addPlaceMarkFile( QString filename ){ m_pGlobe->addPlaceMarkFile( filename \
); }
@@ -89,13 +92,13 @@
int m_logzoom;
int m_zoomStep;
- int minimumzoom;
+ int m_minimumzoom;
- KAtlasViewInputHandler *inputhandler;
+ KAtlasViewInputHandler *m_inputhandler;
KAtlasViewPopupMenu *m_popupmenu;
- TextureColorizer *sealegend;
+ TextureColorizer *m_sealegend;
QImage *m_pCanvasImage;
// Parts of the image
@@ -106,7 +109,7 @@
// Tools
MeasureTool *m_pMeasureTool;
- QRegion activeRegion;
+ QRegion m_activeRegion;
QPixmap m_cachedPixmap;
--- trunk/playground/base/marble/src/katlasviewinputhandler.cpp #661855:661856
@@ -72,7 +72,7 @@
}
if ((dirx != 0) || (diry != 0)) {
- m_globe->rotateBy(-(m_gpview->getMoveStep())*(float)(diry), \
-(m_gpview->getMoveStep())*(float)(dirx)); \
+ m_globe->rotateBy(-(m_gpview->moveStep())*(float)(diry), \
-(m_gpview->moveStep())*(float)(dirx)); m_gpview->repaint();
}
return TRUE;
@@ -81,7 +81,7 @@
else if (( e->type() == QEvent::MouseMove )||( e->type() == \
QEvent::MouseButtonPress )||( e->type() == QEvent::MouseButtonRelease)){
QMouseEvent* event = static_cast<QMouseEvent*>(e);
- QRegion activeRegion = m_gpview->getActiveRegion();
+ QRegion activeRegion = m_gpview->activeRegion();
dirx = 0; diry = 0;
@@ -109,7 +109,7 @@
// m_leftpresseda: screen center latitude during mouse press
// m_leftpressedb: screen center longitude during mouse press
- m_gpview->getGlobeSphericals(m_gpview->width() / 2, m_gpview->height() / 2, \
m_leftpresseda, m_leftpressedb); + m_gpview->globeSphericals(m_gpview->width() / \
2, m_gpview->height() / 2, m_leftpresseda, m_leftpressedb);
if (m_globe->northPoleY() > 0){
m_leftpressedb = pi - m_leftpressedb;
@@ -197,7 +197,7 @@
if ((event->button() == Qt::LeftButton) && ( e->type() == \
QEvent::MouseButtonPress )){
- m_globe->rotateBy(-(m_gpview->getMoveStep())*(float)(diry), \
-(m_gpview->getMoveStep())*(float)(dirx)); \
+ m_globe->rotateBy(-(m_gpview->moveStep())*(float)(diry), \
-(m_gpview->moveStep())*(float)(dirx)); m_gpview->repaint();
}
}
--- trunk/playground/base/marble/src/katlasviewpopupmenu.cpp #661855:661856
@@ -74,7 +74,7 @@
float lat,lng;
- m_gpview->getGlobeSphericals(xpos, ypos, lng, lat);
+ m_gpview->globeSphericals(xpos, ypos, lng, lat);
// Any idea what this could do on activation?
m_posaction->setEnabled( false );
@@ -110,7 +110,7 @@
float lng, lat;
- m_gpview->getGlobeSphericals( p.x(), p.y(), lng, lat);
+ m_gpview->globeSphericals( p.x(), p.y(), lng, lat);
emit addMeasurePoint( lng, lat );
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic