[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-04-25 15:37:42
Message-ID: 1177515462.803335.20195.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 657964 by ingwa:

Lots of small cleaning

 M  +5 -0      ChangeLog  
 M  +6 -3      src/DESIGN  
 M  +12 -10    src/GridMap.cpp  
 M  +6 -3      src/katlasglobe.cpp  
 M  +0 -1      src/vectorcomposer.cpp  


--- trunk/playground/base/marble/ChangeLog #657963:657964
@@ -1,4 +1,9 @@
+25.04.07 - ingwa
+	Lots of small cleaning
+	Cleaned placemarkmodel.{h,cpp}
+
 23.04.07 - ingwa
+	Fixed typo in MANIFESTO.txt
 	Cleaned placemarkpainter.{h,cpp}
 	Cleaned placemarkmanager.{h,cpp}
 	
--- trunk/playground/base/marble/src/DESIGN #657963:657964
@@ -137,6 +137,7 @@
 KAtlasGlobe	The main model.  Contains (among others):
 		 - MapTheme
 		 - GridMap
+                 - VectorComposer
 		 - PlaceMarkManager
 		 - PlaceMarkModel
 
@@ -173,7 +174,6 @@
 class KAtlasWindRose : public QObject {
 class KAtlasXmlHandler : public QXmlDefaultHandler {
 class MapTheme : public QObject
-class MeasureTool : public QObject {
 class MeasureTool;
 class PlaceFolder : public QVector<PlaceMark*> {
 class PlaceMarkInfoDialog: public Ui_PlaceMarkInfoDialog {};
@@ -183,7 +183,6 @@
 class QAbstractItemModel;
 class QMenu;
 class QStandardItemModel;
-class QuaternionSSE : public Quaternion {
 class SearchComboBox : public QComboBox {
 class SearchListView : public QListView {
 class TextureColorizer;
@@ -192,6 +191,10 @@
 class TextureTile;
 class TileScissor : public QObject {
 class TinyWebBrowser : public QTextBrowser {
-class VectorComposer {
 class katlasAboutDialog: public Ui_katlasAboutDialog {};
 class katlasToolBox: public Ui_katlasToolBox {};
+
+Never mind
+----------
+
+class QuaternionSSE
--- trunk/playground/base/marble/src/GridMap.cpp #657963:657964
@@ -125,8 +125,8 @@
 
     for ( int i = 1; i < lngNum; ++i ) {
         float cutOff = PIHALF / (float)(latNum);
-        createCircle( + (float)(i) * PIHALF / (float)(lngNum), Longitude, cutOff );
-        createCircle( + (float)(i) * PIHALF / (float)(lngNum) + PIHALF, Longitude, cutOff );	
+        createCircle( i * PIHALF / lngNum,          Longitude, cutOff );
+        createCircle( i * PIHALF / lngNum + PIHALF, Longitude, cutOff );	
     }
 }
 
@@ -197,10 +197,9 @@
                     break;
             }
 
-            //	Take care of screencrossing crossings if horizon is
-            //	visible Filter Points which aren't on the visible
-            //	hemisphere
-            if ( m_currentlyVisible == true && m_currentPoint != m_lastPoint ) {
+            // Take care of screencrossing crossings if horizon is visible.
+            // Filter points which aren't on the visible hemisphere.
+            if ( m_currentlyVisible && m_currentPoint != m_lastPoint ) {
                 // most recent addition: m_currentPoint != m_lastPoint
                 //			qDebug("accepted");
                 m_polygon << m_currentPoint;
@@ -246,7 +245,8 @@
     m_lastVisible = m_currentlyVisible;
 
     // Initially m_lastPoint MUST NOT equal m_currentPoint
-    m_lastPoint = QPointF( m_currentPoint.x() + 1.0f, m_currentPoint.y() + 1.0f );
+    m_lastPoint = QPointF( m_currentPoint.x() + 1.0f, 
+                           m_currentPoint.y() + 1.0f );
 }
 
 
@@ -263,10 +263,11 @@
     if ( radicant > 0 )
         ya = sqrt( radicant );
 
-    if ( (m_currentPoint.y() - (m_imageHalfHeight + 1)) < 0 )
+    if ( ( m_currentPoint.y() - ( m_imageHalfHeight + 1 ) ) < 0 )
         ya = -ya; 
 
-    return QPointF((float)m_imageHalfWidth + xa + 1, (float)m_imageHalfHeight + ya + 1); 
+    return QPointF( (float)m_imageHalfWidth  + xa + 1,
+                    (float)m_imageHalfHeight + ya + 1 );
 }
 
 
@@ -275,5 +276,6 @@
 {
     m_imageHalfWidth  = imageCanvas -> width() / 2;
     m_imageHalfHeight = imageCanvas -> height() / 2;
-    m_imageRadius     = m_imageHalfWidth * m_imageHalfWidth + m_imageHalfHeight * m_imageHalfHeight;
+    m_imageRadius     = ( m_imageHalfWidth * m_imageHalfWidth
+                          + m_imageHalfHeight * m_imageHalfHeight );
 }
--- trunk/playground/base/marble/src/katlasglobe.cpp #657963:657964
@@ -88,6 +88,9 @@
         TileScissor tilecreator( m_maptheme->prefix(),
                                  m_maptheme->installMap(), 
                                  m_maptheme->bitmaplayer().dem);
+
+        // This timer is necessary, because if we remove it, the GUI
+        // never gets shown before the work starts.
         QTimer::singleShot( 0, &tilecreator, SLOT( createTiles() ) );
 #if 1
         connect( &tilecreator,    SIGNAL( progress( int ) ),
@@ -175,18 +178,18 @@
     }
 
     // Paint Map on Widget
-    painter->drawImage(dirty, *m_canvasimg, dirty); 
+    painter->drawImage( dirty, *m_canvasimg, dirty ); 
 
     if ( m_maptheme->vectorlayer().enabled == true ) {
 
         // Add further Vectors
-        veccomposer->paintVectorMap(painter, m_radius, m_pPlanetAxis);
+        veccomposer->paintVectorMap( painter, m_radius, m_pPlanetAxis );
     }
 
     // if ( m_maptheme->vectorlayer().enabled == true ){
     QPen  gridpen( QColor( 255, 255, 255, 128 ) );
 
-    gridmap->createGrid(m_radius,m_pPlanetAxis);
+    gridmap->createGrid( m_radius, m_pPlanetAxis );
 
     gridmap->setPen( gridpen );
     gridmap->paintGridMap( painter, true );
--- trunk/playground/base/marble/src/vectorcomposer.cpp #657963:657964
@@ -55,7 +55,6 @@
 void VectorComposer::drawTextureMap(QPaintDevice *origimg, const int& radius, 
                                     Quaternion& rotAxis)
 {
-
     //	vectormap -> clearNodeCount();
 
     // Coastlines
[prev in list] [next in list] [prev in thread] [next in thread]