Merge remote-tracking branch 'qgis/master' into grass

Author: Andrew McAninch

doc/CMakeLists.txt

@@ -23,7 +23,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
   )
 ENDIF(TXT2TAGS_EXECUTABLE)
 
-SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html contributors.json favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)
+SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html whatsnew.html contributors.json favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)
 
 INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
 INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/doc/images)

python/core/qgsconditionalstyle.sip

@@ -24,6 +24,7 @@ class QgsConditionalLayerStyles
 
     /**
      * @brief Set the conditional styles for the field UI properties.
+     * @param fieldName name of field
      * @param styles
      */
     void setFieldStyles( QString fieldName, QList<QgsConditionalStyle> styles );
@@ -36,11 +37,11 @@ class QgsConditionalLayerStyles
 
     /** Reads field ui properties specific state from Dom node.
      */
-    virtual bool readXml( const QDomNode& node );
+    bool readXml( const QDomNode& node );
 
     /** Write field ui properties specific state from Dom node.
      */
-    virtual bool writeXml( QDomNode & node, QDomDocument & doc ) const;
+    bool writeXml( QDomNode & node, QDomDocument & doc ) const;
 };
 
 /** \class QgsConditionalStyle

python/core/qgsvectorlayer.sip

@@ -1245,7 +1245,7 @@ class QgsVectorLayer : QgsMapLayer
     /**
      * @brief Return the conditional styles that are set for this layer. Style information is
      * used to render conditional formatting in the attribute table.
-     * @return Return a \class QgsConditionalLayerStyles object holding the conditional attribute
+     * @return Return a QgsConditionalLayerStyles object holding the conditional attribute
      * style information. Style information is generic and can be used for anything.
      * @note added in QGIS 2.12
      */

src/analysis/raster/qgsrastercalculator.cpp

@@ -90,12 +90,12 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
     // if crs transform needed
     if ( it->raster->crs() != mOutputCrs )
     {
-      QgsRasterProjector* proj = new QgsRasterProjector();
-      proj->setCRS( it->raster->crs(), mOutputCrs );
-      proj->setInput( it->raster->dataProvider()->clone() );
-      proj->setPrecision( QgsRasterProjector::Exact );
+      QgsRasterProjector proj;
+      proj.setCRS( it->raster->crs(), mOutputCrs );
+      proj.setInput( it->raster->dataProvider() );
+      proj.setPrecision( QgsRasterProjector::Exact );
 
-      block = proj->block( it->bandNumber, mOutputRectangle, mNumOutputColumns, mNumOutputRows );
+      block = proj.block( it->bandNumber, mOutputRectangle, mNumOutputColumns, mNumOutputRows );
     }
     else
     {
@@ -155,10 +155,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
         qWarning( "RasterIO error!" );
       }
 
-      if ( resultIsNumber )
-      {
-        delete[] calcData;
-      }
+      delete[] calcData;
     }
 
   }

src/app/qgisapp.cpp

@@ -582,7 +582,16 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   int myBlue = settings.value( "/qgis/default_canvas_color_blue", 255 ).toInt();
   mMapCanvas->setCanvasColor( QColor( myRed, myGreen, myBlue ) );
 
-  centralLayout->addWidget( mMapCanvas, 0, 0, 2, 1 );
+  mWelcomePage = new QgsWelcomePage;
+
+  mCentralContainer = new QStackedWidget;
+  mCentralContainer->insertWidget( 0, mMapCanvas );
+  mCentralContainer->insertWidget( 1, mWelcomePage );
+
+  qobject_cast<QGridLayout *>( centralWidget->layout() )->addWidget( mCentralContainer, 0, 0, 2, 1 );
+
+  mCentralContainer->setCurrentIndex( 1 );
+
 
   // a bar to warn the user with non-blocking messages
   mInfoBar = new QgsMessageBar( centralWidget );
@@ -1143,14 +1152,12 @@ void QgisApp::readSettings()
     data.path = project;
     data.title = project;
 
-    mRecentProjects.prepend( data );
+    mRecentProjects.append( data );
   }
 
   settings.beginGroup( "/UI/recentProjects" );
   QStringList projectKeys = settings.childGroups();
 
-
-
   Q_FOREACH ( const QString& key, projectKeys )
   {
     QgsWelcomePageItemsModel::RecentProjectData data;
@@ -1159,7 +1166,7 @@ void QgisApp::readSettings()
     data.path = settings.value( "path" ).toString();
     data.previewImagePath = settings.value( "previewImage" ).toString();
     settings.endGroup();
-    mRecentProjects.prepend( data );
+    mRecentProjects.append( data );
   }
   settings.endGroup();
 
@@ -3913,19 +3920,8 @@ void QgisApp::fileOpenAfterLaunch()
   QString projPath = QString();
   if ( projOpen == 0 ) // welcome page
   {
-    mWelcomePage = new QgsWelcomePage;
-
-    mCentralContainer = new QStackedWidget;
-    mCentralContainer->insertWidget( 0, mMapCanvas );
-    mCentralContainer->insertWidget( 1, mWelcomePage );
-
     connect( mMapCanvas, SIGNAL( layersChanged() ), this, SLOT( showMapCanvas() ) );
     connect( this, SIGNAL( newProject() ), this, SLOT( showMapCanvas() ) );
-
-    qobject_cast<QGridLayout *>( centralWidget()->layout() )->addWidget( mCentralContainer, 0, 0, 2, 1 );
-
-    mCentralContainer->setCurrentIndex( 1 );
-
     return;
   }
   if ( projOpen == 1 && mRecentProjects.size() > 0 ) // most recent project

src/app/qgsabout.cpp

@@ -56,10 +56,15 @@ void QgsAbout::init()
   QTcpSocket socket;
   socket.connectToHost( "qgis.org", 80 );
   if ( socket.waitForConnected( 1000 ) )
+  {
     setDevelopersMap();
+  }
   else
+  {
     mOptionsListWidget->item( DEVELOPERS_MAP_INDEX )->setHidden( true );
-
+    QModelIndex firstItem = mOptionsListWidget->model()->index( 0, 0, QModelIndex() );
+    mOptionsListWidget->setCurrentIndex( firstItem );
+  }
   developersMapView->page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
   developersMapView->setContextMenuPolicy( Qt::NoContextMenu );
 

src/app/qgswelcomepage.cpp

@@ -26,7 +26,7 @@
 #include <QDesktopServices>
 
 QgsWelcomePage::QgsWelcomePage( QWidget* parent )
-    : QWidget( parent )
+    : QTabWidget( parent )
 {
   QVBoxLayout* mainLayout = new QVBoxLayout;
   mainLayout->setMargin( 0 );
@@ -62,7 +62,7 @@ QgsWelcomePage::QgsWelcomePage( QWidget* parent )
 
   recentProjctsContainer->layout()->addWidget( recentProjectsListView );
 
-  layout->addWidget( recentProjctsContainer );
+  addTab( recentProjctsContainer, "Recent Projects" );
 
   QWidget* whatsNewContainer = new QWidget;
   whatsNewContainer->setLayout( new QVBoxLayout );
@@ -73,14 +73,14 @@ QgsWelcomePage::QgsWelcomePage( QWidget* parent )
   whatsNewPage->setUrl( QUrl::fromLocalFile( QgsApplication::whatsNewFilePath() ) );
   whatsNewPage->page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
   whatsNewPage->setContextMenuPolicy( Qt::NoContextMenu );
-  whatsNewPage->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding );
+  whatsNewPage->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
   whatsNewPage->setStyleSheet( "background:transparent" );
   whatsNewPage->setAttribute( Qt::WA_TranslucentBackground );
 
   whatsNewContainer->layout()->addWidget( whatsNewPage );
-  whatsNewContainer->setMaximumWidth( 250 );
-  whatsNewContainer->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
-  layout->addWidget( whatsNewContainer );
+//  whatsNewContainer->setMaximumWidth( 250 );
+//  whatsNewContainer->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
+  addTab( whatsNewContainer, "News" );
 
   connect( whatsNewPage, SIGNAL( linkClicked( QUrl ) ), this, SLOT( whatsNewLinkClicked( QUrl ) ) );
 

src/app/qgswelcomepage.h

@@ -16,12 +16,13 @@
 #ifndef QGSWELCOMEDIALOG_H
 #define QGSWELCOMEDIALOG_H
 
+#include <QTabWidget>
 #include <QWidget>
 #include <QLabel>
 
 #include "qgswelcomepageitemsmodel.h"
 
-class QgsWelcomePage : public QWidget
+class QgsWelcomePage : public QTabWidget
 {
     Q_OBJECT
 

src/core/pal/feature.cpp

@@ -110,6 +110,7 @@ namespace pal
     {
       mHoles.at( i )->holeOf = this;
     }
+
   }
 
 
@@ -119,7 +120,6 @@ namespace pal
 
     qDeleteAll( mHoles );
     mHoles.clear();
-
   }
 
   void FeaturePart::extractCoords( const GEOSGeometry* geom )
@@ -166,6 +166,7 @@ namespace pal
     xmax = ymax = -DBL_MAX;
 
     // initialize coordinate arrays
+    deleteCoords();
     x = new double[nbPoints];
     y = new double[nbPoints];
 

src/core/pal/labelposition.cpp

@@ -175,8 +175,6 @@ namespace pal
     probFeat = other.probFeat;
     nbOverlap = other.nbOverlap;
 
-    memcpy( x, other.x, sizeof( double )*4 );
-    memcpy( y, other.y, sizeof( double )*4 );
     alpha = other.alpha;
     w = other.w;
     h = other.h;

src/core/pal/layer.cpp

@@ -235,6 +235,10 @@ namespace pal
           delete biggest_part; // safe with NULL part
           biggest_part = fpart;
         }
+        else
+        {
+          delete fpart;
+        }
         continue; // don't add the feature part now, do it later
         // TODO: we should probably add also other parts to act just as obstacles
       }
@@ -463,6 +467,7 @@ namespace pal
         newFeatureParts->append( newfpart );
         newfpart->getBoundingBox( bmin, bmax );
         rtree->Insert( bmin, bmax, newfpart );
+        delete fpart;
       }
       else
       {

src/core/pal/layer.h

@@ -330,6 +330,7 @@ namespace pal
 
       /** Add newly created feature part into r tree and to the list */
       void addFeaturePart( FeaturePart* fpart, const QString &labelText = QString() );
+
   };
 
 } // end namespace pal

src/core/pal/pal.cpp

@@ -386,6 +386,7 @@ namespace pal
 
     if ( isCancelled() )
     {
+      qDeleteAll( *fFeats );
       delete fFeats;
       delete prob;
       delete obstacles;
@@ -464,6 +465,7 @@ namespace pal
     {
       if ( isCancelled() )
       {
+        qDeleteAll( *fFeats );
         delete fFeats;
         delete prob;
         delete obstacles;

src/core/pal/pointset.cpp

@@ -126,12 +126,8 @@ namespace pal
     nbPoints = ps.nbPoints;
     x = new double[nbPoints];
     y = new double[nbPoints];
-
-    for ( i = 0; i < nbPoints; i++ )
-    {
-      x[i] = ps.x[i];
-      y[i] = ps.y[i];
-    }
+    memcpy( x, ps.x, sizeof( double )* nbPoints );
+    memcpy( y, ps.y, sizeof( double )* nbPoints );
 
     if ( ps.cHull )
     {

src/core/qgsconditionalstyle.cpp

@@ -119,12 +119,12 @@ QgsConditionalStyle::QgsConditionalStyle( QString rule )
 
 QgsConditionalStyle::QgsConditionalStyle( const QgsConditionalStyle &other )
     : mValid( other.mValid )
+    , mName( other.mName )
     , mRule( other.mRule )
     , mFont( other.mFont )
     , mBackColor( other.mBackColor )
     , mTextColor( other.mTextColor )
     , mIcon( other.mIcon )
-    , mName( other.mName )
 {
   if ( other.mSymbol.data() )
     mSymbol.reset( other.mSymbol->clone() );

src/core/qgsconditionalstyle.h

@@ -36,6 +36,7 @@ class CORE_EXPORT QgsConditionalLayerStyles
 
     /**
      * @brief Set the conditional styles for the field UI properties.
+     * @param fieldName name of field
      * @param styles
      */
     void setFieldStyles( QString fieldName, QList<QgsConditionalStyle> styles );
@@ -48,11 +49,11 @@ class CORE_EXPORT QgsConditionalLayerStyles
 
     /** Reads field ui properties specific state from Dom node.
      */
-    virtual bool readXml( const QDomNode& node );
+    bool readXml( const QDomNode& node );
 
     /** Write field ui properties specific state from Dom node.
      */
-    virtual bool writeXml( QDomNode & node, QDomDocument & doc ) const;
+    bool writeXml( QDomNode & node, QDomDocument & doc ) const;
 
   private:
     QHash<QString, QgsConditionalStyles> mFieldStyles;

src/core/qgslabelsearchtree.cpp

@@ -86,17 +86,15 @@ bool QgsLabelSearchTree::insertLabel( LabelPosition* labelPos, int featureId, co
   QgsLabelPosition* newEntry = new QgsLabelPosition( featureId, labelPos->getAlpha(), cornerPoints, QgsRectangle( c_min[0], c_min[1], c_max[0], c_max[1] ),
       labelPos->getWidth(), labelPos->getHeight(), layerName, labeltext, labelfont, labelPos->getUpsideDown(), diagram, pinned );
   mSpatialIndex.Insert( c_min, c_max, newEntry );
+  mOwnedPositions << newEntry;
   return true;
 }
 
 void QgsLabelSearchTree::clear()
 {
-  RTree<QgsLabelPosition*, double, 2, double>::Iterator indexIt;
-  mSpatialIndex.GetFirst( indexIt );
-  while ( !mSpatialIndex.IsNull( indexIt ) )
-  {
-    delete mSpatialIndex.GetAt( indexIt );
-    mSpatialIndex.GetNext( indexIt );
-  }
   mSpatialIndex.RemoveAll();
+
+  //PAL rtree iterator is buggy and doesn't iterate over all items, so we can't iterate through the tree to delete positions
+  qDeleteAll( mOwnedPositions );
+  mOwnedPositions.clear();
 }

src/core/qgslabelsearchtree.h

@@ -60,6 +60,7 @@ class CORE_EXPORT QgsLabelSearchTree
   private:
     // set as mutable because RTree template is not const-correct
     mutable RTree<QgsLabelPosition*, double, 2, double> mSpatialIndex;
+    QList< QgsLabelPosition* > mOwnedPositions;
 };
 
 #endif // QGSLABELTREE_H

src/core/qgspallabeling.cpp

@@ -4227,6 +4227,7 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
   if ( context.renderingStopped() )
   {
     delete problem;
+    deleteTemporaryData();
     return; // it has been cancelled
   }
 

src/core/qgspointlocator.cpp

@@ -670,6 +670,9 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )
 
     SpatialIndex::Region r( rect2region( f.constGeometry()->boundingBox() ) );
     dataList << new RTree::Data( 0, 0, r, f.id() );
+
+    if ( mGeoms.contains( f.id() ) )
+      delete mGeoms.take( f.id() );
     mGeoms[f.id()] = new QgsGeometry( *f.constGeometry() );
     ++indexedCount;
 
@@ -748,6 +751,9 @@ void QgsPointLocator::onFeatureAdded( QgsFeatureId fid )
     {
       SpatialIndex::Region r( rect2region( bbox ) );
       mRTree->insertData( 0, 0, r, f.id() );
+
+      if ( mGeoms.contains( f.id() ) )
+        delete mGeoms.take( f.id() );
       mGeoms[fid] = new QgsGeometry( *f.constGeometry() );
     }
   }
@@ -761,7 +767,7 @@ void QgsPointLocator::onFeatureDeleted( QgsFeatureId fid )
   if ( mGeoms.contains( fid ) )
   {
     mRTree->deleteData( rect2region( mGeoms[fid]->boundingBox() ), fid );
-    mGeoms.remove( fid );
+    delete mGeoms.take( fid );
   }
 }