From a5d5cf85d35a559068baa2d34f80206475fc86c0 Mon Sep 17 00:00:00 2001 From: jef Date: Fri, 26 Jun 2009 15:29:46 +0000 Subject: [PATCH] automatic indentation update (r10918-r10980) git-svn-id: http://svn.osgeo.org/qgis/trunk@10981 c8812cc2-4d05-0410-92ff-de0c093fc19c --- .../qgsattributetabledialog.cpp | 2 +- .../qgsattributetablememorymodel.cpp | 2 +- .../attributetable/qgsattributetablemodel.cpp | 2 +- src/app/composer/qgscomposeritemwidget.cpp | 4 +- src/app/composer/qgscomposermapwidget.cpp | 22 +- src/app/composer/qgscomposermapwidget.h | 2 +- src/app/qgisapp.cpp | 248 +++---- src/app/qgisapp.h | 2 +- src/app/qgsattributedialog.cpp | 10 +- src/app/qgsmaptooladdfeature.cpp | 6 +- src/app/qgsmaptooladdisland.cpp | 2 +- src/app/qgsmaptooladdring.cpp | 2 +- src/app/qgsmaptooladdvertex.cpp | 2 +- src/app/qgsmaptooldeletepart.cpp | 2 +- src/app/qgsmaptooldeletering.cpp | 2 +- src/app/qgsmaptooldeletevertex.cpp | 2 +- src/app/qgsmaptoolidentify.cpp | 2 +- src/app/qgsmaptoolmovefeature.cpp | 2 +- src/app/qgsmaptoolmovevertex.cpp | 2 +- src/app/qgsmaptoolnodetool.cpp | 538 +++++++------- src/app/qgsmaptoolnodetool.h | 40 +- src/app/qgsmaptoolsimplify.cpp | 2 +- src/app/qgsmaptoolsplitfeatures.cpp | 2 +- src/app/qgsmergeattributesdialog.cpp | 660 +++++++++--------- src/app/qgsundowidget.cpp | 180 ++--- src/app/qgsundowidget.h | 26 +- src/app/qgsvectorlayerproperties.cpp | 8 +- src/core/composer/qgscomposerlabel.cpp | 16 +- src/core/composer/qgscomposermap.cpp | 52 +- src/core/composer/qgscomposermap.h | 4 +- src/core/qgsgeometry.cpp | 6 +- src/core/qgsvectordataprovider.h | 2 +- src/core/qgsvectorlayer.cpp | 124 ++-- src/core/qgsvectorlayer.h | 10 +- src/core/qgsvectorlayerundocommand.cpp | 52 +- src/core/qgsvectorlayerundocommand.h | 22 +- src/gui/qgsmapcanvas.cpp | 4 +- src/gui/qgsmapcanvasmap.cpp | 6 +- src/plugins/grass/qgsgrassbrowser.cpp | 2 +- src/plugins/grass/qgsgrassmodel.cpp | 27 +- src/plugins/grass/qgsgrassmodule.cpp | 13 +- .../interpolation/DualEdgeTriangulation.cc | 2 +- src/providers/postgres/qgspostgresprovider.h | 6 +- 43 files changed, 1062 insertions(+), 1060 deletions(-) diff --git a/src/app/attributetable/qgsattributetabledialog.cpp b/src/app/attributetable/qgsattributetabledialog.cpp index f5caed94afc3..81a98438ce64 100644 --- a/src/app/attributetable/qgsattributetabledialog.cpp +++ b/src/app/attributetable/qgsattributetabledialog.cpp @@ -203,7 +203,7 @@ void QgsAttributeTableDialog::on_mCopySelectedRowsButton_clicked() void QgsAttributeTableDialog::on_mZoomMapToSelectedRowsButton_clicked() { - QgisApp::instance()->mapCanvas()->zoomToSelected(mLayer); + QgisApp::instance()->mapCanvas()->zoomToSelected( mLayer ); } void QgsAttributeTableDialog::on_mInvertSelectionButton_clicked() diff --git a/src/app/attributetable/qgsattributetablememorymodel.cpp b/src/app/attributetable/qgsattributetablememorymodel.cpp index 5a9830c172e9..f855f2b87b83 100644 --- a/src/app/attributetable/qgsattributetablememorymodel.cpp +++ b/src/app/attributetable/qgsattributetablememorymodel.cpp @@ -120,7 +120,7 @@ bool QgsAttributeTableMemoryModel::setData( const QModelIndex &index, const QVar // QgsDebugMsg(mFeatureMap[rowToId(index.row())].id()); mFeatureMap[rowToId( index.row() )].changeAttribute( mAttributes[ index.column()], value ); // propagate back to the layer - mLayer->beginEditCommand( tr("Attribute changed") ); + mLayer->beginEditCommand( tr( "Attribute changed" ) ); mLayer->changeAttributeValue( rowToId( index.row() ), mAttributes[ index.column()], value, true ); mLayer->endEditCommand(); } diff --git a/src/app/attributetable/qgsattributetablemodel.cpp b/src/app/attributetable/qgsattributetablemodel.cpp index 3069f04f26b1..d4812f6c9afe 100644 --- a/src/app/attributetable/qgsattributetablemodel.cpp +++ b/src/app/attributetable/qgsattributetablemodel.cpp @@ -393,7 +393,7 @@ bool QgsAttributeTableModel::setData( const QModelIndex &index, const QVariant & { mLastRowId = rowToId( index.row() ); mLastRow = ( QgsAttributeMap * )( &( mFeat.attributeMap() ) ); - mLayer->beginEditCommand( tr("Attribute changed") ); + mLayer->beginEditCommand( tr( "Attribute changed" ) ); mLayer->changeAttributeValue( rowToId( index.row() ), mAttributes[ index.column()], value, true ); mLayer->endEditCommand(); } diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/src/app/composer/qgscomposeritemwidget.cpp index 1e1c897fda9e..6aab6241d038 100644 --- a/src/app/composer/qgscomposeritemwidget.cpp +++ b/src/app/composer/qgscomposeritemwidget.cpp @@ -77,8 +77,8 @@ void QgsComposerItemWidget::on_mBackgroundColorButton_clicked() mItem->setBrush( QBrush( QColor( newBackgroundColor ), Qt::SolidPattern ) ); //if the item is a composer map, we need to regenerate the map image //because it usually is cached - QgsComposerMap* cm = dynamic_cast(mItem); - if(cm) + QgsComposerMap* cm = dynamic_cast( mItem ); + if ( cm ) { cm->cache(); } diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp index 56914a16d044..22aace8f48a1 100644 --- a/src/app/composer/qgscomposermapwidget.cpp +++ b/src/app/composer/qgscomposermapwidget.cpp @@ -254,16 +254,16 @@ void QgsComposerMapWidget::updateGuiElements() mYMaxLineEdit->setText( QString::number( composerMapExtent.yMaximum(), 'f', 3 ) ); //keep layer list check box - mKeepLayerListCheckBox->blockSignals(true); - if(mComposerMap->keepLayerSet()) + mKeepLayerListCheckBox->blockSignals( true ); + if ( mComposerMap->keepLayerSet() ) { - mKeepLayerListCheckBox->setCheckState(Qt::Checked); + mKeepLayerListCheckBox->setCheckState( Qt::Checked ); } else { - mKeepLayerListCheckBox->setCheckState(Qt::Unchecked); + mKeepLayerListCheckBox->setCheckState( Qt::Unchecked ); } - mKeepLayerListCheckBox->blockSignals(false); + mKeepLayerListCheckBox->blockSignals( false ); } } @@ -311,22 +311,22 @@ void QgsComposerMapWidget::on_mUpdatePreviewButton_clicked() mUpdatePreviewButton->setEnabled( true ); } -void QgsComposerMapWidget::on_mKeepLayerListCheckBox_stateChanged(int state) +void QgsComposerMapWidget::on_mKeepLayerListCheckBox_stateChanged( int state ) { - if(!mComposerMap) + if ( !mComposerMap ) { return; } - if(state == Qt::Checked) + if ( state == Qt::Checked ) { mComposerMap->storeCurrentLayerSet(); - mComposerMap->setKeepLayerSet(true); + mComposerMap->setKeepLayerSet( true ); } else { QStringList emptyLayerSet; - mComposerMap->setLayerSet(emptyLayerSet); - mComposerMap->setKeepLayerSet(false); + mComposerMap->setLayerSet( emptyLayerSet ); + mComposerMap->setKeepLayerSet( false ); } } diff --git a/src/app/composer/qgscomposermapwidget.h b/src/app/composer/qgscomposermapwidget.h index 8fdb9b538a23..ae9a7a8760c4 100644 --- a/src/app/composer/qgscomposermapwidget.h +++ b/src/app/composer/qgscomposermapwidget.h @@ -41,7 +41,7 @@ class QgsComposerMapWidget: public QWidget, private Ui::QgsComposerMapWidgetBase void on_mScaleLineEdit_editingFinished(); void on_mSetToMapCanvasExtentButton_clicked(); void on_mUpdatePreviewButton_clicked(); - void on_mKeepLayerListCheckBox_stateChanged(int state); + void on_mKeepLayerListCheckBox_stateChanged( int state ); void on_mXMinLineEdit_editingFinished(); void on_mXMaxLineEdit_editingFinished(); diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index e981d0dfbb22..dafa971fbb19 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -366,8 +366,8 @@ QgisApp::QgisApp( QSplashScreen *splash, QWidget * parent, Qt::WFlags fl ) mQgisInterface = new QgisAppInterface( this ); // create the interfce // create undo widget - mUndoWidget = new QgsUndoWidget( NULL, mMapCanvas); - addDockWidget(Qt::LeftDockWidgetArea, mUndoWidget); + mUndoWidget = new QgsUndoWidget( NULL, mMapCanvas ); + addDockWidget( Qt::LeftDockWidgetArea, mUndoWidget ); mUndoWidget->hide(); // set application's icon @@ -606,13 +606,13 @@ void QgisApp::createActions() connect( mActionPaste, SIGNAL( triggered ), this, SLOT( paste() ) ); #endif - mActionUndo = new QAction( getThemeIcon( "mActionUndo.png"), tr( "&Undo" ), this ); + mActionUndo = new QAction( getThemeIcon( "mActionUndo.png" ), tr( "&Undo" ), this ); shortcuts->registerAction( mActionUndo, tr( "Ctrl+Z" ) ); mActionUndo->setStatusTip( tr( "Undo the last operation" ) ); mActionUndo->setEnabled( false ); // action connected to mUndoWidget::undo slot in setupConnections() - mActionRedo = new QAction( getThemeIcon( "mActionRedo.png"), tr( "&Redo" ), this ); + mActionRedo = new QAction( getThemeIcon( "mActionRedo.png" ), tr( "&Redo" ), this ); shortcuts->registerAction( mActionRedo, tr( "Ctrl+Shift+Z" ) ); mActionRedo->setStatusTip( tr( "Redo the last operation" ) ); mActionRedo->setEnabled( false ); @@ -720,11 +720,11 @@ void QgisApp::createActions() connect( mActionDeletePart, SIGNAL( triggered() ), this, SLOT( deletePart() ) ); mActionDeletePart->setEnabled( false ); - mActionMergeFeatures = new QAction( getThemeIcon("mActionMergeFeatures.png"), tr("Merge selected features"), this); - shortcuts->registerAction(mActionMergeFeatures); - mActionMergeFeatures->setStatusTip( tr("Merge selected features")); - connect( mActionMergeFeatures, SIGNAL(triggered()), this, SLOT(mergeSelectedFeatures())); - mActionMergeFeatures->setEnabled(false); + mActionMergeFeatures = new QAction( getThemeIcon( "mActionMergeFeatures.png" ), tr( "Merge selected features" ), this ); + shortcuts->registerAction( mActionMergeFeatures ); + mActionMergeFeatures->setStatusTip( tr( "Merge selected features" ) ); + connect( mActionMergeFeatures, SIGNAL( triggered() ), this, SLOT( mergeSelectedFeatures() ) ); + mActionMergeFeatures->setEnabled( false ); mActionNodeTool = new QAction( getThemeIcon( "mActionNodeTool.png" ), tr( "Node Tool" ), this ); shortcuts->registerAction( mActionNodeTool ); @@ -1081,7 +1081,7 @@ void QgisApp::createActionGroups() mMapToolGroup->addAction( mActionDeleteRing ); mActionDeletePart->setCheckable( true ); mMapToolGroup->addAction( mActionDeletePart ); - mMapToolGroup->addAction( mActionMergeFeatures); + mMapToolGroup->addAction( mActionMergeFeatures ); mActionNodeTool->setCheckable( true ); mMapToolGroup->addAction( mActionNodeTool ); @@ -1178,7 +1178,7 @@ void QgisApp::createMenus() mEditMenu->addAction( mActionSplitFeatures ); mEditMenu->addAction( mActionMergeFeatures ); mEditMenu->addAction( mActionNodeTool ); - + if ( layout == QDialogButtonBox::GnomeLayout || layout == QDialogButtonBox::MacLayout ) { mActionEditSeparator3 = mEditMenu->addSeparator(); @@ -1693,7 +1693,7 @@ void QgisApp::setupConnections() // setup undo/redo actions connect( mActionUndo, SIGNAL( triggered() ), mUndoWidget, SLOT( undo() ) ); connect( mActionRedo, SIGNAL( triggered() ), mUndoWidget, SLOT( redo() ) ); - connect( mUndoWidget, SIGNAL( undoStackChanged() ), this, SLOT(updateUndoActions()) ); + connect( mUndoWidget, SIGNAL( undoStackChanged() ), this, SLOT( updateUndoActions() ) ); } void QgisApp::createCanvas() @@ -2428,11 +2428,11 @@ bool QgisApp::addVectorLayers( QStringList const & theLayerQStringList, const QS } else // there is 1 layer of data available { - //set friendly name for datasources with only one layer + //set friendly name for datasources with only one layer QStringList sublayers = layer->dataProvider()->subLayers(); - QString ligne = sublayers.at( 0 ); - QStringList elements = ligne.split( ":" ); - layer->setLayerName(elements.at(1)); + QString ligne = sublayers.at( 0 ); + QStringList elements = ligne.split( ":" ); + layer->setLayerName( elements.at( 1 ) ); // Register this layer with the layers registry QgsMapLayerRegistry::instance()->addMapLayer( layer ); // notify the project we've made a change @@ -3348,7 +3348,7 @@ bool QgisApp::addProject( QString projectFile ) //clear the composer delete mComposer; - mComposer = new QgsComposer(this); + mComposer = new QgsComposer( this ); try { @@ -3659,7 +3659,7 @@ bool QgisApp::openLayer( const QString & fileName ) ok = addRasterLayer( fileName, fileInfo.completeBaseName() ); else // nope - try to load it as a shape/ogr ok = addVectorLayer( fileName, fileInfo.completeBaseName(), "ogr" ); - + CPLPopErrorHandler(); if ( !ok ) @@ -4117,7 +4117,7 @@ void QgisApp::deleteSelected() return; } - vlayer->beginEditCommand( tr("Features deleted") ); + vlayer->beginEditCommand( tr( "Features deleted" ) ); if ( !vlayer->deleteSelectedFeatures() ) { QMessageBox::information( this, tr( "Problem deleting features" ), @@ -4149,40 +4149,40 @@ void QgisApp::deletePart() mMapCanvas->setMapTool( mMapTools.mDeletePart ); } -QgsGeometry* QgisApp::unionGeometries(const QgsVectorLayer* vl, QgsFeatureList& featureList) +QgsGeometry* QgisApp::unionGeometries( const QgsVectorLayer* vl, QgsFeatureList& featureList ) { - if(!vl || featureList.size() < 2) + if ( !vl || featureList.size() < 2 ) { return 0; } QgsGeometry* unionGeom = featureList[0].geometry(); QgsGeometry* backupPtr = 0; //pointer to delete intermediate results - if(!unionGeom) + if ( !unionGeom ) { return 0; } - QProgressDialog progress(tr("Merging features..."), tr("Abort"), 0, featureList.size(), this); - progress.setWindowModality(Qt::WindowModal); + QProgressDialog progress( tr( "Merging features..." ), tr( "Abort" ), 0, featureList.size(), this ); + progress.setWindowModality( Qt::WindowModal ); QApplication::setOverrideCursor( Qt::WaitCursor ); - for(int i = 1; i < featureList.size(); ++i) + for ( int i = 1; i < featureList.size(); ++i ) { - if(progress.wasCanceled()) + if ( progress.wasCanceled() ) { delete unionGeom; QApplication::restoreOverrideCursor(); return 0; } - progress.setValue(i); + progress.setValue( i ); QgsGeometry* currentGeom = featureList[i].geometry(); - if(currentGeom) + if ( currentGeom ) { backupPtr = unionGeom; - unionGeom = unionGeom->combine(currentGeom); - if(i > 1) //delete previous intermediate results + unionGeom = unionGeom->combine( currentGeom ); + if ( i > 1 ) //delete previous intermediate results { delete backupPtr; backupPtr = 0; @@ -4191,114 +4191,114 @@ QgsGeometry* QgisApp::unionGeometries(const QgsVectorLayer* vl, QgsFeatureList& } QApplication::restoreOverrideCursor(); - progress.setValue(featureList.size()); + progress.setValue( featureList.size() ); return unionGeom; } void QgisApp::mergeSelectedFeatures() { - //get active layer (hopefully vector) - QgsMapLayer* activeMapLayer = activeLayer(); - if(!activeMapLayer) - { - QMessageBox::information(0, tr("No active layer"), tr("No active layer found. Please select a layer in the layer list")); - return; - } - QgsVectorLayer* vl = dynamic_cast(activeMapLayer); - if(!vl) - { - QMessageBox::information(0, tr("Active layer is not vector"), tr("The merge features tool only works on vector layers. Please select a vector layer from the layer list")); - return; - } - if(!vl->isEditable()) - { - QMessageBox::information(0, tr("Layer not editable"), tr("Merging features can only be done for layers in editing mode. To use the merge tool, go to Layer->Toggle editing")); - return; - } + //get active layer (hopefully vector) + QgsMapLayer* activeMapLayer = activeLayer(); + if ( !activeMapLayer ) + { + QMessageBox::information( 0, tr( "No active layer" ), tr( "No active layer found. Please select a layer in the layer list" ) ); + return; + } + QgsVectorLayer* vl = dynamic_cast( activeMapLayer ); + if ( !vl ) + { + QMessageBox::information( 0, tr( "Active layer is not vector" ), tr( "The merge features tool only works on vector layers. Please select a vector layer from the layer list" ) ); + return; + } + if ( !vl->isEditable() ) + { + QMessageBox::information( 0, tr( "Layer not editable" ), tr( "Merging features can only be done for layers in editing mode. To use the merge tool, go to Layer->Toggle editing" ) ); + return; + } - //get selected feature ids (as a QSet ) - const QgsFeatureIds& featureIdSet = vl->selectedFeaturesIds(); - if(featureIdSet.size() < 2) - { - QMessageBox::information(0, "Not enough features selected", tr("The merge tool requires at least two selected features")); - return; - } + //get selected feature ids (as a QSet ) + const QgsFeatureIds& featureIdSet = vl->selectedFeaturesIds(); + if ( featureIdSet.size() < 2 ) + { + QMessageBox::information( 0, "Not enough features selected", tr( "The merge tool requires at least two selected features" ) ); + return; + } - //get initial selection (may be altered by attribute merge dialog later) - QgsFeatureList featureList = vl->selectedFeatures(); //get QList - QgsGeometry* unionGeom = unionGeometries(vl, featureList); - if(!unionGeom) - { - return; - } + //get initial selection (may be altered by attribute merge dialog later) + QgsFeatureList featureList = vl->selectedFeatures(); //get QList + QgsGeometry* unionGeom = unionGeometries( vl, featureList ); + if ( !unionGeom ) + { + return; + } - //make a first geometry union and notify the user straight away if the union geometry type does not match the layer one - QGis::WkbType originalType = vl->wkbType(); - QGis::WkbType newType = unionGeom->wkbType(); - if(unionGeom->wkbType() != vl->wkbType()) - { - QMessageBox::critical(0, "Union operation canceled", tr("The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled")); - delete unionGeom; - return; - } + //make a first geometry union and notify the user straight away if the union geometry type does not match the layer one + QGis::WkbType originalType = vl->wkbType(); + QGis::WkbType newType = unionGeom->wkbType(); + if ( unionGeom->wkbType() != vl->wkbType() ) + { + QMessageBox::critical( 0, "Union operation canceled", tr( "The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled" ) ); + delete unionGeom; + return; + } - //merge the attributes together - QgsMergeAttributesDialog d(featureList, vl, mapCanvas()); - if(d.exec() == QDialog::Rejected) - { - return; - } + //merge the attributes together + QgsMergeAttributesDialog d( featureList, vl, mapCanvas() ); + if ( d.exec() == QDialog::Rejected ) + { + return; + } - QgsFeatureList featureListAfter = vl->selectedFeatures(); + QgsFeatureList featureListAfter = vl->selectedFeatures(); - if(featureListAfter.size() < 2) + if ( featureListAfter.size() < 2 ) + { + QMessageBox::information( 0, "Not enough features selected", tr( "The merge tool requires at least two selected features" ) ); + delete unionGeom; + return; + } + + //if the user changed the feature selection in the merge dialog, we need to repead the union and check the type + if ( featureList.size() != featureListAfter.size() ) + { + delete unionGeom; + unionGeom = unionGeometries( vl, featureListAfter ); + if ( !unionGeom ) { - QMessageBox::information(0, "Not enough features selected", tr("The merge tool requires at least two selected features")); - delete unionGeom; - return; + return; } - //if the user changed the feature selection in the merge dialog, we need to repead the union and check the type - if(featureList.size() != featureListAfter.size()) + originalType = vl->wkbType(); + newType = unionGeom->wkbType(); + if ( unionGeom->wkbType() != vl->wkbType() ) { + QMessageBox::critical( 0, "Union operation canceled", tr( "The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled" ) ); delete unionGeom; - unionGeom = unionGeometries(vl, featureListAfter); - if(!unionGeom) - { - return; - } - - originalType = vl->wkbType(); - newType = unionGeom->wkbType(); - if(unionGeom->wkbType() != vl->wkbType()) - { - QMessageBox::critical(0, "Union operation canceled", tr("The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled")); - delete unionGeom; - return; - } + return; } + } - vl->beginEditCommand( tr("Merged features") ); + vl->beginEditCommand( tr( "Merged features" ) ); - //create new feature - QgsFeature newFeature; - newFeature.setGeometry(unionGeom); - newFeature.setAttributeMap(d.mergedAttributesMap()); + //create new feature + QgsFeature newFeature; + newFeature.setGeometry( unionGeom ); + newFeature.setAttributeMap( d.mergedAttributesMap() ); - QgsFeatureList::const_iterator feature_it = featureListAfter.constBegin(); - for(; feature_it != featureListAfter.constEnd(); ++feature_it) - { - vl->deleteFeature(feature_it->id()); - } + QgsFeatureList::const_iterator feature_it = featureListAfter.constBegin(); + for ( ; feature_it != featureListAfter.constEnd(); ++feature_it ) + { + vl->deleteFeature( feature_it->id() ); + } - vl->addFeature(newFeature, false); + vl->addFeature( newFeature, false ); - vl->endEditCommand();; + vl->endEditCommand();; - if(mapCanvas()) - { - mapCanvas()->refresh(); - } + if ( mapCanvas() ) + { + mapCanvas()->refresh(); + } } void QgisApp::nodeTool() @@ -4415,7 +4415,7 @@ void QgisApp::editCut( QgsMapLayer * layerContainingSelection ) { QgsFeatureList features = selectionVectorLayer->selectedFeatures(); clipboard()->replaceWithCopyOf( selectionVectorLayer->dataProvider()->fields(), features ); - selectionVectorLayer->beginEditCommand( tr("Features cut") ); + selectionVectorLayer->beginEditCommand( tr( "Features cut" ) ); selectionVectorLayer->deleteSelectedFeatures(); selectionVectorLayer->endEditCommand(); } @@ -4466,7 +4466,7 @@ void QgisApp::editPaste( QgsMapLayer * destinationLayer ) if ( pasteVectorLayer != 0 ) { - pasteVectorLayer->beginEditCommand( tr("Features pasted") ); + pasteVectorLayer->beginEditCommand( tr( "Features pasted" ) ); pasteVectorLayer->addFeatures( clipboard()->copyOf() ); pasteVectorLayer->endEditCommand(); mMapCanvas->refresh(); @@ -4989,9 +4989,9 @@ QgsVectorLayer* QgisApp::addVectorLayer( QString vectorLayerPath, QString baseNa QgsDebugMsg( "Creating new vector layer using " + vectorLayerPath + " with baseName of " + baseName + " and providerKey of " + providerKey ); - - layer = new QgsVectorLayer( vectorLayerPath, baseName, providerKey ); - + + layer = new QgsVectorLayer( vectorLayerPath, baseName, providerKey ); + if ( layer && layer->isValid() ) { // Register this layer with the layers registry @@ -5542,10 +5542,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer ) } //merge tool needs editable layer and provider with the capability of adding and deleting features - if ( vlayer->isEditable() && (dprovider->capabilities() & QgsVectorDataProvider::DeleteFeatures) \ - && QgsVectorDataProvider::AddFeatures) + if ( vlayer->isEditable() && ( dprovider->capabilities() & QgsVectorDataProvider::DeleteFeatures ) \ + && QgsVectorDataProvider::AddFeatures ) { - mActionMergeFeatures->setEnabled(layerHasSelection); + mActionMergeFeatures->setEnabled( layerHasSelection ); } else { @@ -6204,7 +6204,7 @@ void QgisApp::updateUndoActions() { bool canUndo = false, canRedo = false; QgsMapLayer* layer = this->activeLayer(); - if (layer) + if ( layer ) { QgsVectorLayer* vlayer = dynamic_cast( layer ); if ( vlayer && vlayer->isEditable() ) diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h index b4b768955f68..f18c8bb460b5 100644 --- a/src/app/qgisapp.h +++ b/src/app/qgisapp.h @@ -667,7 +667,7 @@ class QgisApp : public QMainWindow bool saveDirty(); /** Helper function to union several geometries together (used in function mergeSelectedFeatures) @return 0 in case of error*/ - QgsGeometry* unionGeometries(const QgsVectorLayer* vl, QgsFeatureList& featureList); + QgsGeometry* unionGeometries( const QgsVectorLayer* vl, QgsFeatureList& featureList ); /// QgisApp aren't copyable QgisApp( QgisApp const & ); diff --git a/src/app/qgsattributedialog.cpp b/src/app/qgsattributedialog.cpp index 339abde613f6..a358c6ba8848 100644 --- a/src/app/qgsattributedialog.cpp +++ b/src/app/qgsattributedialog.cpp @@ -135,13 +135,13 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat case QgsVectorLayer::Enumeration: { QStringList enumValues; - mLayer->dataProvider()->enumValues(it.key(), enumValues); + mLayer->dataProvider()->enumValues( it.key(), enumValues ); QComboBox *cb = new QComboBox(); QStringList::const_iterator s_it = enumValues.constBegin(); - for(; s_it != enumValues.constEnd(); ++s_it) + for ( ; s_it != enumValues.constEnd(); ++s_it ) { - cb->addItem(*s_it); + cb->addItem( *s_it ); } int idx = cb->findText( myFieldValue.toString() ); if ( idx >= 0 ) @@ -243,9 +243,9 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat { QLineEdit *le = new QLineEdit( myFieldValue.toString() ); - if ( editType == QgsVectorLayer::Immutable) + if ( editType == QgsVectorLayer::Immutable ) { - le->setEnabled(false); + le->setEnabled( false ); } if ( editType == QgsVectorLayer::UniqueValuesEditable ) { diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp index 13cd4e6c4086..c8311c8dce27 100644 --- a/src/app/qgsmaptooladdfeature.cpp +++ b/src/app/qgsmaptooladdfeature.cpp @@ -175,7 +175,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e ) f->addAttribute( it.key(), provider->defaultValue( it.key() ) ); } - vlayer->beginEditCommand( tr("Feature added") ); + vlayer->beginEditCommand( tr( "Feature added" ) ); // show the dialog to enter attribute values QSettings settings; @@ -465,7 +465,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e ) bool isDisabledAttributeValuesDlg = settings.value( "/qgis/digitizing/disable_enter_attribute_values_dialog", false ).toBool(); if ( isDisabledAttributeValuesDlg ) { - vlayer->beginEditCommand( tr("Feature added") ); + vlayer->beginEditCommand( tr( "Feature added" ) ); if ( vlayer->addFeature( *f ) ) { //add points to other features to keep topology up-to-date @@ -482,7 +482,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e ) QgsAttributeDialog * mypDialog = new QgsAttributeDialog( vlayer, f ); if ( mypDialog->exec() ) { - vlayer->beginEditCommand( tr("Feature added") ); + vlayer->beginEditCommand( tr( "Feature added" ) ); if ( vlayer->addFeature( *f ) ) { //add points to other features to keep topology up-to-date diff --git a/src/app/qgsmaptooladdisland.cpp b/src/app/qgsmaptooladdisland.cpp index d3fd13ab8831..3ae7bf029d02 100644 --- a/src/app/qgsmaptooladdisland.cpp +++ b/src/app/qgsmaptooladdisland.cpp @@ -101,7 +101,7 @@ void QgsMapToolAddIsland::canvasReleaseEvent( QMouseEvent * e ) //close polygon mCaptureList.push_back( *mCaptureList.begin() ); - vlayer->beginEditCommand( tr("Island added") ); + vlayer->beginEditCommand( tr( "Island added" ) ); int errorCode = vlayer->addIsland( mCaptureList ); vlayer->endEditCommand(); QString errorMessage; diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp index 99f4b96a7dd0..98716a6e6226 100644 --- a/src/app/qgsmaptooladdring.cpp +++ b/src/app/qgsmaptooladdring.cpp @@ -81,7 +81,7 @@ void QgsMapToolAddRing::canvasReleaseEvent( QMouseEvent * e ) //close polygon mCaptureList.push_back( *mCaptureList.begin() ); - vlayer->beginEditCommand( tr("Ring added") ); + vlayer->beginEditCommand( tr( "Ring added" ) ); int addRingReturnCode = vlayer->addRing( mCaptureList ); vlayer->endEditCommand(); if ( addRingReturnCode != 0 ) diff --git a/src/app/qgsmaptooladdvertex.cpp b/src/app/qgsmaptooladdvertex.cpp index c39681703020..e1cc4275fa4a 100644 --- a/src/app/qgsmaptooladdvertex.cpp +++ b/src/app/qgsmaptooladdvertex.cpp @@ -122,7 +122,7 @@ void QgsMapToolAddVertex::canvasReleaseEvent( QMouseEvent * e ) //and change the feature points QList::iterator sr_it = mRecentSnappingResults.begin(); - vlayer->beginEditCommand( tr("Added vertex") ); + vlayer->beginEditCommand( tr( "Added vertex" ) ); for ( ; sr_it != mRecentSnappingResults.end(); ++sr_it ) { vlayer->insertVertex( snappedPointLayerCoord.x(), snappedPointLayerCoord.y(), sr_it->snappedAtGeometry, sr_it->afterVertexNr ); diff --git a/src/app/qgsmaptooldeletepart.cpp b/src/app/qgsmaptooldeletepart.cpp index c5f53eb46fd2..bb0f7394cc5d 100644 --- a/src/app/qgsmaptooldeletepart.cpp +++ b/src/app/qgsmaptooldeletepart.cpp @@ -106,7 +106,7 @@ void QgsMapToolDeletePart::deletePart( int fId, int beforeVertexNr, QgsVectorLay if ( g->deletePart( partNum ) ) { - vlayer->beginEditCommand( tr("Part of multipart feature deleted") ); + vlayer->beginEditCommand( tr( "Part of multipart feature deleted" ) ); vlayer->changeGeometry( fId, g ); vlayer->endEditCommand(); mCanvas->refresh(); diff --git a/src/app/qgsmaptooldeletering.cpp b/src/app/qgsmaptooldeletering.cpp index b356eba971a8..d636e421c9de 100644 --- a/src/app/qgsmaptooldeletering.cpp +++ b/src/app/qgsmaptooldeletering.cpp @@ -111,7 +111,7 @@ void QgsMapToolDeleteRing::deleteRing( int fId, int beforeVertexNr, QgsVectorLay if ( g->deleteRing( ringNum, partNum ) ) { - vlayer->beginEditCommand( tr("Ring deleted") ); + vlayer->beginEditCommand( tr( "Ring deleted" ) ); vlayer->changeGeometry( fId, g ); vlayer->endEditCommand(); mCanvas->refresh(); diff --git a/src/app/qgsmaptooldeletevertex.cpp b/src/app/qgsmaptooldeletevertex.cpp index 3e97072c38ff..693c48777c70 100644 --- a/src/app/qgsmaptooldeletevertex.cpp +++ b/src/app/qgsmaptooldeletevertex.cpp @@ -79,7 +79,7 @@ void QgsMapToolDeleteVertex::canvasReleaseEvent( QMouseEvent * e ) if ( vlayer && mRecentSnappingResults.size() > 0 ) { QList::iterator sr_it = mRecentSnappingResults.begin(); - vlayer->beginEditCommand( tr("Vertex deleted") ); + vlayer->beginEditCommand( tr( "Vertex deleted" ) ); for ( ; sr_it != mRecentSnappingResults.end(); ++sr_it ) { vlayer->deleteVertex( sr_it->snappedAtGeometry, sr_it->snappedVertexNr ); diff --git a/src/app/qgsmaptoolidentify.cpp b/src/app/qgsmaptoolidentify.cpp index 1f5900c7f062..5d36d5f91c2b 100644 --- a/src/app/qgsmaptoolidentify.cpp +++ b/src/app/qgsmaptoolidentify.cpp @@ -491,7 +491,7 @@ void QgsMapToolIdentify::editFeature( QgsFeature &f ) QgsAttributeMap src = f.attributeMap(); - layer->beginEditCommand( tr("Attribute changed") ); + layer->beginEditCommand( tr( "Attribute changed" ) ); QgsAttributeDialog *ad = new QgsAttributeDialog( layer, &f ); if ( ad->exec() ) { diff --git a/src/app/qgsmaptoolmovefeature.cpp b/src/app/qgsmaptoolmovefeature.cpp index 3629b5fe413d..f7398ddee099 100644 --- a/src/app/qgsmaptoolmovefeature.cpp +++ b/src/app/qgsmaptoolmovefeature.cpp @@ -137,7 +137,7 @@ void QgsMapToolMoveFeature::canvasReleaseEvent( QMouseEvent * e ) double dx = stopPointLayerCoords.x() - startPointLayerCoords.x(); double dy = stopPointLayerCoords.y() - startPointLayerCoords.y(); - vlayer->beginEditCommand( tr("Feature moved") ); + vlayer->beginEditCommand( tr( "Feature moved" ) ); vlayer->translateFeature( mMovedFeature, dx, dy ); delete mRubberBand; mRubberBand = 0; diff --git a/src/app/qgsmaptoolmovevertex.cpp b/src/app/qgsmaptoolmovevertex.cpp index 9a663460336f..fb7e4cbd3b27 100644 --- a/src/app/qgsmaptoolmovevertex.cpp +++ b/src/app/qgsmaptoolmovevertex.cpp @@ -164,7 +164,7 @@ void QgsMapToolMoveVertex::canvasReleaseEvent( QMouseEvent * e ) snappedPointLayerCoord = toLayerCoordinates( vlayer, snappedPointMapCoord ); - vlayer->beginEditCommand( tr("Vertex moved") ); + vlayer->beginEditCommand( tr( "Vertex moved" ) ); //and change the feature points QList::iterator sr_it = mRecentSnappingResults.begin(); for ( ; sr_it != mRecentSnappingResults.end(); ++sr_it ) diff --git a/src/app/qgsmaptoolnodetool.cpp b/src/app/qgsmaptoolnodetool.cpp index 409994e48bd1..1e6c25337e55 100644 --- a/src/app/qgsmaptoolnodetool.cpp +++ b/src/app/qgsmaptoolnodetool.cpp @@ -24,25 +24,25 @@ #include #include -QgsRubberBand* QgsMapToolNodeTool::createRubberBandMarker(QgsPoint center, QgsVectorLayer* vlayer) +QgsRubberBand* QgsMapToolNodeTool::createRubberBandMarker( QgsPoint center, QgsVectorLayer* vlayer ) { - QgsRubberBand* marker = new QgsRubberBand(mCanvas, true); - marker->setColor(Qt::red); - marker->setWidth(2); + QgsRubberBand* marker = new QgsRubberBand( mCanvas, true ); + marker->setColor( Qt::red ); + marker->setWidth( 2 ); double movement = 4; - double s = QgsTolerance::toleranceInMapUnits(movement, vlayer, mCanvas->mapRenderer(), QgsTolerance::Pixels); + double s = QgsTolerance::toleranceInMapUnits( movement, vlayer, mCanvas->mapRenderer(), QgsTolerance::Pixels ); QgsPoint pom = toMapCoordinates( vlayer, center ); - pom.setX(pom.x() - s); - pom.setY(pom.y() - s); - marker->addPoint(pom); - pom.setX(pom.x() + 2*s); - marker->addPoint(pom); - pom.setY(pom.y() + 2*s); - marker->addPoint(pom); - pom.setX(pom.x() - 2*s); - marker->addPoint(pom); - pom.setY(pom.y() - 2*s); - marker->addPoint(pom); + pom.setX( pom.x() - s ); + pom.setY( pom.y() - s ); + marker->addPoint( pom ); + pom.setX( pom.x() + 2*s ); + marker->addPoint( pom ); + pom.setY( pom.y() + 2*s ); + marker->addPoint( pom ); + pom.setX( pom.x() - 2*s ); + marker->addPoint( pom ); + pom.setY( pom.y() - 2*s ); + marker->addPoint( pom ); return marker; } @@ -58,8 +58,8 @@ QgsMapToolNodeTool::QgsMapToolNodeTool( QgsMapCanvas* canvas ): QgsMapToolVertex mClicked = false; mChangingGeometry = false; mIsPoint = false; - connect( canvas, SIGNAL(layersChanged()), this, SLOT( layersChanged() ) ); - connect( canvas->mapRenderer(), SIGNAL(destinationSrsChanged()), this, SLOT( coordinatesChanged() ) ); + connect( canvas, SIGNAL( layersChanged() ), this, SLOT( layersChanged() ) ); + connect( canvas->mapRenderer(), SIGNAL( destinationSrsChanged() ), this, SLOT( coordinatesChanged() ) ); } QgsMapToolNodeTool::~QgsMapToolNodeTool() @@ -70,17 +70,17 @@ QgsMapToolNodeTool::~QgsMapToolNodeTool() void QgsMapToolNodeTool::layersChanged() { QgsVectorLayer* vlayer = vlayer = dynamic_cast( mCanvas->currentLayer() ); - if (mSelectionFeature!= NULL && mSelectionFeature->vlayer() != vlayer) + if ( mSelectionFeature != NULL && mSelectionFeature->vlayer() != vlayer ) { delete mSelectionFeature; mSelectionFeature = NULL; } } -void QgsMapToolNodeTool::currentLayerChanged( QgsMapLayer* layer) +void QgsMapToolNodeTool::currentLayerChanged( QgsMapLayer* layer ) { QgsVectorLayer* vlayer = vlayer = dynamic_cast( layer ); - if (mSelectionFeature!= NULL && mSelectionFeature->vlayer() != vlayer) + if ( mSelectionFeature != NULL && mSelectionFeature->vlayer() != vlayer ) { delete mSelectionFeature; mSelectionFeature = NULL; @@ -90,12 +90,12 @@ void QgsMapToolNodeTool::currentLayerChanged( QgsMapLayer* layer) void QgsMapToolNodeTool::featureDeleted( int featureId ) { - if (mSelectionFeature != NULL && featureId == mSelectionFeature->featureId()) + if ( mSelectionFeature != NULL && featureId == mSelectionFeature->featureId() ) { delete mSelectionFeature; mSelectionFeature = NULL; - disconnect(mCanvas->currentLayer(), SIGNAL( featureDeleted(int) ) ); - disconnect(mCanvas->currentLayer(), SIGNAL( layerModified(bool) ) ); + disconnect( mCanvas->currentLayer(), SIGNAL( featureDeleted( int ) ) ); + disconnect( mCanvas->currentLayer(), SIGNAL( layerModified( bool ) ) ); } } @@ -103,11 +103,11 @@ void QgsMapToolNodeTool::layerModified( bool onlyGeometry ) { QgsFeature feat; QgsVectorLayer* vlayer = vlayer = dynamic_cast( mCanvas->currentLayer() ); - if (mSelectionFeature != NULL && !mChangingGeometry && (vlayer->featureAtId(mSelectionFeature->featureId(), feat, true, false) ) ) + if ( mSelectionFeature != NULL && !mChangingGeometry && ( vlayer->featureAtId( mSelectionFeature->featureId(), feat, true, false ) ) ) { - if (!GEOSEquals(feat.geometry()->asGeos(), mSelectionFeature->feature()->geometry()->asGeos() ) ) + if ( !GEOSEquals( feat.geometry()->asGeos(), mSelectionFeature->feature()->geometry()->asGeos() ) ) { - qDebug("update from feature"); + qDebug( "update from feature" ); mSelectionFeature->updateFromFeature(); //throw error } @@ -124,16 +124,16 @@ void QgsMapToolNodeTool::createMovingRubberBands() for ( int i = 0; i < vertexMap.size(); i++ ) { //create rubber band - if (vertexMap[i].selected && !(vertexMap[i].inRubberBand) ) + if ( vertexMap[i].selected && !( vertexMap[i].inRubberBand ) ) { - geometry->adjacentVertices(i, beforeVertex, afterVertex); + geometry->adjacentVertices( i, beforeVertex, afterVertex ); vertex = i; - while (beforeVertex != -1) + while ( beforeVertex != -1 ) { //move forward NOTE: end if whole cycle is selected - if (vertexMap[beforeVertex].selected && beforeVertex != i) //and take care of cycles + if ( vertexMap[beforeVertex].selected && beforeVertex != i ) //and take care of cycles { vertex = beforeVertex; - geometry->adjacentVertices(vertex, beforeVertex, afterVertex); + geometry->adjacentVertices( vertex, beforeVertex, afterVertex ); } else { //break @@ -142,32 +142,32 @@ void QgsMapToolNodeTool::createMovingRubberBands() } //we have first vertex of moving part QgsRubberBand* rb = new QgsRubberBand( mCanvas, false ); - rb->setWidth(2); - rb->setColor(Qt::blue); + rb->setWidth( 2 ); + rb->setColor( Qt::blue ); int index = 0; - if (beforeVertex != -1) //adding first point which is not moving + if ( beforeVertex != -1 ) //adding first point which is not moving { rb->addPoint( toMapCoordinates( mCanvas->currentLayer(), vertexMap[beforeVertex].point ), false ); - mSelectionFeature->setRubberBandValues(beforeVertex, true, lastRubberBand, index ); + mSelectionFeature->setRubberBandValues( beforeVertex, true, lastRubberBand, index ); vertexMap[beforeVertex].inRubberBand = true; index ++; } - while (vertex != -1 && vertexMap[vertex].selected && !vertexMap[vertex].inRubberBand) + while ( vertex != -1 && vertexMap[vertex].selected && !vertexMap[vertex].inRubberBand ) { - rb->addPoint(toMapCoordinates( mCanvas->currentLayer(), vertexMap[vertex].point), false); - mSelectionFeature->setRubberBandValues(vertex, true, lastRubberBand, index ); + rb->addPoint( toMapCoordinates( mCanvas->currentLayer(), vertexMap[vertex].point ), false ); + mSelectionFeature->setRubberBandValues( vertex, true, lastRubberBand, index ); vertexMap[vertex].inRubberBand = true; index ++; - geometry->adjacentVertices(vertex, beforeVertex, vertex); + geometry->adjacentVertices( vertex, beforeVertex, vertex ); } - if (vertex != -1 && !vertexMap[vertex].selected) //add last point if exists + if ( vertex != -1 && !vertexMap[vertex].selected ) //add last point if exists { - rb->addPoint(toMapCoordinates( mCanvas->currentLayer(), vertexMap[vertex].point), true); - mSelectionFeature->setRubberBandValues(vertex, true, lastRubberBand, index ); + rb->addPoint( toMapCoordinates( mCanvas->currentLayer(), vertexMap[vertex].point ), true ); + mSelectionFeature->setRubberBandValues( vertex, true, lastRubberBand, index ); vertexMap[vertex].inRubberBand = true; index ++; } - mQgsRubberBands.append(rb); + mQgsRubberBands.append( rb ); lastRubberBand ++; } } @@ -176,7 +176,7 @@ void QgsMapToolNodeTool::createMovingRubberBands() void QgsMapToolNodeTool::coordinatesChanged() { - if (mSelectionFeature != NULL) + if ( mSelectionFeature != NULL ) { mSelectionFeature->updateVertexMarkersPosition( mCanvas ); } @@ -193,28 +193,28 @@ void QgsMapToolNodeTool::canvasMoveEvent( QMouseEvent * e ) vlayer = dynamic_cast( currentLayer ); } - if (mSelectionFeature == NULL) + if ( mSelectionFeature == NULL ) { return; // check that we are able to move something } - if (mClicked) + if ( mClicked ) { mSelectAnother = false; - if (mMoving) + if ( mMoving ) { //create rubberband - if (mQgsRubberBands.empty()) + if ( mQgsRubberBands.empty() ) { - if (mIsPoint) + if ( mIsPoint ) { QList vertexMap = mSelectionFeature->vertexMap(); for ( int i = 0; i < vertexMap.size(); i++ ) { - if (vertexMap[i].selected) + if ( vertexMap[i].selected ) { QgsRubberBand* rb = createRubberBandMarker( vertexMap[i].point, vlayer ); - mQgsRubberBands.append(rb); + mQgsRubberBands.append( rb ); } } } @@ -225,20 +225,20 @@ void QgsMapToolNodeTool::canvasMoveEvent( QMouseEvent * e ) QList snapResults; QgsPoint firstCoords = mCanvas->getCoordinateTransform()->toMapPoint( mLastCoordinates->x(), mLastCoordinates->y() ); QList excludePoints; - excludePoints.append(mClosestVertex); - mSnapper.snapToBackgroundLayers(e->pos(), snapResults, excludePoints); + excludePoints.append( mClosestVertex ); + mSnapper.snapToBackgroundLayers( e->pos(), snapResults, excludePoints ); QgsPoint posMapCoord = snapPointFromResults( snapResults, e->pos() ); - if (snapResults.size() > 0) + if ( snapResults.size() > 0 ) { firstCoords = toMapCoordinates( vlayer, mClosestVertex ); } //special handling of points - if (mIsPoint) + if ( mIsPoint ) { double offsetX = posMapCoord.x() - firstCoords.x(); double offsetY = posMapCoord.y() - firstCoords.y(); - for (int i = 0; i < mQgsRubberBands.size(); i++) + for ( int i = 0; i < mQgsRubberBands.size(); i++ ) { mQgsRubberBands[i]->setTranslationOffset( offsetX, offsetY ); } @@ -250,16 +250,16 @@ void QgsMapToolNodeTool::canvasMoveEvent( QMouseEvent * e ) for ( int i = 0; i < vertexMap.size(); i++ ) { - if (vertexMap[i].selected) + if ( vertexMap[i].selected ) { QgsPoint mapCoords = toMapCoordinates( vlayer, vertexMap[i].point ); double x = mapCoords.x() + posMapCoord.x() - firstCoords.x(); double y = mapCoords.y() + posMapCoord.y() - firstCoords.y(); //QgsPoint pom = toLayerCoordinates( - mQgsRubberBands[vertexMap[i].rubberBandNr]->movePoint( vertexMap[i].index + 1, QgsPoint(x, y)); - if (vertexMap[i].index == 0) + mQgsRubberBands[vertexMap[i].rubberBandNr]->movePoint( vertexMap[i].index + 1, QgsPoint( x, y ) ); + if ( vertexMap[i].index == 0 ) { - mQgsRubberBands[vertexMap[i].rubberBandNr]->movePoint( 0, QgsPoint(x, y)); + mQgsRubberBands[vertexMap[i].rubberBandNr]->movePoint( 0, QgsPoint( x, y ) ); } } } @@ -267,43 +267,43 @@ void QgsMapToolNodeTool::canvasMoveEvent( QMouseEvent * e ) } else { - if (!mSelectionRectangle) + if ( !mSelectionRectangle ) { mSelectionRectangle = true; mQRubberBand = new QRubberBand( QRubberBand::Rectangle, mCanvas ); mRect = new QRect(); - mRect->setTopLeft(QPoint(mLastCoordinates->x(), mLastCoordinates->y())); + mRect->setTopLeft( QPoint( mLastCoordinates->x(), mLastCoordinates->y() ) ); } - mRect->setBottomRight(e->pos()); + mRect->setBottomRight( e->pos() ); QRect normalizedRect = mRect->normalized(); - mQRubberBand->setGeometry(normalizedRect); + mQRubberBand->setGeometry( normalizedRect ); mQRubberBand->show(); } } } -void QgsMapToolNodeTool::connectSignals(QgsVectorLayer* vlayer) +void QgsMapToolNodeTool::connectSignals( QgsVectorLayer* vlayer ) { - connect(vlayer, SIGNAL( featureDeleted(int) ), this, SLOT( featureDeleted(int) ) ); - connect(vlayer, SIGNAL( layerModified( bool ) ), this, SLOT( layerModified( bool ) ) ); + connect( vlayer, SIGNAL( featureDeleted( int ) ), this, SLOT( featureDeleted( int ) ) ); + connect( vlayer, SIGNAL( layerModified( bool ) ), this, SLOT( layerModified( bool ) ) ); } -bool QgsMapToolNodeTool::checkCorrectnessOfFeature(QgsVectorLayer *vlayer) +bool QgsMapToolNodeTool::checkCorrectnessOfFeature( QgsVectorLayer *vlayer ) { QgsFeature feat; - if (!vlayer->featureAtId(mSelectionFeature->featureId(), feat, true, false) ) + if ( !vlayer->featureAtId( mSelectionFeature->featureId(), feat, true, false ) ) { - qDebug("feature doesn't exist any more"); - QMessageBox::warning(NULL, - tr("Node tool"), - tr("Feature was deleted on background.\n"), - QMessageBox::Ok , - QMessageBox::Ok); + qDebug( "feature doesn't exist any more" ); + QMessageBox::warning( NULL, + tr( "Node tool" ), + tr( "Feature was deleted on background.\n" ), + QMessageBox::Ok , + QMessageBox::Ok ); delete mSelectionFeature; mSelectionFeature = NULL; return false; } - if (!GEOSEquals(feat.geometry()->asGeos(), mSelectionFeature->feature()->geometry()->asGeos() ) ) + if ( !GEOSEquals( feat.geometry()->asGeos(), mSelectionFeature->feature()->geometry()->asGeos() ) ) { //update markers mSelectionFeature->updateFromFeature(); @@ -323,55 +323,55 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e ) vlayer = dynamic_cast( currentLayer ); } mClicked = true; - mLastCoordinates = new QgsPoint(e->pos().x(), e->pos().y()); + mLastCoordinates = new QgsPoint( e->pos().x(), e->pos().y() ); QList snapResults; - if (mSelectionFeature == NULL) + if ( mSelectionFeature == NULL ) { mSelectAnother = false; - mSnapper.snapToCurrentLayer(e->pos(), snapResults, QgsSnapper::SnapToVertexAndSegment, -1); + mSnapper.snapToCurrentLayer( e->pos(), snapResults, QgsSnapper::SnapToVertexAndSegment, -1 ); - if (snapResults.size() < 1) + if ( snapResults.size() < 1 ) { - return; - } + return; + } mSelectionFeature = new SelectionFeature(); - mSelectionFeature->setSelectedFeature(snapResults[0].snappedAtGeometry, vlayer, NULL, mCanvas ); - mIsPoint = ((vlayer->dataProvider()->geometryType() == QGis::WKBPoint) || (vlayer->dataProvider()->geometryType() == QGis::WKBMultiPoint)); + mSelectionFeature->setSelectedFeature( snapResults[0].snappedAtGeometry, vlayer, NULL, mCanvas ); + mIsPoint = (( vlayer->dataProvider()->geometryType() == QGis::WKBPoint ) || ( vlayer->dataProvider()->geometryType() == QGis::WKBMultiPoint ) ); connectSignals( vlayer ); } else { //check if feature is not modified from backgound and still exists //Note this code should never be reached signals should handle this error - if (!checkCorrectnessOfFeature(vlayer)) - return; + if ( !checkCorrectnessOfFeature( vlayer ) ) + return; //some feature already selected - QgsPoint mapCoordPoint = mCanvas->getCoordinateTransform()->toMapPoint(e->pos().x(), e->pos().y()); - double tol = QgsTolerance::vertexSearchRadius( vlayer, mCanvas->mapRenderer()); + QgsPoint mapCoordPoint = mCanvas->getCoordinateTransform()->toMapPoint( e->pos().x(), e->pos().y() ); + double tol = QgsTolerance::vertexSearchRadius( vlayer, mCanvas->mapRenderer() ); //get geometry and find if snapping is near it QgsFeature f; - vlayer->featureAtId(mSelectionFeature->featureId(), f, true, false); + vlayer->featureAtId( mSelectionFeature->featureId(), f, true, false ); QgsGeometry* g = f.geometry(); int atVertex, beforeVertex, afterVertex; double dist; - g->closestVertex(toLayerCoordinates(vlayer, mapCoordPoint), atVertex, beforeVertex, afterVertex, dist); - dist = sqrt(dist); + g->closestVertex( toLayerCoordinates( vlayer, mapCoordPoint ), atVertex, beforeVertex, afterVertex, dist ); + dist = sqrt( dist ); - mSnapper.snapToCurrentLayer(e->pos(), snapResults, QgsSnapper::SnapToVertex, tol); + mSnapper.snapToCurrentLayer( e->pos(), snapResults, QgsSnapper::SnapToVertex, tol ); //if (snapResults.size() < 1) - if (dist > tol) + if ( dist > tol ) { //for points only selecting another feature //no vertexes found (selecting or inverting selection) if move //or select another feature if clicked there QgsSnapper::SnappingType snapType = QgsSnapper::SnapToSegment; - if (mIsPoint) + if ( mIsPoint ) { snapType = QgsSnapper::SnapToVertex; } - mSnapper.snapToCurrentLayer(e->pos(), snapResults, snapType, tol); - if (snapResults.size() > 0) + mSnapper.snapToCurrentLayer( e->pos(), snapResults, snapType, tol ); + if ( snapResults.size() > 0 ) { //need to check all if there is a point in my selected feature mAnother = snapResults.first().snappedAtGeometry; @@ -380,7 +380,7 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e ) QgsSnappingResult snapResult; for ( ; it != snapResults.end() ; ++it ) { - if (it->snappedAtGeometry == mSelectionFeature->featureId()) + if ( it->snappedAtGeometry == mSelectionFeature->featureId() ) { snapResult = *it; mAnother = 0; @@ -388,22 +388,22 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e ) break; } } - if (!mSelectAnother) + if ( !mSelectAnother ) { mMoving = true; - QgsPoint point = mCanvas->getCoordinateTransform()->toMapPoint(e->pos().x(), e->pos().y()); - mClosestVertex = getClosestVertex( toLayerCoordinates( vlayer, point) ); - if ( !mSelectionFeature->isSelected( snapResult.beforeVertexNr ) || !mSelectionFeature->isSelected( snapResult.afterVertexNr )) + QgsPoint point = mCanvas->getCoordinateTransform()->toMapPoint( e->pos().x(), e->pos().y() ); + mClosestVertex = getClosestVertex( toLayerCoordinates( vlayer, point ) ); + if ( !mSelectionFeature->isSelected( snapResult.beforeVertexNr ) || !mSelectionFeature->isSelected( snapResult.afterVertexNr ) ) { mSelectionFeature->deselectAllVertexes(); - mSelectionFeature->selectVertex(snapResult.afterVertexNr); - mSelectionFeature->selectVertex(snapResult.beforeVertexNr); + mSelectionFeature->selectVertex( snapResult.afterVertexNr ); + mSelectionFeature->selectVertex( snapResult.beforeVertexNr ); } } } else { - if (!mCtrl) + if ( !mCtrl ) { mSelectionFeature->deselectAllVertexes(); } @@ -413,18 +413,18 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e ) { //some vertex selected mMoving = true; - QgsPoint point = mCanvas->getCoordinateTransform()->toMapPoint(e->pos().x(), e->pos().y()); - mClosestVertex = getClosestVertex( toLayerCoordinates( vlayer, point) ); - if (mMoving) + QgsPoint point = mCanvas->getCoordinateTransform()->toMapPoint( e->pos().x(), e->pos().y() ); + mClosestVertex = getClosestVertex( toLayerCoordinates( vlayer, point ) ); + if ( mMoving ) { - if (mCtrl) + if ( mCtrl ) { //mSelectionFeature->invertVertexSelection( snapResult.snappedVertexNr); mSelectionFeature->invertVertexSelection( atVertex ); } else { - if (!(mSelectionFeature->isSelected( atVertex ))) + if ( !( mSelectionFeature->isSelected( atVertex ) ) ) { mSelectionFeature->deselectAllVertexes(); mSelectionFeature->selectVertex( atVertex ); @@ -444,7 +444,7 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e ) void QgsMapToolNodeTool::canvasReleaseEvent( QMouseEvent * e ) { - if ( mSelectionFeature == NULL) + if ( mSelectionFeature == NULL ) { // no feature is selected return; @@ -463,32 +463,32 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QMouseEvent * e ) //QgsPoint coords = mCanvas->getCoordinateTransform()->toMapPoint( e->pos().x(), e->pos().y() ); //QgsPoint firstCoords = toMapCoordinates( *mLastCoordinates ); QgsPoint firstCoords = mCanvas->getCoordinateTransform()->toMapPoint( mLastCoordinates->x(), mLastCoordinates->y() ); - if (mQRubberBand != NULL) + if ( mQRubberBand != NULL ) { mQRubberBand->close(); delete mQRubberBand; mQRubberBand = NULL; } - if (mLastCoordinates->x() == e->pos().x() && mLastCoordinates->y() == e->pos().y()) + if ( mLastCoordinates->x() == e->pos().x() && mLastCoordinates->y() == e->pos().y() ) { - if (mSelectAnother) + if ( mSelectAnother ) { //select another feature (this should deselect current one ;-) ) - mSelectionFeature->setSelectedFeature( mAnother, vlayer, NULL, mCanvas); - mIsPoint = ((vlayer->dataProvider()->geometryType() == QGis::WKBPoint) || (vlayer->dataProvider()->geometryType() == QGis::WKBMultiPoint)); + mSelectionFeature->setSelectedFeature( mAnother, vlayer, NULL, mCanvas ); + mIsPoint = (( vlayer->dataProvider()->geometryType() == QGis::WKBPoint ) || ( vlayer->dataProvider()->geometryType() == QGis::WKBMultiPoint ) ); mSelectAnother = false; } } else { // coordinates has to be coordinates from layer not canvas - QgsPoint layerCoords = toLayerCoordinates(vlayer, coords); - QgsPoint layerFirstCoords = toLayerCoordinates(vlayer, firstCoords); + QgsPoint layerCoords = toLayerCoordinates( vlayer, coords ); + QgsPoint layerFirstCoords = toLayerCoordinates( vlayer, firstCoords ); - //got correct coordinates + //got correct coordinates double topX; double bottomX; - if (layerCoords.x() > layerFirstCoords.x()) + if ( layerCoords.x() > layerFirstCoords.x() ) { topX = layerFirstCoords.x(); bottomX = layerCoords.x(); @@ -500,7 +500,7 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QMouseEvent * e ) } double leftY; double rightY; - if (layerCoords.y() > layerFirstCoords.y()) + if ( layerCoords.y() > layerFirstCoords.y() ) { leftY = layerFirstCoords.y(); rightY = layerCoords.y(); @@ -510,22 +510,22 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QMouseEvent * e ) leftY = layerCoords.y(); rightY = layerFirstCoords.y(); } - if (mMoving) + if ( mMoving ) { mMoving = false; QList snapResults; QgsPoint firstCoords = mCanvas->getCoordinateTransform()->toMapPoint( mLastCoordinates->x(), mLastCoordinates->y() ); QList excludePoints; - excludePoints.append(mClosestVertex); - mSnapper.snapToBackgroundLayers(e->pos(), snapResults, excludePoints); + excludePoints.append( mClosestVertex ); + mSnapper.snapToBackgroundLayers( e->pos(), snapResults, excludePoints ); coords = snapPointFromResults( snapResults, e->pos() ); //coords = mCanvas->getCoordinateTransform()->toMapPoint( e->pos().x(), e->pos().y() ); - if (snapResults.size() > 0) + if ( snapResults.size() > 0 ) { firstCoords = toMapCoordinates( vlayer, mClosestVertex ); } - QgsPoint layerCoords = toLayerCoordinates(vlayer, coords); - QgsPoint layerFirstCoords = toLayerCoordinates(vlayer, firstCoords); + QgsPoint layerCoords = toLayerCoordinates( vlayer, coords ); + QgsPoint layerFirstCoords = toLayerCoordinates( vlayer, firstCoords ); double changeX = layerCoords.x() - layerFirstCoords.x(); double changeY = layerCoords.y() - layerFirstCoords.y(); mChangingGeometry = true; @@ -541,18 +541,18 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QMouseEvent * e ) { mSelectionFeature->deselectAllVertexes(); } - for ( int i = 0; i < vertexMap.size(); i++) + for ( int i = 0; i < vertexMap.size(); i++ ) { - if (vertexMap[i].point.x() < bottomX && vertexMap[i].point.y() > leftY && vertexMap[i].point.x() > topX && vertexMap[i].point.y() < rightY) + if ( vertexMap[i].point.x() < bottomX && vertexMap[i].point.y() > leftY && vertexMap[i].point.x() > topX && vertexMap[i].point.y() < rightY ) { //inverting selection is enough because all were deselected if ctrl is not pressed - mSelectionFeature->invertVertexSelection(i, false); + mSelectionFeature->invertVertexSelection( i, false ); } } } } mMoving = false; - + removeRubberBands(); mRecentSnappingResults.clear(); @@ -565,8 +565,8 @@ void QgsMapToolNodeTool::deactivate() removeRubberBands(); delete mSelectionFeature; mSelectionFeature = NULL; - disconnect( mCanvas->currentLayer(), SIGNAL( featureDeleted(int) ) ); - disconnect( mCanvas->currentLayer(), SIGNAL( layerModified(bool) ) ); + disconnect( mCanvas->currentLayer(), SIGNAL( featureDeleted( int ) ) ); + disconnect( mCanvas->currentLayer(), SIGNAL( layerModified( bool ) ) ); mQRubberBand = NULL; mSelectAnother = false; @@ -587,7 +587,7 @@ void QgsMapToolNodeTool::removeRubberBands() mQgsRubberBands.clear(); //remove all data from selected feature (no change to rubber bands itself - if (mSelectionFeature != NULL ) + if ( mSelectionFeature != NULL ) mSelectionFeature->cleanRubberBandsData(); } @@ -603,26 +603,26 @@ void QgsMapToolNodeTool::canvasDoubleClickEvent( QMouseEvent * e ) QList snapResults; mMoving = false; - double tol = QgsTolerance::vertexSearchRadius( vlayer, mCanvas->mapRenderer()); - mSnapper.snapToCurrentLayer(e->pos(), snapResults, QgsSnapper::SnapToSegment, tol); - if (snapResults.size() < 1) + double tol = QgsTolerance::vertexSearchRadius( vlayer, mCanvas->mapRenderer() ); + mSnapper.snapToCurrentLayer( e->pos(), snapResults, QgsSnapper::SnapToSegment, tol ); + if ( snapResults.size() < 1 ) { //nowhere to pul vertex } else - { + { //some segment selected - if (snapResults.first().snappedAtGeometry == mSelectionFeature->featureId()) + if ( snapResults.first().snappedAtGeometry == mSelectionFeature->featureId() ) { - if (snapResults.first().snappedVertexNr == -1) + if ( snapResults.first().snappedVertexNr == -1 ) { QgsPoint coords = snapResults.first().snappedVertex; QgsPoint layerCoords = toLayerCoordinates( vlayer, coords ); //QgsPoint coords = mCanvas->getCoordinateTransform()->toMapPoint( e->pos().x(), e->pos().y() ); //add vertex - vlayer->beginEditCommand( tr("Inserted vertex") ); + vlayer->beginEditCommand( tr( "Inserted vertex" ) ); mChangingGeometry = true; - vlayer->insertVertex(layerCoords.x(), layerCoords.y(), mSelectionFeature->featureId(), snapResults.first().afterVertexNr ); + vlayer->insertVertex( layerCoords.x(), layerCoords.y(), mSelectionFeature->featureId(), snapResults.first().afterVertexNr ); vlayer->endEditCommand(); mSelectionFeature->updateFromFeature(); @@ -635,7 +635,7 @@ void QgsMapToolNodeTool::canvasDoubleClickEvent( QMouseEvent * e ) -QgsPoint QgsMapToolNodeTool::getClosestVertex(QgsPoint point) +QgsPoint QgsMapToolNodeTool::getClosestVertex( QgsPoint point ) { int at; int before; @@ -646,7 +646,7 @@ QgsPoint QgsMapToolNodeTool::getClosestVertex(QgsPoint point) void QgsMapToolNodeTool::keyPressEvent( QKeyEvent* e ) { - if (e->key() == Qt::Key_Control) + if ( e->key() == Qt::Key_Control ) { mCtrl = true; } @@ -654,12 +654,12 @@ void QgsMapToolNodeTool::keyPressEvent( QKeyEvent* e ) void QgsMapToolNodeTool::keyReleaseEvent( QKeyEvent* e ) { - if (e->key() == Qt::Key_Control) + if ( e->key() == Qt::Key_Control ) { mCtrl = false; return; } - if (e->key() == Qt::Key_Delete) + if ( e->key() == Qt::Key_Delete ) { mChangingGeometry = true; mSelectionFeature->deleteSelectedVertexes(); @@ -686,17 +686,17 @@ SelectionFeature::~SelectionFeature() void SelectionFeature::updateFeature() { - if (mFeatureSelected) + if ( mFeatureSelected ) { delete mFeature; mFeature = new QgsFeature(); - mVlayer->featureAtId(mFeatureId, *mFeature); + mVlayer->featureAtId( mFeatureId, *mFeature ); } } void SelectionFeature::cleanRubberBandsData() { - for ( int i = 0; i < mVertexMap.size(); i++) + for ( int i = 0; i < mVertexMap.size(); i++ ) { mVertexMap[i].rubberBandNr = 0; mVertexMap[i].index = 0; @@ -704,9 +704,9 @@ void SelectionFeature::cleanRubberBandsData() } } -void SelectionFeature::setSelectedFeature( int featureId, QgsVectorLayer* vlayer, QgsRubberBand* rubberBand, QgsMapCanvas* canvas, QgsFeature* feature) +void SelectionFeature::setSelectedFeature( int featureId, QgsVectorLayer* vlayer, QgsRubberBand* rubberBand, QgsMapCanvas* canvas, QgsFeature* feature ) { - if (mFeatureSelected) + if ( mFeatureSelected ) { deleteVertexMap(); } @@ -715,9 +715,9 @@ void SelectionFeature::setSelectedFeature( int featureId, QgsVectorLayer* vlaye mVlayer = vlayer; mCanvas = canvas; mRubberBand = rubberBand; - if (feature == NULL) + if ( feature == NULL ) { - vlayer->featureAtId(featureId, *mFeature); + vlayer->featureAtId( featureId, *mFeature ); } else { @@ -729,22 +729,22 @@ void SelectionFeature::setSelectedFeature( int featureId, QgsVectorLayer* vlaye void SelectionFeature::deleteSelectedVertexes() { - mVlayer->beginEditCommand( QObject::tr("Deleted vertices") ); + mVlayer->beginEditCommand( QObject::tr( "Deleted vertices" ) ); int count = 0; - for (int i = mVertexMap.size() -1; i > -1 ; i--) + for ( int i = mVertexMap.size() - 1; i > -1 ; i-- ) { - if (mVertexMap[i].selected) + if ( mVertexMap[i].selected ) { - mVlayer->deleteVertex(mFeatureId, i); + mVlayer->deleteVertex( mFeatureId, i ); count++; - if (mVertexMap[i].equals != -1 && !mVertexMap[mVertexMap[i].equals].selected) + if ( mVertexMap[i].equals != -1 && !mVertexMap[mVertexMap[i].equals].selected ) { //for polygon delete both } } } - if (count) + if ( count ) mVlayer->endEditCommand(); else mVlayer->destroyEditCommand(); // no changes... @@ -755,23 +755,23 @@ void SelectionFeature::deleteSelectedVertexes() void SelectionFeature::moveSelectedVertexes( double changeX, double changeY ) { - mVlayer->beginEditCommand( QObject::tr("Moved vertices") ); - for (int i = mVertexMap.size() -1; i > -1 ; i--) + mVlayer->beginEditCommand( QObject::tr( "Moved vertices" ) ); + for ( int i = mVertexMap.size() - 1; i > -1 ; i-- ) { - if (mVertexMap[i].selected) + if ( mVertexMap[i].selected ) { - mVlayer->moveVertex( mVertexMap[i].point.x() + changeX, mVertexMap[i].point.y() + changeY, mFeatureId, i); - mVertexMap[i].point = QgsPoint(mVertexMap[i].point.x() + changeX, mVertexMap[i].point.y() + changeY); + mVlayer->moveVertex( mVertexMap[i].point.x() + changeX, mVertexMap[i].point.y() + changeY, mFeatureId, i ); + mVertexMap[i].point = QgsPoint( mVertexMap[i].point.x() + changeX, mVertexMap[i].point.y() + changeY ); QgsPoint point = mVertexMap[i].point; point = mCanvas->mapRenderer()->layerToMapCoordinates( mVlayer, mVertexMap[i].point ); - mVertexMap[i].vertexMarker->setCenter(point); + mVertexMap[i].vertexMarker->setCenter( point ); mVertexMap[i].vertexMarker->update(); - if (mVertexMap[i].equals != -1 && !mVertexMap[mVertexMap[i].equals].selected) + if ( mVertexMap[i].equals != -1 && !mVertexMap[mVertexMap[i].equals].selected ) { int index = mVertexMap[i].equals; - mVertexMap[index].point = QgsPoint(mVertexMap[index].point.x() + changeX, mVertexMap[index].point.y() + changeY); - mVertexMap[i].vertexMarker->setCenter(point); + mVertexMap[index].point = QgsPoint( mVertexMap[index].point.x() + changeX, mVertexMap[index].point.y() + changeY ); + mVertexMap[i].vertexMarker->setCenter( point ); mVertexMap[i].vertexMarker->update(); //for polygon delete both } @@ -781,9 +781,9 @@ void SelectionFeature::moveSelectedVertexes( double changeX, double changeY ) updateFeature(); } -QgsVertexMarker* SelectionFeature::createVertexMarker(QgsPoint center) +QgsVertexMarker* SelectionFeature::createVertexMarker( QgsPoint center ) { - QgsVertexMarker* marker = new QgsVertexMarker(mCanvas); + QgsVertexMarker* marker = new QgsVertexMarker( mCanvas ); QgsPoint newCenter = mCanvas->mapRenderer()->layerToMapCoordinates( mVlayer, center ); marker->setCenter( newCenter ); @@ -807,14 +807,14 @@ void SelectionFeature::updateFromFeature() void SelectionFeature::deleteVertexMap() { - while (!mVertexMap.empty()) + while ( !mVertexMap.empty() ) { VertexEntry entry = mVertexMap.takeLast(); delete entry.vertexMarker; } } -bool SelectionFeature::isSelected(int vertexNr) +bool SelectionFeature::isSelected( int vertexNr ) { return mVertexMap[vertexNr].selected; } @@ -827,24 +827,24 @@ QgsFeature* SelectionFeature::feature() void SelectionFeature::createVertexMapPolygon() { int y = 0; - if (!mFeature->geometry()->asPolygon().empty()) + if ( !mFeature->geometry()->asPolygon().empty() ) { //polygon - for (int i2 = 0; i2 < mFeature->geometry()->asPolygon().size(); i2++ ) + for ( int i2 = 0; i2 < mFeature->geometry()->asPolygon().size(); i2++ ) { QgsPolyline poly = mFeature->geometry()->asPolygon()[i2]; int i; for ( i = 0; i < poly.size(); i++ ) { - VertexEntry entry; - entry.selected = false; - entry.point = poly[i]; - entry.equals = -1; - entry.rubberBandNr = 0; - entry.originalIndex = i; - entry.inRubberBand = false; - QgsVertexMarker* marker = createVertexMarker(poly[i]); - entry.vertexMarker = marker; - mVertexMap.insert(y + i, entry); + VertexEntry entry; + entry.selected = false; + entry.point = poly[i]; + entry.equals = -1; + entry.rubberBandNr = 0; + entry.originalIndex = i; + entry.inRubberBand = false; + QgsVertexMarker* marker = createVertexMarker( poly[i] ); + entry.vertexMarker = marker; + mVertexMap.insert( y + i, entry ); } mVertexMap[y + i - 1 ].equals = y; mVertexMap[y].equals = y + i - 1; @@ -854,30 +854,30 @@ void SelectionFeature::createVertexMapPolygon() else //multipolygon { //print("Number of polygons: " + str(len(feature.geometry().asMultiPolygon()))) - for (int i2 = 0 ; i2 < mFeature->geometry()->asMultiPolygon().size(); i2++ ) + for ( int i2 = 0 ; i2 < mFeature->geometry()->asMultiPolygon().size(); i2++ ) { QgsPolygon poly2 = mFeature->geometry()->asMultiPolygon()[i2]; - for (int i3 = 0; i3 < poly2.size(); i3++) + for ( int i3 = 0; i3 < poly2.size(); i3++ ) { QgsPolyline poly = poly2[i3]; int i; //print("Number of vertexes:" + str(len(poly))) - for (i = 0; i < poly.size(); i++) + for ( i = 0; i < poly.size(); i++ ) { VertexEntry entry; entry.selected = false; entry.point = poly[i]; entry.equals = -1; entry.rubberBandNr = 0; - entry.originalIndex = y + i -1; + entry.originalIndex = y + i - 1; entry.inRubberBand = false; - QgsVertexMarker* marker = createVertexMarker(poly[i]); + QgsVertexMarker* marker = createVertexMarker( poly[i] ); entry.vertexMarker = marker; - mVertexMap.insert(y + i, entry); + mVertexMap.insert( y + i, entry ); } mVertexMap[y + i - 1].equals = y; - mVertexMap[y].equals = y + i -1; + mVertexMap[y].equals = y + i - 1; y = y + poly.size(); } } @@ -886,33 +886,13 @@ void SelectionFeature::createVertexMapPolygon() void SelectionFeature::createVertexMapLine() { - if (mFeature->geometry()->isMultipart()) - { - int y = 0; - QgsMultiPolyline mLine = mFeature->geometry()->asMultiPolyline(); - for (int i2 = 0; i2 < mLine.size(); i2++ ) - { - QgsPolyline poly = mLine[i2]; - int i; - for ( i = 0; i < poly.size(); i++ ) - { - VertexEntry entry; - entry.selected = false; - entry.point = poly[i]; - entry.equals = -1; - entry.rubberBandNr = 0; - entry.originalIndex = i; - entry.inRubberBand = false; - QgsVertexMarker* marker = createVertexMarker(poly[i]); - entry.vertexMarker = marker; - mVertexMap.insert(y + i, entry); - } - y = y + poly.size(); - } - } - else + if ( mFeature->geometry()->isMultipart() ) + { + int y = 0; + QgsMultiPolyline mLine = mFeature->geometry()->asMultiPolyline(); + for ( int i2 = 0; i2 < mLine.size(); i2++ ) { - QgsPolyline poly = mFeature->geometry()->asPolyline(); + QgsPolyline poly = mLine[i2]; int i; for ( i = 0; i < poly.size(); i++ ) { @@ -923,68 +903,88 @@ void SelectionFeature::createVertexMapLine() entry.rubberBandNr = 0; entry.originalIndex = i; entry.inRubberBand = false; - QgsVertexMarker* marker = createVertexMarker(poly[i]); + QgsVertexMarker* marker = createVertexMarker( poly[i] ); entry.vertexMarker = marker; - mVertexMap.insert(i, entry); + mVertexMap.insert( y + i, entry ); } + y = y + poly.size(); } + } + else + { + QgsPolyline poly = mFeature->geometry()->asPolyline(); + int i; + for ( i = 0; i < poly.size(); i++ ) + { + VertexEntry entry; + entry.selected = false; + entry.point = poly[i]; + entry.equals = -1; + entry.rubberBandNr = 0; + entry.originalIndex = i; + entry.inRubberBand = false; + QgsVertexMarker* marker = createVertexMarker( poly[i] ); + entry.vertexMarker = marker; + mVertexMap.insert( i, entry ); + } + } } void SelectionFeature::createVertexMapPoint() { - if (mFeature->geometry()->isMultipart()) + if ( mFeature->geometry()->isMultipart() ) {//multipoint - QgsMultiPoint poly = mFeature->geometry()->asMultiPoint(); - int i; - for ( i = 0; i < poly.size(); i++ ) - { - VertexEntry entry; - entry.selected = false; - entry.point = poly[i]; - entry.equals = -1; - entry.rubberBandNr = 0; - entry.originalIndex = 1; - entry.inRubberBand = false; - QgsVertexMarker* marker = createVertexMarker(poly[i]); - entry.vertexMarker = marker; - mVertexMap.insert(i, entry); - } - } - else - {//single point - QgsPoint poly = mFeature->geometry()->asPoint(); - VertexEntry entry; - entry.selected = false; - entry.point = poly; - entry.equals = -1; - entry.rubberBandNr = 0; - entry.originalIndex = 1; - entry.inRubberBand = false; - QgsVertexMarker* marker = createVertexMarker(poly); - entry.vertexMarker = marker; - mVertexMap.insert(1, entry); - } + QgsMultiPoint poly = mFeature->geometry()->asMultiPoint(); + int i; + for ( i = 0; i < poly.size(); i++ ) + { + VertexEntry entry; + entry.selected = false; + entry.point = poly[i]; + entry.equals = -1; + entry.rubberBandNr = 0; + entry.originalIndex = 1; + entry.inRubberBand = false; + QgsVertexMarker* marker = createVertexMarker( poly[i] ); + entry.vertexMarker = marker; + mVertexMap.insert( i, entry ); + } + } + else + {//single point + QgsPoint poly = mFeature->geometry()->asPoint(); + VertexEntry entry; + entry.selected = false; + entry.point = poly; + entry.equals = -1; + entry.rubberBandNr = 0; + entry.originalIndex = 1; + entry.inRubberBand = false; + QgsVertexMarker* marker = createVertexMarker( poly ); + entry.vertexMarker = marker; + mVertexMap.insert( 1, entry ); + } } void SelectionFeature::createVertexMap() { - mVlayer->featureAtId(mFeatureId, *mFeature); + mVlayer->featureAtId( mFeatureId, *mFeature ); //createvertexmap - if (mFeature->geometry()->type() == QGis::Polygon) + if ( mFeature->geometry()->type() == QGis::Polygon ) { createVertexMapPolygon(); } - else if (mFeature->geometry()->type() == QGis::Line) + else if ( mFeature->geometry()->type() == QGis::Line ) { createVertexMapLine(); } - else if (mFeature->geometry()->type() == QGis::Point) + else if ( mFeature->geometry()->type() == QGis::Point ) { createVertexMapPoint(); } } -void SelectionFeature::setRubberBandValues(int index, bool inRubberBand, int rubberBandNr, int indexInRubberBand ) +void SelectionFeature::setRubberBandValues( int index, bool inRubberBand, int rubberBandNr, int indexInRubberBand ) { mVertexMap[index].index = indexInRubberBand; mVertexMap[index].inRubberBand = inRubberBand; @@ -994,12 +994,12 @@ void SelectionFeature::setRubberBandValues(int index, bool inRubberBand, int rub void SelectionFeature::selectVertex( int vertexNr ) { mVertexMap[vertexNr].selected = true; - mVertexMap[vertexNr].vertexMarker->setColor(Qt::blue); + mVertexMap[vertexNr].vertexMarker->setColor( Qt::blue ); mVertexMap[vertexNr].vertexMarker->update(); - if (mVertexMap[vertexNr].equals != -1) + if ( mVertexMap[vertexNr].equals != -1 ) { mVertexMap[mVertexMap[vertexNr].equals].selected = true; - mVertexMap[mVertexMap[vertexNr].equals].vertexMarker->setColor(Qt::blue); + mVertexMap[mVertexMap[vertexNr].equals].vertexMarker->setColor( Qt::blue ); mVertexMap[mVertexMap[vertexNr].equals].vertexMarker->update(); } @@ -1009,17 +1009,17 @@ void SelectionFeature::selectVertex( int vertexNr ) void SelectionFeature::deselectVertex( int vertexNr ) { mVertexMap[vertexNr].selected = false; - mVertexMap[vertexNr].vertexMarker->setColor(Qt::red); + mVertexMap[vertexNr].vertexMarker->setColor( Qt::red ); mVertexMap[vertexNr].vertexMarker->update(); } void SelectionFeature::deselectAllVertexes() { - for (int i = 0; i < mVertexMap.size() ;i++) + for ( int i = 0; i < mVertexMap.size() ;i++ ) { mVertexMap[i].selected = false; - mVertexMap[i].vertexMarker->setColor(Qt::red); + mVertexMap[i].vertexMarker->setColor( Qt::red ); mVertexMap[i].vertexMarker->update(); } } @@ -1027,27 +1027,27 @@ void SelectionFeature::deselectAllVertexes() void SelectionFeature::invertVertexSelection( int vertexNr, bool invert ) { - if (mVertexMap[vertexNr].selected == false) + if ( mVertexMap[vertexNr].selected == false ) { mVertexMap[vertexNr].selected = true; - mVertexMap[vertexNr].vertexMarker->setColor(Qt::blue); + mVertexMap[vertexNr].vertexMarker->setColor( Qt::blue ); mVertexMap[vertexNr].vertexMarker->update(); - if (mVertexMap[vertexNr].equals != -1 && invert) + if ( mVertexMap[vertexNr].equals != -1 && invert ) { mVertexMap[mVertexMap[vertexNr].equals].selected = true; - mVertexMap[mVertexMap[vertexNr].equals].vertexMarker->setColor(Qt::blue); + mVertexMap[mVertexMap[vertexNr].equals].vertexMarker->setColor( Qt::blue ); mVertexMap[mVertexMap[vertexNr].equals].vertexMarker->update(); } } else { mVertexMap[vertexNr].selected = false; - mVertexMap[vertexNr].vertexMarker->setColor(Qt::red); + mVertexMap[vertexNr].vertexMarker->setColor( Qt::red ); mVertexMap[vertexNr].vertexMarker->update(); - if (mVertexMap[vertexNr].equals != -1 && invert) + if ( mVertexMap[vertexNr].equals != -1 && invert ) { mVertexMap[mVertexMap[vertexNr].equals].selected = false; - mVertexMap[mVertexMap[vertexNr].equals].vertexMarker->setColor(Qt::red); + mVertexMap[mVertexMap[vertexNr].equals].vertexMarker->setColor( Qt::red ); mVertexMap[mVertexMap[vertexNr].equals].vertexMarker->update(); } } @@ -1056,7 +1056,7 @@ void SelectionFeature::invertVertexSelection( int vertexNr, bool invert ) void SelectionFeature::updateVertexMarkersPosition( QgsMapCanvas* canvas ) { - for (int i=0; i< mVertexMap.size() ;i++) + for ( int i = 0; i < mVertexMap.size() ;i++ ) { mVertexMap[i].vertexMarker->setCenter( mCanvas->mapRenderer()->layerToMapCoordinates( mVlayer, mVertexMap[i].point ) ); mVertexMap[i].vertexMarker->update(); diff --git a/src/app/qgsmaptoolnodetool.h b/src/app/qgsmaptoolnodetool.h index a84eb2e58961..91d4d6e3117e 100644 --- a/src/app/qgsmaptoolnodetool.h +++ b/src/app/qgsmaptoolnodetool.h @@ -27,17 +27,17 @@ class QgsRubberBand; /** * Structure to store entry about vertex of the feature */ -struct VertexEntry +struct VertexEntry { - bool selected; - QgsPoint point; - int equals; - //QgsRubberBand *vertexMarker; - QgsVertexMarker* vertexMarker; - bool inRubberBand; - int rubberBandNr; - int index; - int originalIndex; + bool selected; + QgsPoint point; + int equals; + //QgsRubberBand *vertexMarker; + QgsVertexMarker* vertexMarker; + bool inRubberBand; + int rubberBandNr; + int index; + int originalIndex; }; /** @@ -58,7 +58,7 @@ class SelectionFeature * @param canvas mapCanvas on which we are working * @param feature feature with which we work this parameter is not mandatory if it's not filled feature will be loaded */ - void setSelectedFeature( int featureId, QgsVectorLayer* vlayer, QgsRubberBand* rubberBand, QgsMapCanvas* canvas, QgsFeature* feature = NULL); + void setSelectedFeature( int featureId, QgsVectorLayer* vlayer, QgsRubberBand* rubberBand, QgsMapCanvas* canvas, QgsFeature* feature = NULL ); /** * Function to select vertex with number @@ -99,14 +99,14 @@ class SelectionFeature * Updates vertex markers position accoording to changed feature geometry * @param canvas map canvas we are working with */ - void updateVertexMarkersPosition( QgsMapCanvas* canvas); + void updateVertexMarkersPosition( QgsMapCanvas* canvas ); /** * Tells if vertex is selected * @param vertexNr number of vertex for which we are getting info * @return true if vertex is selected, false otherwise */ - bool isSelected(int vertexNr); + bool isSelected( int vertexNr ); /** * Getting feature Id of feature selected @@ -138,7 +138,7 @@ class SelectionFeature * @param rubberBandNr number of geometry (rubber band) in which this vertex should be) * @param indexInRubberBand */ - void setRubberBandValues(int index, bool inRubberBand, int rubberBandNr, int indexInRubberBand ); + void setRubberBandValues( int index, bool inRubberBand, int rubberBandNr, int indexInRubberBand ); /** * Clears data about vertexes if they are in rubber band for moving etc. @@ -150,7 +150,7 @@ class SelectionFeature * @param center center of marker * @return created vertex marker */ - QgsVertexMarker* createVertexMarker(QgsPoint center); + QgsVertexMarker* createVertexMarker( QgsPoint center ); /** * Getter for getting vector layer which selection is working @@ -226,14 +226,14 @@ class QgsMapToolNodeTool: public QgsMapToolVertexEdit /** * Returns closest vertex to given point from selected feature */ - QgsPoint getClosestVertex(QgsPoint point); + QgsPoint getClosestVertex( QgsPoint point ); public slots: /** * Slot to count with layer change * @param layer layer to which selection changed */ - void currentLayerChanged( QgsMapLayer* layer); + void currentLayerChanged( QgsMapLayer* layer ); protected slots: /** @@ -260,7 +260,7 @@ class QgsMapToolNodeTool: public QgsMapToolVertexEdit private: - void connectSignals(QgsVectorLayer* vlayer); + void connectSignals( QgsVectorLayer* vlayer ); /** Deletes the rubber band pointers and clears mRubberBands*/ @@ -271,13 +271,13 @@ class QgsMapToolNodeTool: public QgsMapToolVertexEdit * @param center coordinates of point to be moved * @param vlayer vector layer on which we are working */ - QgsRubberBand* createRubberBandMarker(QgsPoint center, QgsVectorLayer* vlayer); + QgsRubberBand* createRubberBandMarker( QgsPoint center, QgsVectorLayer* vlayer ); /** * Function to check if selected feature exists and is same with original one * @param vlayer vector layer for checking */ - bool checkCorrectnessOfFeature(QgsVectorLayer* vlayer); + bool checkCorrectnessOfFeature( QgsVectorLayer* vlayer ); /** * Creates rubberbands for moving points diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp index 1c9920b01fca..1c6bb9e5c997 100644 --- a/src/app/qgsmaptoolsimplify.cpp +++ b/src/app/qgsmaptoolsimplify.cpp @@ -111,7 +111,7 @@ void QgsMapToolSimplify::storeSimplified() QgsSimplifyFeature::simplifyPolygon( mSelectedFeature, mTolerance ); } - vlayer->beginEditCommand( tr("Geometry simplified") ); + vlayer->beginEditCommand( tr( "Geometry simplified" ) ); vlayer->changeGeometry( mSelectedFeature.id(), mSelectedFeature.geometry() ); vlayer->endEditCommand(); diff --git a/src/app/qgsmaptoolsplitfeatures.cpp b/src/app/qgsmaptoolsplitfeatures.cpp index 2a2aeb3e5e6f..1e1892fec379 100644 --- a/src/app/qgsmaptoolsplitfeatures.cpp +++ b/src/app/qgsmaptoolsplitfeatures.cpp @@ -79,7 +79,7 @@ void QgsMapToolSplitFeatures::canvasReleaseEvent( QMouseEvent * e ) //bring up dialog if a split was not possible (polygon) or only done once (line) int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 ); - vlayer->beginEditCommand( tr("Features split") ); + vlayer->beginEditCommand( tr( "Features split" ) ); int returnCode = vlayer->splitFeatures( mCaptureList, topologicalEditing ); vlayer->endEditCommand(); if ( returnCode == 4 ) diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp index a014b7bccc2f..076ee3e5c1ed 100644 --- a/src/app/qgsmergeattributesdialog.cpp +++ b/src/app/qgsmergeattributesdialog.cpp @@ -25,381 +25,381 @@ #include #include -QgsMergeAttributesDialog::QgsMergeAttributesDialog(const QgsFeatureList& features, QgsVectorLayer* vl, QgsMapCanvas* canvas, QWidget * parent, Qt::WindowFlags f): QDialog(parent, f), mFeatureList(features), mVectorLayer(vl), mMapCanvas(canvas), mSelectionRubberBand(0) +QgsMergeAttributesDialog::QgsMergeAttributesDialog( const QgsFeatureList& features, QgsVectorLayer* vl, QgsMapCanvas* canvas, QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f ), mFeatureList( features ), mVectorLayer( vl ), mMapCanvas( canvas ), mSelectionRubberBand( 0 ) { - setupUi(this); - createTableWidgetContents(); + setupUi( this ); + createTableWidgetContents(); - QHeaderView* verticalHeader = mTableWidget->verticalHeader(); - if(verticalHeader) - { - QObject::connect(mTableWidget, SIGNAL(itemSelectionChanged ()), this, SLOT(selectedRowChanged())); - } - mTableWidget->setSelectionBehavior(QAbstractItemView::SelectRows); - mTableWidget->setSelectionMode(QAbstractItemView::SingleSelection); + QHeaderView* verticalHeader = mTableWidget->verticalHeader(); + if ( verticalHeader ) + { + QObject::connect( mTableWidget, SIGNAL( itemSelectionChanged() ), this, SLOT( selectedRowChanged() ) ); + } + mTableWidget->setSelectionBehavior( QAbstractItemView::SelectRows ); + mTableWidget->setSelectionMode( QAbstractItemView::SingleSelection ); - mFromSelectedPushButton->setIcon(QgisApp::getThemeIcon("mActionFromSelectedFeature.png")); - mRemoveFeatureFromSelectionButton->setIcon(QgisApp::getThemeIcon("mActionRemoveSelectedFeature.png")); + mFromSelectedPushButton->setIcon( QgisApp::getThemeIcon( "mActionFromSelectedFeature.png" ) ); + mRemoveFeatureFromSelectionButton->setIcon( QgisApp::getThemeIcon( "mActionRemoveSelectedFeature.png" ) ); } QgsMergeAttributesDialog::QgsMergeAttributesDialog(): QDialog() { - setupUi(this); + setupUi( this ); } QgsMergeAttributesDialog::~QgsMergeAttributesDialog() { - delete mSelectionRubberBand; + delete mSelectionRubberBand; } void QgsMergeAttributesDialog::createTableWidgetContents() { - //get information about attributes from vector layer - if(!mVectorLayer) - { - return; - } - const QgsFieldMap& fieldMap = mVectorLayer->pendingFields(); + //get information about attributes from vector layer + if ( !mVectorLayer ) + { + return; + } + const QgsFieldMap& fieldMap = mVectorLayer->pendingFields(); - //combo box row, attributes titles, feature values and current merge results - mTableWidget->setRowCount(mFeatureList.size() + 2); - mTableWidget->setColumnCount(fieldMap.size()); + //combo box row, attributes titles, feature values and current merge results + mTableWidget->setRowCount( mFeatureList.size() + 2 ); + mTableWidget->setColumnCount( fieldMap.size() ); - //create combo boxes - for(int i = 0; i < fieldMap.size(); ++i) - { - mTableWidget->setCellWidget(0, i, createMergeComboBox(fieldMap[i].type())); - } + //create combo boxes + for ( int i = 0; i < fieldMap.size(); ++i ) + { + mTableWidget->setCellWidget( 0, i, createMergeComboBox( fieldMap[i].type() ) ); + } - QgsFieldMap::const_iterator fieldIt = fieldMap.constBegin(); + QgsFieldMap::const_iterator fieldIt = fieldMap.constBegin(); - //insert attribute names - QStringList horizontalHeaderLabels; - for(; fieldIt != fieldMap.constEnd(); ++fieldIt) - { - horizontalHeaderLabels << fieldIt.value().name(); - } - mTableWidget->setHorizontalHeaderLabels(horizontalHeaderLabels); + //insert attribute names + QStringList horizontalHeaderLabels; + for ( ; fieldIt != fieldMap.constEnd(); ++fieldIt ) + { + horizontalHeaderLabels << fieldIt.value().name(); + } + mTableWidget->setHorizontalHeaderLabels( horizontalHeaderLabels ); - //insert the attribute values - int currentRow = 1; - QStringList verticalHeaderLabels; //the id column is in the - verticalHeaderLabels << tr("Id"); + //insert the attribute values + int currentRow = 1; + QStringList verticalHeaderLabels; //the id column is in the + verticalHeaderLabels << tr( "Id" ); - for(int i = 0; i < mFeatureList.size(); ++i) - { - verticalHeaderLabels << QString::number(mFeatureList[i].id()); - QgsAttributeMap currentAttributeMap = mFeatureList[i].attributeMap(); - QgsAttributeMap::const_iterator currentMapIt = currentAttributeMap.constBegin(); - int col = 0; - for(; currentMapIt != currentAttributeMap.constEnd(); ++currentMapIt) - { - QTableWidgetItem* attributeValItem = new QTableWidgetItem(currentMapIt.value().toString()); - attributeValItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable); - mTableWidget->setItem(currentRow, col, attributeValItem); - ++col; - } - ++currentRow; - } + for ( int i = 0; i < mFeatureList.size(); ++i ) + { + verticalHeaderLabels << QString::number( mFeatureList[i].id() ); + QgsAttributeMap currentAttributeMap = mFeatureList[i].attributeMap(); + QgsAttributeMap::const_iterator currentMapIt = currentAttributeMap.constBegin(); + int col = 0; + for ( ; currentMapIt != currentAttributeMap.constEnd(); ++currentMapIt ) + { + QTableWidgetItem* attributeValItem = new QTableWidgetItem( currentMapIt.value().toString() ); + attributeValItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable ); + mTableWidget->setItem( currentRow, col, attributeValItem ); + ++col; + } + ++currentRow; + } - //merge - verticalHeaderLabels << tr("Merge"); - mTableWidget->setVerticalHeaderLabels(verticalHeaderLabels); + //merge + verticalHeaderLabels << tr( "Merge" ); + mTableWidget->setVerticalHeaderLabels( verticalHeaderLabels ); - //insert currently merged values - for(int i = 0; i < fieldMap.size(); ++i) - { - refreshMergedValue(i); - } + //insert currently merged values + for ( int i = 0; i < fieldMap.size(); ++i ) + { + refreshMergedValue( i ); + } } -QComboBox* QgsMergeAttributesDialog::createMergeComboBox(QVariant::Type columnType) const +QComboBox* QgsMergeAttributesDialog::createMergeComboBox( QVariant::Type columnType ) const { - QComboBox* newComboBox = new QComboBox(); - //add items for feature - QgsFeatureList::const_iterator f_it = mFeatureList.constBegin(); - for(; f_it != mFeatureList.constEnd(); ++f_it) - { - newComboBox->addItem(tr("feature %1").arg(f_it->id())); - } + QComboBox* newComboBox = new QComboBox(); + //add items for feature + QgsFeatureList::const_iterator f_it = mFeatureList.constBegin(); + for ( ; f_it != mFeatureList.constEnd(); ++f_it ) + { + newComboBox->addItem( tr( "feature %1" ).arg( f_it->id() ) ); + } - if(columnType == QVariant::Double || columnType == QVariant::Int) - { - newComboBox->addItem(tr("Minimum")); - newComboBox->addItem(tr("Maximum")); - newComboBox->addItem(tr("Median")); - } - else if(columnType == QVariant::String) - { - newComboBox->addItem(tr("Concatenation")); - } - if(columnType == QVariant::Double) - { - newComboBox->addItem(tr("Mean")); - } + if ( columnType == QVariant::Double || columnType == QVariant::Int ) + { + newComboBox->addItem( tr( "Minimum" ) ); + newComboBox->addItem( tr( "Maximum" ) ); + newComboBox->addItem( tr( "Median" ) ); + } + else if ( columnType == QVariant::String ) + { + newComboBox->addItem( tr( "Concatenation" ) ); + } + if ( columnType == QVariant::Double ) + { + newComboBox->addItem( tr( "Mean" ) ); + } - QObject::connect(newComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(comboValueChanged(const QString&))); - return newComboBox; + QObject::connect( newComboBox, SIGNAL( currentIndexChanged( const QString& ) ), this, SLOT( comboValueChanged( const QString& ) ) ); + return newComboBox; } -int QgsMergeAttributesDialog::findComboColumn(QComboBox* c) const +int QgsMergeAttributesDialog::findComboColumn( QComboBox* c ) const { - for(int i = 0; i < mTableWidget->columnCount(); ++i) + for ( int i = 0; i < mTableWidget->columnCount(); ++i ) + { + if ( mTableWidget->cellWidget( 0, i ) == c ) { - if(mTableWidget->cellWidget(0, i) == c) - { - return i; - } + return i; } - return -1; + } + return -1; } -void QgsMergeAttributesDialog::comboValueChanged(const QString & text) +void QgsMergeAttributesDialog::comboValueChanged( const QString & text ) { - QComboBox* senderComboBox = dynamic_cast(sender()); - if(!senderComboBox) - { - return; - } - int column = findComboColumn(senderComboBox); - refreshMergedValue(column); + QComboBox* senderComboBox = dynamic_cast( sender() ); + if ( !senderComboBox ) + { + return; + } + int column = findComboColumn( senderComboBox ); + refreshMergedValue( column ); } void QgsMergeAttributesDialog::selectedRowChanged() { - //find out selected row - QList selectionList = mTableWidget->selectedItems(); - if(selectionList.size() < 1) - { - delete mSelectionRubberBand; - mSelectionRubberBand = 0; - return; - } + //find out selected row + QList selectionList = mTableWidget->selectedItems(); + if ( selectionList.size() < 1 ) + { + delete mSelectionRubberBand; + mSelectionRubberBand = 0; + return; + } - int row = selectionList[0]->row(); + int row = selectionList[0]->row(); - if(!mTableWidget || !mMapCanvas || !mVectorLayer || row < 1 || row >= (mTableWidget->rowCount())) - { - return; - } + if ( !mTableWidget || !mMapCanvas || !mVectorLayer || row < 1 || row >= ( mTableWidget->rowCount() ) ) + { + return; + } - //read the feature id - QTableWidgetItem* idItem = mTableWidget->verticalHeaderItem(row); - if(!idItem) - { - return; - } + //read the feature id + QTableWidgetItem* idItem = mTableWidget->verticalHeaderItem( row ); + if ( !idItem ) + { + return; + } - bool conversionSuccess = false; - int featureIdToSelect = idItem->text().toInt(&conversionSuccess); - if(!conversionSuccess) - { - //the merge result row was selected - delete mSelectionRubberBand; - mSelectionRubberBand = 0; - return; - } - createRubberBandForFeature(featureIdToSelect); + bool conversionSuccess = false; + int featureIdToSelect = idItem->text().toInt( &conversionSuccess ); + if ( !conversionSuccess ) + { + //the merge result row was selected + delete mSelectionRubberBand; + mSelectionRubberBand = 0; + return; + } + createRubberBandForFeature( featureIdToSelect ); } -void QgsMergeAttributesDialog::refreshMergedValue(int col) +void QgsMergeAttributesDialog::refreshMergedValue( int col ) { - //get QComboBox - QWidget* cellWidget = mTableWidget->cellWidget(0, col); - if(!cellWidget) - { - return; - } - QComboBox* comboBox = dynamic_cast(cellWidget); - if(!comboBox) - { - return; - } + //get QComboBox + QWidget* cellWidget = mTableWidget->cellWidget( 0, col ); + if ( !cellWidget ) + { + return; + } + QComboBox* comboBox = dynamic_cast( cellWidget ); + if ( !comboBox ) + { + return; + } - //evaluate behaviour (feature value or min / max / mean ) - QString mergeBehaviourString = comboBox->currentText(); - QString evalText; //text that has to be inserted into merge result field - if(mergeBehaviourString == tr("Minimum")) - { - evalText = minimumAttributeString(col); - } - else if(mergeBehaviourString == tr("Maximum")) - { - evalText = maximumAttributeString(col); - } - else if(mergeBehaviourString == tr("Mean")) - { - evalText = meanAttributeString(col); - } - else if(mergeBehaviourString == tr("Median")) - { - evalText = medianAttributeString(col); - } - else if(mergeBehaviourString == tr("Concatenation")) - { - evalText = concatenationAttributeString(col); - } - else //an existing feature value - { - int featureId = mergeBehaviourString.split(" ").at(1).toInt(); //probably not very robust for translations... - evalText = featureAttributeString(featureId, col); - } + //evaluate behaviour (feature value or min / max / mean ) + QString mergeBehaviourString = comboBox->currentText(); + QString evalText; //text that has to be inserted into merge result field + if ( mergeBehaviourString == tr( "Minimum" ) ) + { + evalText = minimumAttributeString( col ); + } + else if ( mergeBehaviourString == tr( "Maximum" ) ) + { + evalText = maximumAttributeString( col ); + } + else if ( mergeBehaviourString == tr( "Mean" ) ) + { + evalText = meanAttributeString( col ); + } + else if ( mergeBehaviourString == tr( "Median" ) ) + { + evalText = medianAttributeString( col ); + } + else if ( mergeBehaviourString == tr( "Concatenation" ) ) + { + evalText = concatenationAttributeString( col ); + } + else //an existing feature value + { + int featureId = mergeBehaviourString.split( " " ).at( 1 ).toInt(); //probably not very robust for translations... + evalText = featureAttributeString( featureId, col ); + } - //insert string into table widget - QTableWidgetItem* newTotalItem = new QTableWidgetItem(evalText); - newTotalItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable); - mTableWidget->setItem(mTableWidget->rowCount() - 1, col, newTotalItem); + //insert string into table widget + QTableWidgetItem* newTotalItem = new QTableWidgetItem( evalText ); + newTotalItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable ); + mTableWidget->setItem( mTableWidget->rowCount() - 1, col, newTotalItem ); } -QString QgsMergeAttributesDialog::featureAttributeString(int featureId, int col) +QString QgsMergeAttributesDialog::featureAttributeString( int featureId, int col ) { - QString resultText; - for(int i = 0; i < mFeatureList.size(); ++i) - { - int currentFid = mFeatureList[i].id(); - if(currentFid == featureId) - { - QTableWidgetItem* currentItem = mTableWidget->item(i+1, col); - if(!currentItem) - { - continue; - } - resultText = currentItem->text(); - } - } - return resultText; + QString resultText; + for ( int i = 0; i < mFeatureList.size(); ++i ) + { + int currentFid = mFeatureList[i].id(); + if ( currentFid == featureId ) + { + QTableWidgetItem* currentItem = mTableWidget->item( i + 1, col ); + if ( !currentItem ) + { + continue; + } + resultText = currentItem->text(); + } + } + return resultText; } -QString QgsMergeAttributesDialog::minimumAttributeString(int col) +QString QgsMergeAttributesDialog::minimumAttributeString( int col ) { - double minimumValue = std::numeric_limits::max(); - double currentValue; - bool conversion = false; - int numberOfConsideredFeatures = 0; + double minimumValue = std::numeric_limits::max(); + double currentValue; + bool conversion = false; + int numberOfConsideredFeatures = 0; - for(int i = 0; i < mFeatureList.size(); ++i) + for ( int i = 0; i < mFeatureList.size(); ++i ) + { + currentValue = mTableWidget->item( i + 1, col )->text().toDouble( &conversion ); + if ( conversion ) { - currentValue = mTableWidget->item(i+1, col)->text().toDouble(&conversion); - if(conversion) - { - if(currentValue < minimumValue) - { - minimumValue = currentValue; - ++numberOfConsideredFeatures; - } - } + if ( currentValue < minimumValue ) + { + minimumValue = currentValue; + ++numberOfConsideredFeatures; + } } + } - if(numberOfConsideredFeatures < 1) - { - return QString(); - } + if ( numberOfConsideredFeatures < 1 ) + { + return QString(); + } - return QString::number(minimumValue, 'f'); + return QString::number( minimumValue, 'f' ); } -QString QgsMergeAttributesDialog::maximumAttributeString(int col) +QString QgsMergeAttributesDialog::maximumAttributeString( int col ) { - double maximumValue = -std::numeric_limits::max(); - double currentValue; - bool conversion = false; - int numberOfConsideredFeatures = 0; + double maximumValue = -std::numeric_limits::max(); + double currentValue; + bool conversion = false; + int numberOfConsideredFeatures = 0; - for(int i = 0; i < mFeatureList.size(); ++i) + for ( int i = 0; i < mFeatureList.size(); ++i ) + { + currentValue = mTableWidget->item( i + 1, col )->text().toDouble( &conversion ); + if ( conversion ) { - currentValue = mTableWidget->item(i+1, col)->text().toDouble(&conversion); - if(conversion) - { - if(currentValue > maximumValue) - { - maximumValue = currentValue; - ++numberOfConsideredFeatures; - } - } + if ( currentValue > maximumValue ) + { + maximumValue = currentValue; + ++numberOfConsideredFeatures; + } } + } - if(numberOfConsideredFeatures < 1) - { - return QString(); - } + if ( numberOfConsideredFeatures < 1 ) + { + return QString(); + } - return QString::number(maximumValue, 'f'); + return QString::number( maximumValue, 'f' ); } -QString QgsMergeAttributesDialog::meanAttributeString(int col) +QString QgsMergeAttributesDialog::meanAttributeString( int col ) { - int numberOfConsideredFeatures = 0; - double currentValue; - double sum = 0; - bool conversion = false; + int numberOfConsideredFeatures = 0; + double currentValue; + double sum = 0; + bool conversion = false; - for(int i = 0; i < mFeatureList.size(); ++i) + for ( int i = 0; i < mFeatureList.size(); ++i ) + { + currentValue = mTableWidget->item( i + 1, col )->text().toDouble( &conversion ); + if ( conversion ) { - currentValue = mTableWidget->item(i+1, col)->text().toDouble(&conversion); - if(conversion) - { - sum += currentValue; - ++numberOfConsideredFeatures; - } + sum += currentValue; + ++numberOfConsideredFeatures; } - double mean = sum / numberOfConsideredFeatures; - return QString::number(mean, 'f'); + } + double mean = sum / numberOfConsideredFeatures; + return QString::number( mean, 'f' ); } -QString QgsMergeAttributesDialog::medianAttributeString(int col) +QString QgsMergeAttributesDialog::medianAttributeString( int col ) { - //bring all values into a list and sort - QList valueList; - double currentValue; - bool conversionSuccess; + //bring all values into a list and sort + QList valueList; + double currentValue; + bool conversionSuccess; - for(int i = 0; i < mFeatureList.size(); ++i) + for ( int i = 0; i < mFeatureList.size(); ++i ) + { + currentValue = mTableWidget->item( i + 1, col )->text().toDouble( &conversionSuccess ); + if ( !conversionSuccess ) { - currentValue = mTableWidget->item(i+1, col)->text().toDouble(&conversionSuccess); - if(!conversionSuccess) - { - continue; - } - valueList.push_back(currentValue); + continue; } - qSort(valueList); + valueList.push_back( currentValue ); + } + qSort( valueList ); - double medianValue; - int size = valueList.size(); - bool even = (size % 2) < 1; - if(even) - { - medianValue = (valueList[size / 2 - 1] + valueList[size / 2]) / 2; - } - else //odd - { - medianValue = valueList[(size + 1) / 2 - 1]; - } - return QString::number(medianValue, 'f'); + double medianValue; + int size = valueList.size(); + bool even = ( size % 2 ) < 1; + if ( even ) + { + medianValue = ( valueList[size / 2 - 1] + valueList[size / 2] ) / 2; + } + else //odd + { + medianValue = valueList[( size + 1 ) / 2 - 1]; + } + return QString::number( medianValue, 'f' ); } -QString QgsMergeAttributesDialog::concatenationAttributeString(int col) +QString QgsMergeAttributesDialog::concatenationAttributeString( int col ) { QStringList concatString; - for(int i = 0; i < mFeatureList.size(); ++i) - { - concatString << mTableWidget->item(i+1, col)->text(); - } - return concatString.join(","); //todo: make separator user configurable + for ( int i = 0; i < mFeatureList.size(); ++i ) + { + concatString << mTableWidget->item( i + 1, col )->text(); + } + return concatString.join( "," ); //todo: make separator user configurable } void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked() { - //find the selected feature - if(!mVectorLayer) + //find the selected feature + if ( !mVectorLayer ) { return; } //find out feature id of selected row QList selectionList = mTableWidget->selectedItems(); - if(selectionList.size() < 1) + if ( selectionList.size() < 1 ) { return; } @@ -407,39 +407,39 @@ void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked() //assume all selected items to be in the same row QTableWidgetItem* selectedItem = selectionList[0]; int selectedRow = selectedItem->row(); - QTableWidgetItem* selectedHeaderItem = mTableWidget->verticalHeaderItem(selectedRow); - if(!selectedHeaderItem) + QTableWidgetItem* selectedHeaderItem = mTableWidget->verticalHeaderItem( selectedRow ); + if ( !selectedHeaderItem ) { return; } bool conversionSuccess; - int featureId = selectedHeaderItem->text().toInt(&conversionSuccess); - if(!conversionSuccess) + int featureId = selectedHeaderItem->text().toInt( &conversionSuccess ); + if ( !conversionSuccess ) { return; } - for(int i = 0; i < mTableWidget->columnCount(); ++i) + for ( int i = 0; i < mTableWidget->columnCount(); ++i ) { - QComboBox* currentComboBox = dynamic_cast(mTableWidget->cellWidget(0, i)); - if(currentComboBox) + QComboBox* currentComboBox = dynamic_cast( mTableWidget->cellWidget( 0, i ) ); + if ( currentComboBox ) { - currentComboBox->setCurrentIndex(currentComboBox->findText(tr("feature %1").arg(featureId))); + currentComboBox->setCurrentIndex( currentComboBox->findText( tr( "feature %1" ).arg( featureId ) ) ); } } } void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked() { - if(!mVectorLayer) + if ( !mVectorLayer ) { return; } //find out feature id of selected row QList selectionList = mTableWidget->selectedItems(); - if(selectionList.size() < 1) + if ( selectionList.size() < 1 ) { return; } @@ -447,86 +447,86 @@ void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked() //assume all selected items to be in the same row QTableWidgetItem* selectedItem = selectionList[0]; int selectedRow = selectedItem->row(); - QTableWidgetItem* selectedHeaderItem = mTableWidget->verticalHeaderItem(selectedRow); - if(!selectedHeaderItem) + QTableWidgetItem* selectedHeaderItem = mTableWidget->verticalHeaderItem( selectedRow ); + if ( !selectedHeaderItem ) { return; } bool conversionSuccess; - int featureId = selectedHeaderItem->text().toInt(&conversionSuccess); - if(!conversionSuccess) + int featureId = selectedHeaderItem->text().toInt( &conversionSuccess ); + if ( !conversionSuccess ) { selectedRowChanged(); return; } - mTableWidget->removeRow(selectedRow); + mTableWidget->removeRow( selectedRow ); selectedRowChanged(); //remove feature from the vector layer selection QgsFeatureIds selectedIds = mVectorLayer->selectedFeaturesIds(); - selectedIds.remove(featureId); - mVectorLayer->setSelectedFeatures(selectedIds); + selectedIds.remove( featureId ); + mVectorLayer->setSelectedFeatures( selectedIds ); mMapCanvas->repaint(); //remove feature option from the combo box (without altering the current merge values) - for(int i = 0; i < mTableWidget->columnCount(); ++i) + for ( int i = 0; i < mTableWidget->columnCount(); ++i ) { - QComboBox* currentComboBox = dynamic_cast(mTableWidget->cellWidget(0, i)); - if(currentComboBox) + QComboBox* currentComboBox = dynamic_cast( mTableWidget->cellWidget( 0, i ) ); + if ( currentComboBox ) { - currentComboBox->blockSignals(true); - currentComboBox->removeItem(currentComboBox->findText(tr("feature %1").arg(featureId))); - currentComboBox->blockSignals(false); + currentComboBox->blockSignals( true ); + currentComboBox->removeItem( currentComboBox->findText( tr( "feature %1" ).arg( featureId ) ) ); + currentComboBox->blockSignals( false ); } } //finally remove the feature from mFeatureList QgsFeatureList::iterator f_it = mFeatureList.begin(); - for(; f_it != mFeatureList.end(); ++f_it) + for ( ; f_it != mFeatureList.end(); ++f_it ) { - if(f_it->id() == featureId) + if ( f_it->id() == featureId ) { - mFeatureList.erase(f_it); + mFeatureList.erase( f_it ); break; } } } -void QgsMergeAttributesDialog::createRubberBandForFeature(int featureId) +void QgsMergeAttributesDialog::createRubberBandForFeature( int featureId ) { - //create rubber band to highlight the feature - delete mSelectionRubberBand; - mSelectionRubberBand = new QgsRubberBand(mMapCanvas, mVectorLayer->geometryType() == QGis::Polygon); - mSelectionRubberBand->setColor(QColor(255, 0, 0)); - QgsFeature featureToSelect; - mVectorLayer->featureAtId(featureId, featureToSelect, true, false); - mSelectionRubberBand->setToGeometry( featureToSelect.geometry(), mVectorLayer ); + //create rubber band to highlight the feature + delete mSelectionRubberBand; + mSelectionRubberBand = new QgsRubberBand( mMapCanvas, mVectorLayer->geometryType() == QGis::Polygon ); + mSelectionRubberBand->setColor( QColor( 255, 0, 0 ) ); + QgsFeature featureToSelect; + mVectorLayer->featureAtId( featureId, featureToSelect, true, false ); + mSelectionRubberBand->setToGeometry( featureToSelect.geometry(), mVectorLayer ); } QgsAttributeMap QgsMergeAttributesDialog::mergedAttributesMap() const { - QgsAttributeMap resultMap; - if(mFeatureList.size() < 1) - { - return resultMap; //return empty map - } + QgsAttributeMap resultMap; + if ( mFeatureList.size() < 1 ) + { + return resultMap; //return empty map + } - resultMap = mFeatureList[0].attributeMap(); - //go through all the items and replace the values in the attribute map - for(int i = 0; i < resultMap.size(); ++i) + resultMap = mFeatureList[0].attributeMap(); + //go through all the items and replace the values in the attribute map + for ( int i = 0; i < resultMap.size(); ++i ) + { + QTableWidgetItem* currentItem = mTableWidget->item( mFeatureList.size() + 1, i ); + if ( !currentItem ) { - QTableWidgetItem* currentItem = mTableWidget->item(mFeatureList.size() + 1, i); - if(!currentItem) - { - continue; - } - QString mergedString = currentItem->text(); - QVariant newValue(mergedString); - resultMap.insert(i, newValue); + continue; } + QString mergedString = currentItem->text(); + QVariant newValue( mergedString ); + resultMap.insert( i, newValue ); + } - return resultMap; + return resultMap; } diff --git a/src/app/qgsundowidget.cpp b/src/app/qgsundowidget.cpp index 217828ea7ba9..23e22194e69c 100644 --- a/src/app/qgsundowidget.cpp +++ b/src/app/qgsundowidget.cpp @@ -8,8 +8,8 @@ QgsUndoWidget::QgsUndoWidget( QWidget * parent, QgsMapCanvas * mapCanvas ) : QDockWidget( parent ) { - setupUi(this); - setWidget(dockWidgetContents); + setupUi( this ); + setWidget( dockWidgetContents ); connect( this->undoButton, SIGNAL( clicked() ), this, SLOT( undo( ) ) ); @@ -23,84 +23,84 @@ QgsUndoWidget::QgsUndoWidget( QWidget * parent, QgsMapCanvas * mapCanvas ) } -void QgsUndoWidget::layerChanged( QgsMapLayer * layer) +void QgsUndoWidget::layerChanged( QgsMapLayer * layer ) { - if (layer != NULL) - { - setUndoStack( layer->undoStack() ); - } - else - { - destroyStack(); - } - emit undoStackChanged(); + if ( layer != NULL ) + { + setUndoStack( layer->undoStack() ); + } + else + { + destroyStack(); + } + emit undoStackChanged(); } void QgsUndoWidget::destroyStack() { - if (mUndoStack != NULL) - { - mUndoStack->clear(); - mUndoStack = NULL; - } - if (mUndoView != NULL) - { - mUndoView->close(); - mUndoView = NULL; - } + if ( mUndoStack != NULL ) + { + mUndoStack->clear(); + mUndoStack = NULL; + } + if ( mUndoView != NULL ) + { + mUndoView->close(); + mUndoView = NULL; + } } -void QgsUndoWidget::undoChanged(bool value) +void QgsUndoWidget::undoChanged( bool value ) { - undoButton->setDisabled( !value ); - emit undoStackChanged(); + undoButton->setDisabled( !value ); + emit undoStackChanged(); } -void QgsUndoWidget::redoChanged(bool value) +void QgsUndoWidget::redoChanged( bool value ) { - redoButton->setDisabled( !value ); - emit undoStackChanged(); + redoButton->setDisabled( !value ); + emit undoStackChanged(); } -void QgsUndoWidget::indexChanged(int value) +void QgsUndoWidget::indexChanged( int value ) { - //redoButton->setDisabled( !value ); - //canvas refresh - mMapCanvas->refresh(); + //redoButton->setDisabled( !value ); + //canvas refresh + mMapCanvas->refresh(); } void QgsUndoWidget::undo( ) { - if (mUndoStack) + if ( mUndoStack ) mUndoStack->undo(); } void QgsUndoWidget::redo() { - if (mUndoStack) + if ( mUndoStack ) mUndoStack->redo(); } -void QgsUndoWidget::setUndoStack(QUndoStack* undoStack) +void QgsUndoWidget::setUndoStack( QUndoStack* undoStack ) { - if (mUndoView != NULL) + if ( mUndoView != NULL ) { - mUndoView->close(); - delete mUndoView; - mUndoView = NULL; + mUndoView->close(); + delete mUndoView; + mUndoView = NULL; } - + mUndoStack = undoStack; - - mUndoView = new QUndoView(dockWidgetContents); - mUndoView->setStack(undoStack); - mUndoView->setObjectName("undoView"); - gridLayout->addWidget(mUndoView, 0, 0, 1, 2); - setWidget(dockWidgetContents); - connect(this->mUndoStack, SIGNAL(canUndoChanged(bool)), this, SLOT(undoChanged(bool))); - connect(this->mUndoStack, SIGNAL(canRedoChanged(bool)), this, SLOT(redoChanged(bool))); + + mUndoView = new QUndoView( dockWidgetContents ); + mUndoView->setStack( undoStack ); + mUndoView->setObjectName( "undoView" ); + gridLayout->addWidget( mUndoView, 0, 0, 1, 2 ); + setWidget( dockWidgetContents ); + connect( this->mUndoStack, SIGNAL( canUndoChanged( bool ) ), this, SLOT( undoChanged( bool ) ) ); + connect( this->mUndoStack, SIGNAL( canRedoChanged( bool ) ), this, SLOT( redoChanged( bool ) ) ); // indexChanged() triggers a refresh. but it gets triggered also when a new action // is done, resulting in two refreshes. For now let's trigger the refresh from @@ -114,51 +114,51 @@ void QgsUndoWidget::setUndoStack(QUndoStack* undoStack) -void QgsUndoWidget::setupUi(QDockWidget *UndoWidget) +void QgsUndoWidget::setupUi( QDockWidget *UndoWidget ) { - if (UndoWidget->objectName().isEmpty()) - UndoWidget->setObjectName(QString::fromUtf8("UndoWidget")); - UndoWidget->resize(350, 223); - UndoWidget->setMinimumSize(QSize(346, 220)); - dockWidgetContents = new QWidget(UndoWidget); - dockWidgetContents->setObjectName(QString::fromUtf8("dockWidgetContents")); - gridLayout = new QGridLayout(dockWidgetContents); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - gridLayout->setContentsMargins(0, 0, 0, 0); - spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); - - gridLayout->addItem(spacerItem, 0, 0, 1, 1); - - undoButton = new QPushButton(dockWidgetContents); - undoButton->setObjectName(QString::fromUtf8("undoButton")); - undoButton->setIcon( QgisApp::instance()->getThemeIcon("mActionUndo.png") ); - undoButton->setIconSize(QSize(24, 24)); - - gridLayout->addWidget(undoButton, 1, 0, 1, 1); - - redoButton = new QPushButton(dockWidgetContents); - redoButton->setObjectName(QString::fromUtf8("redoButton")); - redoButton->setIcon( QgisApp::instance()->getThemeIcon("mActionRedo.png") ); - redoButton->setIconSize(QSize(24, 24)); - - gridLayout->addWidget(redoButton, 1, 1, 1, 1); - - spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); - - gridLayout->addItem(spacerItem1, 0, 1, 1, 1); - - UndoWidget->setWidget(dockWidgetContents); - - retranslateUi(UndoWidget); - - QMetaObject::connectSlotsByName(UndoWidget); + if ( UndoWidget->objectName().isEmpty() ) + UndoWidget->setObjectName( QString::fromUtf8( "UndoWidget" ) ); + UndoWidget->resize( 350, 223 ); + UndoWidget->setMinimumSize( QSize( 346, 220 ) ); + dockWidgetContents = new QWidget( UndoWidget ); + dockWidgetContents->setObjectName( QString::fromUtf8( "dockWidgetContents" ) ); + gridLayout = new QGridLayout( dockWidgetContents ); + gridLayout->setObjectName( QString::fromUtf8( "gridLayout" ) ); + gridLayout->setContentsMargins( 0, 0, 0, 0 ); + spacerItem = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding ); + + gridLayout->addItem( spacerItem, 0, 0, 1, 1 ); + + undoButton = new QPushButton( dockWidgetContents ); + undoButton->setObjectName( QString::fromUtf8( "undoButton" ) ); + undoButton->setIcon( QgisApp::instance()->getThemeIcon( "mActionUndo.png" ) ); + undoButton->setIconSize( QSize( 24, 24 ) ); + + gridLayout->addWidget( undoButton, 1, 0, 1, 1 ); + + redoButton = new QPushButton( dockWidgetContents ); + redoButton->setObjectName( QString::fromUtf8( "redoButton" ) ); + redoButton->setIcon( QgisApp::instance()->getThemeIcon( "mActionRedo.png" ) ); + redoButton->setIconSize( QSize( 24, 24 ) ); + + gridLayout->addWidget( redoButton, 1, 1, 1, 1 ); + + spacerItem1 = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding ); + + gridLayout->addItem( spacerItem1, 0, 1, 1, 1 ); + + UndoWidget->setWidget( dockWidgetContents ); + + retranslateUi( UndoWidget ); + + QMetaObject::connectSlotsByName( UndoWidget ); } // setupUi -void QgsUndoWidget::retranslateUi(QDockWidget *UndoWidget) +void QgsUndoWidget::retranslateUi( QDockWidget *UndoWidget ) { - UndoWidget->setWindowTitle(QApplication::translate("UndoWidget", "Undo/Redo", 0, QApplication::UnicodeUTF8)); - undoButton->setText(QApplication::translate("UndoWidget", "Undo", 0, QApplication::UnicodeUTF8)); - redoButton->setText(QApplication::translate("UndoWidget", "Redo", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(UndoWidget); + UndoWidget->setWindowTitle( QApplication::translate( "UndoWidget", "Undo/Redo", 0, QApplication::UnicodeUTF8 ) ); + undoButton->setText( QApplication::translate( "UndoWidget", "Undo", 0, QApplication::UnicodeUTF8 ) ); + redoButton->setText( QApplication::translate( "UndoWidget", "Redo", 0, QApplication::UnicodeUTF8 ) ); + Q_UNUSED( UndoWidget ); } diff --git a/src/app/qgsundowidget.h b/src/app/qgsundowidget.h index 471aee5c6d9d..e0c4ed2b241d 100644 --- a/src/app/qgsundowidget.h +++ b/src/app/qgsundowidget.h @@ -21,8 +21,8 @@ class QgsMapLayer; */ class QgsUndoWidget : public QDockWidget { - Q_OBJECT -public: + Q_OBJECT + public: QWidget *dockWidgetContents; QGridLayout *gridLayout; QSpacerItem *spacerItem; @@ -30,40 +30,40 @@ class QgsUndoWidget : public QDockWidget QPushButton *redoButton; QSpacerItem *spacerItem1; - QgsUndoWidget(QWidget * parent, QgsMapCanvas* mapCanvas); - void setupUi(QDockWidget *UndoWidget); - void retranslateUi(QDockWidget *UndoWidget); + QgsUndoWidget( QWidget * parent, QgsMapCanvas* mapCanvas ); + void setupUi( QDockWidget *UndoWidget ); + void retranslateUi( QDockWidget *UndoWidget ); /** * Setting new undo stack for undo view */ - void setUndoStack(QUndoStack * undoStack); + void setUndoStack( QUndoStack * undoStack ); /** * Handles destroying of stack when active layer is changed */ void destroyStack(); -public slots: + public slots: /** * Changes undo stack which is displayed by undo view */ - void layerChanged( QgsMapLayer * layer); + void layerChanged( QgsMapLayer * layer ); /** * Slot to handle undo changed signal */ - void undoChanged(bool value); + void undoChanged( bool value ); /** * Slot to handle redo changed signal */ - void redoChanged(bool value); + void redoChanged( bool value ); /** * Slot to handle index changed signal */ - void indexChanged(int value); + void indexChanged( int value ); /** * Undo operation called from button push @@ -75,10 +75,10 @@ public slots: */ void redo(); -signals: + signals: void undoStackChanged(); -private: + private: QUndoView * mUndoView; QUndoStack * mUndoStack; QgsMapCanvas* mMapCanvas; diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index be1fd6da4677..cd8c96691a4a 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -188,8 +188,8 @@ void QgsVectorLayerProperties::setRow( int row, int idx, const QgsField &field ) cb->addItem( tr( "range (editable)" ), QgsVectorLayer::EditRange ); cb->addItem( tr( "range (slider)" ), QgsVectorLayer::SliderRange ); cb->addItem( tr( "file name" ), QgsVectorLayer::FileName ); - cb->addItem( tr( "enumeration" ), QgsVectorLayer::Enumeration); - cb->addItem( tr( "immutable" ), QgsVectorLayer::Immutable); + cb->addItem( tr( "enumeration" ), QgsVectorLayer::Enumeration ); + cb->addItem( tr( "immutable" ), QgsVectorLayer::Immutable ); cb->setSizeAdjustPolicy( QComboBox::AdjustToContentsOnFirstShow ); cb->setCurrentIndex( layer->editType( idx ) ); @@ -273,7 +273,7 @@ void QgsVectorLayerProperties::addAttribute() bool QgsVectorLayerProperties::addAttribute( const QgsField &field ) { QgsDebugMsg( "inserting attribute " + field.name() + " of type " + field.typeName() ); - layer->beginEditCommand( tr("Added attribute") ); + layer->beginEditCommand( tr( "Added attribute" ) ); if ( layer->addAttribute( field ) ) { layer->endEditCommand(); @@ -299,7 +299,7 @@ void QgsVectorLayerProperties::deleteAttribute() for ( QList::const_iterator it = idxs.begin(); it != idxs.end(); it++ ) { - layer->beginEditCommand( tr("Deleted attribute") ); + layer->beginEditCommand( tr( "Deleted attribute" ) ); layer->deleteAttribute( *it ); layer->endEditCommand(); } diff --git a/src/core/composer/qgscomposerlabel.cpp b/src/core/composer/qgscomposerlabel.cpp index 186c557012ee..51882b728019 100644 --- a/src/core/composer/qgscomposerlabel.cpp +++ b/src/core/composer/qgscomposerlabel.cpp @@ -62,21 +62,21 @@ void QgsComposerLabel::setText( const QString& text ) //replace '$CURRENT_DATE<(FORMAT)>' with the current date //e.g. $CURRENT_DATE(d 'June' yyyy) mText = text; - int currentDatePos = mText.indexOf("$CURRENT_DATE"); - if(currentDatePos != -1) + int currentDatePos = mText.indexOf( "$CURRENT_DATE" ); + if ( currentDatePos != -1 ) { //check if there is a bracket just after $CURRENT_DATE QString formatText; - int openingBracketPos = mText.indexOf("(", currentDatePos); - int closingBracketPos = mText.indexOf(")", openingBracketPos + 1); - if(openingBracketPos != -1 && closingBracketPos != -1 && (closingBracketPos - openingBracketPos) > 1 ) + int openingBracketPos = mText.indexOf( "(", currentDatePos ); + int closingBracketPos = mText.indexOf( ")", openingBracketPos + 1 ); + if ( openingBracketPos != -1 && closingBracketPos != -1 && ( closingBracketPos - openingBracketPos ) > 1 ) { - formatText = mText.mid(openingBracketPos + 1, closingBracketPos - openingBracketPos - 1); - mText.replace(currentDatePos, closingBracketPos - currentDatePos + 1, QDate::currentDate().toString(formatText)); + formatText = mText.mid( openingBracketPos + 1, closingBracketPos - openingBracketPos - 1 ); + mText.replace( currentDatePos, closingBracketPos - currentDatePos + 1, QDate::currentDate().toString( formatText ) ); } else //no bracket { - mText.replace("$CURRENT_DATE", QDate::currentDate().toString()); + mText.replace( "$CURRENT_DATE", QDate::currentDate().toString() ); } } } diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp index e066b78f8b61..51e978da50a2 100644 --- a/src/core/composer/qgscomposermap.cpp +++ b/src/core/composer/qgscomposermap.cpp @@ -42,7 +42,7 @@ int QgsComposerMap::mCurrentComposerId = 0; QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int width, int height ) - : QgsComposerItem( x, y, width, height, composition ), mKeepLayerSet(false) + : QgsComposerItem( x, y, width, height, composition ), mKeepLayerSet( false ) { mComposition = composition; mMapRenderer = mComposition->mapRenderer(); @@ -69,7 +69,7 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w } QgsComposerMap::QgsComposerMap( QgsComposition *composition ) - : QgsComposerItem( 0, 0, 10, 10, composition ), mKeepLayerSet(false) + : QgsComposerItem( 0, 0, 10, 10, composition ), mKeepLayerSet( false ) { //Offset mXOffset = 0.0; @@ -115,9 +115,9 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const theMapRenderer.setOutputSize( size, dpi ); //use stored layer set or read current set from main canvas - if(mKeepLayerSet) + if ( mKeepLayerSet ) { - theMapRenderer.setLayerSet(mLayerSet); + theMapRenderer.setLayerSet( mLayerSet ); } else { @@ -169,8 +169,8 @@ void QgsComposerMap::cache( void ) h = 5000; } - mCacheImage = QImage( w, h, QImage::Format_ARGB32); - mCacheImage.fill(brush().color().rgb()); //consider the item background brush + mCacheImage = QImage( w, h, QImage::Format_ARGB32 ); + mCacheImage.fill( brush().color().rgb() ); //consider the item background brush double mapUnitsPerPixel = mExtent.width() / w; // WARNING: ymax in QgsMapToPixel is device height!!! @@ -499,13 +499,13 @@ bool QgsComposerMap::writeXML( QDomElement& elem, QDomDocument & doc ) const composerMapElem.setAttribute( "previewMode", "Rectangle" ); } - if(mKeepLayerSet) + if ( mKeepLayerSet ) { - composerMapElem.setAttribute( "keepLayerSet", "true"); + composerMapElem.setAttribute( "keepLayerSet", "true" ); } else { - composerMapElem.setAttribute( "keepLayerSet", "false"); + composerMapElem.setAttribute( "keepLayerSet", "false" ); } //extent @@ -519,14 +519,14 @@ bool QgsComposerMap::writeXML( QDomElement& elem, QDomDocument & doc ) const //layer set QDomElement layerSetElem = doc.createElement( "LayerSet" ); QStringList::const_iterator layerIt = mLayerSet.constBegin(); - for(; layerIt != mLayerSet.constEnd(); ++layerIt) + for ( ; layerIt != mLayerSet.constEnd(); ++layerIt ) { QDomElement layerElem = doc.createElement( "Layer" ); - QDomText layerIdText = doc.createTextNode(*layerIt); - layerElem.appendChild(layerIdText); - layerSetElem.appendChild(layerElem); + QDomText layerIdText = doc.createTextNode( *layerIt ); + layerElem.appendChild( layerIdText ); + layerSetElem.appendChild( layerElem ); } - composerMapElem.appendChild(layerSetElem); + composerMapElem.appendChild( layerSetElem ); #if 0 // why is saving the map changing anything about the cache? @@ -578,7 +578,7 @@ bool QgsComposerMap::readXML( const QDomElement& itemElem, const QDomDocument& d //mKeepLayerSet flag QString keepLayerSetFlag = itemElem.attribute( "keepLayerSet" ); - if(keepLayerSetFlag.compare("true", Qt::CaseInsensitive) == 0) + if ( keepLayerSetFlag.compare( "true", Qt::CaseInsensitive ) == 0 ) { mKeepLayerSet = true; } @@ -588,15 +588,15 @@ bool QgsComposerMap::readXML( const QDomElement& itemElem, const QDomDocument& d } //mLayerSet - QDomNodeList layerSetNodeList = itemElem.elementsByTagName("LayerSet"); + QDomNodeList layerSetNodeList = itemElem.elementsByTagName( "LayerSet" ); QStringList layerSet; - if(layerSetNodeList.size() > 0) + if ( layerSetNodeList.size() > 0 ) { - QDomElement layerSetElem = layerSetNodeList.at(0).toElement(); - QDomNodeList layerIdNodeList = layerSetElem.elementsByTagName("Layer"); - for(int i = 0; i < layerIdNodeList.size(); ++i) + QDomElement layerSetElem = layerSetNodeList.at( 0 ).toElement(); + QDomNodeList layerIdNodeList = layerSetElem.elementsByTagName( "Layer" ); + for ( int i = 0; i < layerIdNodeList.size(); ++i ) { - layerSet << layerIdNodeList.at(i).toElement().text(); + layerSet << layerIdNodeList.at( i ).toElement().text(); } } mLayerSet = layerSet; @@ -624,7 +624,7 @@ bool QgsComposerMap::readXML( const QDomElement& itemElem, const QDomDocument& d void QgsComposerMap::storeCurrentLayerSet() { - if(mMapRenderer) + if ( mMapRenderer ) { mLayerSet = mMapRenderer->layerSet(); } @@ -632,17 +632,17 @@ void QgsComposerMap::storeCurrentLayerSet() void QgsComposerMap::syncLayerSet() { - if(mLayerSet.size() < 1 && !mMapRenderer) + if ( mLayerSet.size() < 1 && !mMapRenderer ) { return; } QStringList currentLayerSet = mMapRenderer->layerSet(); - for(int i = mLayerSet.size() - 1; i >= 0; --i) + for ( int i = mLayerSet.size() - 1; i >= 0; --i ) { - if(!currentLayerSet.contains(mLayerSet.at(i))) + if ( !currentLayerSet.contains( mLayerSet.at( i ) ) ) { - mLayerSet.removeAt(i); + mLayerSet.removeAt( i ); } } } diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h index 103b9559ad29..579576dcbc3b 100644 --- a/src/core/composer/qgscomposermap.h +++ b/src/core/composer/qgscomposermap.h @@ -106,14 +106,14 @@ class CORE_EXPORT QgsComposerMap : /*public QWidget, private Ui::QgsComposerMapB bool keepLayerSet() const {return mKeepLayerSet;} /**Setter for flag that determines if the stored layer set should be used or the current layer set of the qgis mapcanvas @note this function was added in version 1.2*/ - void setKeepLayerSet(bool enabled) {mKeepLayerSet = enabled;} + void setKeepLayerSet( bool enabled ) {mKeepLayerSet = enabled;} /**Getter for stored layer set that is used if mKeepLayerSet is true @note this function was added in version 1.2*/ QStringList layerSet() const {return mLayerSet;} /**Setter for stored layer set that is used if mKeepLayerSet is true @note this function was added in version 1.2*/ - void setLayerSet(const QStringList& layerSet) {mLayerSet = layerSet;} + void setLayerSet( const QStringList& layerSet ) {mLayerSet = layerSet;} /**Stores the current layer set of the qgis mapcanvas in mLayerSet*/ void storeCurrentLayerSet(); diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp index 4db2d9eef286..34ca9f3a9596 100644 --- a/src/core/qgsgeometry.cpp +++ b/src/core/qgsgeometry.cpp @@ -4807,11 +4807,11 @@ int QgsGeometry::splitLinearGeometry( GEOSGeometry *splitLine, QList= 0.5 && ratio <= 1.5) + if ( ratio >= 0.5 && ratio <= 1.5 ) { testedGeometries << GEOSGeom_clone( testing ); } diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h index 3e68740943cb..ce7fcebbe0b8 100644 --- a/src/core/qgsvectordataprovider.h +++ b/src/core/qgsvectordataprovider.h @@ -192,7 +192,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider * @param index the index of the attribute * @param enumList reference to the list to fill @note: added in version 1.2*/ - virtual void enumValues( int index, QStringList& enumList ) { Q_UNUSED(index); enumList.clear(); } + virtual void enumValues( int index, QStringList& enumList ) { Q_UNUSED( index ); enumList.clear(); } /** * Adds a list of features diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index ca72056c544f..b4fb71ed0c6c 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -102,7 +102,7 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath, mRenderer( 0 ), mLabel( 0 ), mLabelOn( false ), - mVertexMarkerOnlyForSelection(false), + mVertexMarkerOnlyForSelection( false ), mFetching( false ), mActiveCommand( NULL ) { @@ -757,7 +757,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext ) // Cache this for the use of (e.g.) modifying the feature's uncommitted geometry. mCachedGeometries[fet.id()] = *fet.geometry(); - if(mVertexMarkerOnlyForSelection && !sel) + if ( mVertexMarkerOnlyForSelection && !sel ) { mCurrentVertexMarkerType = QgsVectorLayer::NoMarker; } @@ -1522,7 +1522,7 @@ bool QgsVectorLayer::insertVertex( double x, double y, int atFeatureId, int befo } geometry.insertVertex( x, y, beforeVertex ); mCachedGeometries[atFeatureId] = geometry; - editGeometryChange(atFeatureId, geometry); + editGeometryChange( atFeatureId, geometry ); setModified( true, true ); // only geometry was changed @@ -1559,7 +1559,7 @@ bool QgsVectorLayer::moveVertex( double x, double y, int atFeatureId, int atVert geometry.moveVertex( x, y, atVertex ); mCachedGeometries[atFeatureId] = geometry; - editGeometryChange(atFeatureId, geometry); + editGeometryChange( atFeatureId, geometry ); setModified( true, true ); // only geometry was changed @@ -1595,7 +1595,7 @@ bool QgsVectorLayer::deleteVertex( int atFeatureId, int atVertex ) geometry.deleteVertex( atVertex ); mCachedGeometries[atFeatureId] = geometry; - editGeometryChange(atFeatureId, geometry); + editGeometryChange( atFeatureId, geometry ); setModified( true, true ); // only geometry was changed @@ -1788,7 +1788,7 @@ int QgsVectorLayer::translateFeature( int featureId, double dx, double dy ) int errorCode = translateGeom.translate( dx, dy ); if ( errorCode == 0 ) { - editGeometryChange(featureId, translateGeom); + editGeometryChange( featureId, translateGeom ); setModified( true, true ); } return errorCode; @@ -2658,7 +2658,7 @@ bool QgsVectorLayer::addAttribute( const QgsField &field ) mMaxUpdatedIndex++; - if (mActiveCommand != NULL) + if ( mActiveCommand != NULL ) { mActiveCommand->storeAttributeAdd( mMaxUpdatedIndex, field ); } @@ -2685,7 +2685,7 @@ bool QgsVectorLayer::deleteAttribute( int index ) !mDataProvider->fields().contains( index ) ) return false; - if (mActiveCommand != NULL) + if ( mActiveCommand != NULL ) { mActiveCommand->storeAttributeDelete( index, mUpdatedFields[index] ); } @@ -3739,44 +3739,44 @@ QgsVectorOverlay* QgsVectorLayer::findOverlayByType( const QString& typeName ) void QgsVectorLayer::editGeometryChange( int featureId, QgsGeometry& geometry ) { - if (mActiveCommand != NULL) - { - mActiveCommand->storeGeometryChange( featureId, mChangedGeometries[ featureId ], geometry ); - } - mChangedGeometries[ featureId ] = geometry; + if ( mActiveCommand != NULL ) + { + mActiveCommand->storeGeometryChange( featureId, mChangedGeometries[ featureId ], geometry ); + } + mChangedGeometries[ featureId ] = geometry; } -void QgsVectorLayer::editFeatureAdd(QgsFeature& feature) +void QgsVectorLayer::editFeatureAdd( QgsFeature& feature ) { - if (mActiveCommand != NULL) - { - mActiveCommand->storeFeatureAdd( feature ); - } - mAddedFeatures.append( feature ); + if ( mActiveCommand != NULL ) + { + mActiveCommand->storeFeatureAdd( feature ); + } + mAddedFeatures.append( feature ); } -void QgsVectorLayer::editFeatureDelete(int featureId) +void QgsVectorLayer::editFeatureDelete( int featureId ) { - if (mActiveCommand != NULL) - { - mActiveCommand->storeFeatureDelete( featureId ); - } - mDeletedFeatureIds.insert( featureId ); + if ( mActiveCommand != NULL ) + { + mActiveCommand->storeFeatureDelete( featureId ); + } + mDeletedFeatureIds.insert( featureId ); } -void QgsVectorLayer::editAttributeChange( int featureId, int field, QVariant value) +void QgsVectorLayer::editAttributeChange( int featureId, int field, QVariant value ) { - if (mActiveCommand != NULL) + if ( mActiveCommand != NULL ) { QVariant original; bool isFirstChange = true; - if (featureId < 0) + if ( featureId < 0 ) { // work with added feature - for (int i = 0; i < mAddedFeatures.size(); i++ ) + for ( int i = 0; i < mAddedFeatures.size(); i++ ) { - if ( mAddedFeatures[i].id() == featureId && mAddedFeatures[i].attributeMap().contains(field) ) + if ( mAddedFeatures[i].id() == featureId && mAddedFeatures[i].attributeMap().contains( field ) ) { original = mAddedFeatures[i].attributeMap()[field]; isFirstChange = false; @@ -3786,7 +3786,7 @@ void QgsVectorLayer::editAttributeChange( int featureId, int field, QVariant val } else { - if (mChangedAttributeValues.contains(featureId) && mChangedAttributeValues[featureId].contains(field)) + if ( mChangedAttributeValues.contains( featureId ) && mChangedAttributeValues[featureId].contains( field ) ) { original = mChangedAttributeValues[featureId][field]; isFirstChange = false; @@ -3819,19 +3819,19 @@ void QgsVectorLayer::editAttributeChange( int featureId, int field, QVariant val } } -void QgsVectorLayer::beginEditCommand(QString text) +void QgsVectorLayer::beginEditCommand( QString text ) { - if (mActiveCommand == NULL) + if ( mActiveCommand == NULL ) { - mActiveCommand = new QgsUndoCommand(this, text); + mActiveCommand = new QgsUndoCommand( this, text ); } } void QgsVectorLayer::endEditCommand() { - if (mActiveCommand != NULL) + if ( mActiveCommand != NULL ) { - undoStack()->push(mActiveCommand); + undoStack()->push( mActiveCommand ); mActiveCommand = NULL; } @@ -3839,7 +3839,7 @@ void QgsVectorLayer::endEditCommand() void QgsVectorLayer::destroyEditCommand() { - if (mActiveCommand != NULL) + if ( mActiveCommand != NULL ) { delete mActiveCommand; mActiveCommand = NULL; @@ -3847,7 +3847,7 @@ void QgsVectorLayer::destroyEditCommand() } -void QgsVectorLayer::redoEditCommand(QgsUndoCommand* cmd) +void QgsVectorLayer::redoEditCommand( QgsUndoCommand* cmd ) { QMap& geometryChange = cmd->mGeometryChange; QgsFeatureIds& deletedFeatureIdChange = cmd->mDeletedFeatureIdChange; @@ -3861,13 +3861,13 @@ void QgsVectorLayer::redoEditCommand(QgsUndoCommand* cmd) QMap::iterator it = geometryChange.begin(); for ( ; it != geometryChange.end(); ++it ) { - if (it.value().target == NULL) + if ( it.value().target == NULL ) { - mChangedGeometries.remove(it.key()); + mChangedGeometries.remove( it.key() ); } else { - mChangedGeometries[it.key()] = *(it.value().target); + mChangedGeometries[it.key()] = *( it.value().target ); } } @@ -3875,37 +3875,37 @@ void QgsVectorLayer::redoEditCommand(QgsUndoCommand* cmd) QgsFeatureIds::iterator delIt = deletedFeatureIdChange.begin(); for ( ; delIt != deletedFeatureIdChange.end(); ++delIt ) { - mDeletedFeatureIds.insert(*delIt); + mDeletedFeatureIds.insert( *delIt ); } // added features QgsFeatureList::iterator addIt = addedFeatures.begin(); for ( ; addIt != addedFeatures.end(); ++addIt ) { - mAddedFeatures.append(*addIt); + mAddedFeatures.append( *addIt ); } // changed attributes QMap::iterator attrFeatIt = attributeChange.begin(); - for ( ; attrFeatIt != attributeChange.end(); ++attrFeatIt ) + for ( ; attrFeatIt != attributeChange.end(); ++attrFeatIt ) { int fid = attrFeatIt.key(); // for every changed attribute in feature QMap::iterator attrChIt = attrFeatIt.value().begin(); for ( ; attrChIt != attrFeatIt.value().end(); ++attrChIt ) { - if (fid >= 0) + if ( fid >= 0 ) { // existing feature - if (attrChIt.value().target.isNull()) + if ( attrChIt.value().target.isNull() ) { - mChangedAttributeValues[fid].remove(attrChIt.key()); + mChangedAttributeValues[fid].remove( attrChIt.key() ); } else { mChangedAttributeValues[fid][attrChIt.key()] = attrChIt.value().target; QgsFeature f; - featureAtId(fid, f, false, true); + featureAtId( fid, f, false, true ); f.changeAttribute( attrChIt.key(), attrChIt.value().target ); } } @@ -3914,7 +3914,7 @@ void QgsVectorLayer::redoEditCommand(QgsUndoCommand* cmd) // added feature for ( int i = 0; i < mAddedFeatures.size(); i++ ) { - if (mAddedFeatures[i].id() == fid) + if ( mAddedFeatures[i].id() == fid ) { mAddedFeatures[i].changeAttribute( attrChIt.key(), attrChIt.value().target ); break; @@ -3940,8 +3940,8 @@ void QgsVectorLayer::redoEditCommand(QgsUndoCommand* cmd) for ( ; dAttrIt != deletedAttributes.end(); ++dAttrIt ) { int attrIndex = dAttrIt.key(); - mDeletedAttributeIds.insert(attrIndex); - mUpdatedFields.remove(attrIndex); + mDeletedAttributeIds.insert( attrIndex ); + mUpdatedFields.remove( attrIndex ); } setModified( true ); @@ -3949,7 +3949,7 @@ void QgsVectorLayer::redoEditCommand(QgsUndoCommand* cmd) triggerRepaint(); } -void QgsVectorLayer::undoEditCommand(QgsUndoCommand* cmd) +void QgsVectorLayer::undoEditCommand( QgsUndoCommand* cmd ) { QMap& geometryChange = cmd->mGeometryChange; QgsFeatureIds& deletedFeatureIdChange = cmd->mDeletedFeatureIdChange; @@ -3980,13 +3980,13 @@ void QgsVectorLayer::undoEditCommand(QgsUndoCommand* cmd) QMap::iterator it = geometryChange.begin(); for ( ; it != geometryChange.end(); ++it ) { - if (it.value().original == NULL) + if ( it.value().original == NULL ) { - mChangedGeometries.remove(it.key()); + mChangedGeometries.remove( it.key() ); } else { - mChangedGeometries[it.key()] = *(it.value().original); + mChangedGeometries[it.key()] = *( it.value().original ); } } @@ -3994,7 +3994,7 @@ void QgsVectorLayer::undoEditCommand(QgsUndoCommand* cmd) QgsFeatureIds::iterator delIt = deletedFeatureIdChange.begin(); for ( ; delIt != deletedFeatureIdChange.end(); ++delIt ) { - mDeletedFeatureIds.remove(*delIt); + mDeletedFeatureIds.remove( *delIt ); } // added features @@ -4004,9 +4004,9 @@ void QgsVectorLayer::undoEditCommand(QgsUndoCommand* cmd) QgsFeatureList::iterator addedIt = mAddedFeatures.begin(); for ( ; addedIt != mAddedFeatures.end(); ++addedIt ) { - if (addedIt->id() == addIt->id()) + if ( addedIt->id() == addIt->id() ) { - mAddedFeatures.erase(addedIt); + mAddedFeatures.erase( addedIt ); break; // feature was found so move to next one } } @@ -4014,17 +4014,17 @@ void QgsVectorLayer::undoEditCommand(QgsUndoCommand* cmd) // updated attributes QMap::iterator attrFeatIt = attributeChange.begin(); - for ( ; attrFeatIt != attributeChange.end(); ++attrFeatIt ) + for ( ; attrFeatIt != attributeChange.end(); ++attrFeatIt ) { int fid = attrFeatIt.key(); QMap::iterator attrChIt = attrFeatIt.value().begin(); for ( ; attrChIt != attrFeatIt.value().end(); ++attrChIt ) { - if (fid >= 0) + if ( fid >= 0 ) { - if (attrChIt.value().isFirstChange) + if ( attrChIt.value().isFirstChange ) { - mChangedAttributeValues[fid].remove(attrChIt.key()); + mChangedAttributeValues[fid].remove( attrChIt.key() ); } else { diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h index 308bae74a5d0..2d4e7332f9d5 100644 --- a/src/core/qgsvectorlayer.h +++ b/src/core/qgsvectorlayer.h @@ -463,7 +463,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer * Create edit command for undo/redo operations * @param text text which is to be displayed in undo window */ - void beginEditCommand(QString text); + void beginEditCommand( QString text ); /** Finish edit command and add it to undo/redo stack */ void endEditCommand(); @@ -472,10 +472,10 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer void destroyEditCommand(); /** Execute undo operation. To be called only from QgsVectorLayerUndoCommand. */ - void undoEditCommand(QgsUndoCommand* cmd); + void undoEditCommand( QgsUndoCommand* cmd ); /** Execute redo operation. To be called only from QgsVectorLayerUndoCommand. */ - void redoEditCommand(QgsUndoCommand* cmd); + void redoEditCommand( QgsUndoCommand* cmd ); public slots: /** Select feature by its ID, optionally emit signal selectionChanged() */ @@ -605,10 +605,10 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer void editGeometryChange( int featureId, QgsGeometry& geometry ); /** Record added feature, store in active command (if any) */ - void editFeatureAdd(QgsFeature& feature); + void editFeatureAdd( QgsFeature& feature ); /** Record deleted feature, store in active command (if any) */ - void editFeatureDelete(int featureId); + void editFeatureDelete( int featureId ); /** Record changed attribute, store in active command (if any) */ void editAttributeChange( int featureId, int field, QVariant value ); diff --git a/src/core/qgsvectorlayerundocommand.cpp b/src/core/qgsvectorlayerundocommand.cpp index 6f055802cdec..46b3adea1dad 100644 --- a/src/core/qgsvectorlayerundocommand.cpp +++ b/src/core/qgsvectorlayerundocommand.cpp @@ -7,15 +7,15 @@ #include "qgslogger.h" QgsUndoCommand::GeometryChangeEntry::GeometryChangeEntry() - : original(NULL), target(NULL) + : original( NULL ), target( NULL ) { } -void QgsUndoCommand::GeometryChangeEntry::setOriginalGeometry(QgsGeometry& orig) +void QgsUndoCommand::GeometryChangeEntry::setOriginalGeometry( QgsGeometry& orig ) { - if (orig.type() != QGis::UnknownGeometry) + if ( orig.type() != QGis::UnknownGeometry ) { - original = new QgsGeometry(orig); + original = new QgsGeometry( orig ); } else { @@ -23,11 +23,11 @@ void QgsUndoCommand::GeometryChangeEntry::setOriginalGeometry(QgsGeometry& orig) } } -void QgsUndoCommand::GeometryChangeEntry::setTargetGeometry(QgsGeometry& dest) +void QgsUndoCommand::GeometryChangeEntry::setTargetGeometry( QgsGeometry& dest ) { - if (dest.type() != QGis::UnknownGeometry) + if ( dest.type() != QGis::UnknownGeometry ) { - target = new QgsGeometry(dest); + target = new QgsGeometry( dest ); } else { @@ -43,10 +43,10 @@ QgsUndoCommand::GeometryChangeEntry::~GeometryChangeEntry() } -QgsUndoCommand::QgsUndoCommand(QgsVectorLayer* vlayer, QString text) - : QUndoCommand() +QgsUndoCommand::QgsUndoCommand( QgsVectorLayer* vlayer, QString text ) + : QUndoCommand() { - setText(text); + setText( text ); mLayer = vlayer; mFirstRun = true; } @@ -55,62 +55,62 @@ void QgsUndoCommand::redo() { // when the command is added to the undo stack, the redo() function is called // but we have already done the changes in the layer, so we ignore the first redo() call - if (mFirstRun) + if ( mFirstRun ) { mFirstRun = false; return; } - mLayer->redoEditCommand(this); + mLayer->redoEditCommand( this ); } void QgsUndoCommand::undo() { - mLayer->undoEditCommand(this); + mLayer->undoEditCommand( this ); } -void QgsUndoCommand::storeGeometryChange(int featureId, QgsGeometry& original, QgsGeometry& target) +void QgsUndoCommand::storeGeometryChange( int featureId, QgsGeometry& original, QgsGeometry& target ) { if ( mGeometryChange.contains( featureId ) ) { // geometry has been modified already: just alter the resulting geometry - mGeometryChange[featureId].setTargetGeometry(target); + mGeometryChange[featureId].setTargetGeometry( target ); } else { // create new entry about changed geometry mGeometryChange.insert( featureId, GeometryChangeEntry() ); - mGeometryChange[featureId].setOriginalGeometry(original); - mGeometryChange[featureId].setTargetGeometry(target); + mGeometryChange[featureId].setOriginalGeometry( original ); + mGeometryChange[featureId].setTargetGeometry( target ); } } -void QgsUndoCommand::storeAttributeChange(int featureId, int field, QVariant original, QVariant target, bool isFirstChange) +void QgsUndoCommand::storeAttributeChange( int featureId, int field, QVariant original, QVariant target, bool isFirstChange ) { AttributeChangeEntry entry; entry.isFirstChange = isFirstChange; entry.original = original; entry.target = target; - mAttributeChange[featureId].insert(field, entry); + mAttributeChange[featureId].insert( field, entry ); } -void QgsUndoCommand::storeAttributeAdd(int index, const QgsField & value) +void QgsUndoCommand::storeAttributeAdd( int index, const QgsField & value ) { mAddedAttributes.insert( index, value ); } -void QgsUndoCommand::storeAttributeDelete(int index, const QgsField & orig) +void QgsUndoCommand::storeAttributeDelete( int index, const QgsField & orig ) { - mDeletedAttributes.insert(index, orig ); + mDeletedAttributes.insert( index, orig ); } -void QgsUndoCommand::storeFeatureDelete(int featureId) +void QgsUndoCommand::storeFeatureDelete( int featureId ) { - mDeletedFeatureIdChange.insert(featureId); + mDeletedFeatureIdChange.insert( featureId ); } -void QgsUndoCommand::storeFeatureAdd(QgsFeature& feature) +void QgsUndoCommand::storeFeatureAdd( QgsFeature& feature ) { - mAddedFeatures.append(feature); + mAddedFeatures.append( feature ); } diff --git a/src/core/qgsvectorlayerundocommand.h b/src/core/qgsvectorlayerundocommand.h index d111036b315d..d18ee1d59076 100644 --- a/src/core/qgsvectorlayerundocommand.h +++ b/src/core/qgsvectorlayerundocommand.h @@ -32,7 +32,7 @@ class QgsUndoCommand : public QUndoCommand /** change structure for attribute for undo/redo purpose */ class AttributeChangeEntry { - public: + public: bool isFirstChange; QVariant original; QVariant target; @@ -43,19 +43,19 @@ class QgsUndoCommand : public QUndoCommand /** change structure to geometry for undo/redo purpose */ class GeometryChangeEntry { - public: + public: GeometryChangeEntry(); ~GeometryChangeEntry(); - void setOriginalGeometry(QgsGeometry& orig); - void setTargetGeometry(QgsGeometry& target); + void setOriginalGeometry( QgsGeometry& orig ); + void setTargetGeometry( QgsGeometry& target ); QgsGeometry* original; QgsGeometry* target; }; - QgsUndoCommand(QgsVectorLayer* layer, QString text); + QgsUndoCommand( QgsVectorLayer* layer, QString text ); /** * Necessary function to provide undo operation @@ -73,7 +73,7 @@ class QgsUndoCommand : public QUndoCommand * @param original original geometry of feature which was changed * @param target changed geometry which was changed */ - void storeGeometryChange(int featureId, QgsGeometry& original, QgsGeometry& target); + void storeGeometryChange( int featureId, QgsGeometry& original, QgsGeometry& target ); /** * Stores changes of attributes for the feature to be returned to this state after undo/redo @@ -83,33 +83,33 @@ class QgsUndoCommand : public QUndoCommand * @param target target value of attribute after change * @param isFirstChange flag if this change is the first one */ - void storeAttributeChange(int featureId, int field, QVariant original, QVariant target, bool isFirstChange); + void storeAttributeChange( int featureId, int field, QVariant original, QVariant target, bool isFirstChange ); /** * Add id of feature to deleted list to be reverted if needed afterwards * @param featureId id of feature which is to be deleted */ - void storeFeatureDelete(int featureId); + void storeFeatureDelete( int featureId ); /** * Add new feature to list of new features to be stored for undo/redo operations. * @param feature feature which is to be added */ - void storeFeatureAdd(QgsFeature& feature); + void storeFeatureAdd( QgsFeature& feature ); /** * Add new attribute to list of attributes to be used for attributes of features for undo/redo operations. * @param index index of attribute which is to be added * @param value field description which is to be stored */ - void storeAttributeAdd(int index, const QgsField & value); + void storeAttributeAdd( int index, const QgsField & value ); /** * Add deleted attribute which is to be stored for undo/redo operations. * @param index index od attribute definition which is to be deleted * @param orig deleted field's description */ - void storeAttributeDelete(int index, const QgsField & orig); + void storeAttributeDelete( int index, const QgsField & orig ); private: /** Variable to disable first run of undo, because it's automaticaly done after push */ diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp index 86a882a59c27..5ea0cfff3782 100644 --- a/src/gui/qgsmapcanvas.cpp +++ b/src/gui/qgsmapcanvas.cpp @@ -613,14 +613,14 @@ void QgsMapCanvas::mapUnitsChanged() refresh(); } -void QgsMapCanvas::zoomToSelected(QgsVectorLayer* layer) +void QgsMapCanvas::zoomToSelected( QgsVectorLayer* layer ) { if ( mDrawing ) { return; } - if (layer == NULL) + if ( layer == NULL ) { // use current layer by default layer = dynamic_cast < QgsVectorLayer * >( mCurrentLayer ); diff --git a/src/gui/qgsmapcanvasmap.cpp b/src/gui/qgsmapcanvasmap.cpp index fbff8368d15c..29847030c2cc 100644 --- a/src/gui/qgsmapcanvasmap.cpp +++ b/src/gui/qgsmapcanvasmap.cpp @@ -71,7 +71,7 @@ void QgsMapCanvasMap::render() // clear the pixmap so that old map won't be displayed while rendering // TODO: do the canvas updates wisely -> this wouldn't be needed - mPixmap = QPixmap(mImage.size()); + mPixmap = QPixmap( mImage.size() ); mPixmap.fill( mBgColor.rgb() ); QPainter paint; @@ -88,7 +88,7 @@ void QgsMapCanvasMap::render() paint.end(); // convert QImage to QPixmap to acheive faster drawing on screen - mPixmap = QPixmap::fromImage(mImage); + mPixmap = QPixmap::fromImage( mImage ); } else { @@ -112,7 +112,7 @@ void QgsMapCanvasMap::updateContents() { // make sure we're using current contents if ( mUseQImageToRender ) - mPixmap = QPixmap::fromImage(mImage); + mPixmap = QPixmap::fromImage( mImage ); // trigger update of this item update(); diff --git a/src/plugins/grass/qgsgrassbrowser.cpp b/src/plugins/grass/qgsgrassbrowser.cpp index 43988ca0be3c..9d5fc56785f3 100644 --- a/src/plugins/grass/qgsgrassbrowser.cpp +++ b/src/plugins/grass/qgsgrassbrowser.cpp @@ -95,7 +95,7 @@ QgsGrassBrowser::QgsGrassBrowser( QgisInterface *iface, mTree = new QTreeView( 0 ); mTree->header()->hide(); mTree->setModel( mModel ); - mTree->setSelectionMode(QAbstractItemView::ExtendedSelection); + mTree->setSelectionMode( QAbstractItemView::ExtendedSelection ); mTextBrowser = new QTextBrowser( 0 ); mTextBrowser->setReadOnly( TRUE ); diff --git a/src/plugins/grass/qgsgrassmodel.cpp b/src/plugins/grass/qgsgrassmodel.cpp index 1bd875716984..7c7fcdca3de4 100644 --- a/src/plugins/grass/qgsgrassmodel.cpp +++ b/src/plugins/grass/qgsgrassmodel.cpp @@ -368,39 +368,40 @@ QString QgsGrassModelItem::info() return str; } break; - + case QgsGrassModel::Region: { QString str = tblStart; str += htmlTableRow( QObject::tr( "Region" ), QString( "%1" ).arg( mMap ) ); - + struct Cell_head window; QgsGrass::setLocation( mGisbase, mLocation ); - if ( G__get_window( &window, "windows", mMap.toLocal8Bit().data(), mMapset.toLocal8Bit().data()) != NULL) + if ( G__get_window( &window, "windows", mMap.toLocal8Bit().data(), mMapset.toLocal8Bit().data() ) != NULL ) { str += "" + QObject::tr( "Cannot open region header" ) + ""; } else { QString proj; - switch (window.proj){ + switch ( window.proj ) + { case PROJECTION_XY: - proj = QObject::tr("XY"); + proj = QObject::tr( "XY" ); break; case PROJECTION_UTM: - proj = QObject::tr("UTM"); + proj = QObject::tr( "UTM" ); break; case PROJECTION_SP: - proj = QObject::tr("SP"); + proj = QObject::tr( "SP" ); break; case PROJECTION_LL: - proj = QObject::tr("LL"); + proj = QObject::tr( "LL" ); break; default: - proj = QObject::tr("Other"); + proj = QObject::tr( "Other" ); } str += htmlTableRow( QObject::tr( "Projection Type" ), proj ); - if ( window.proj == PROJECTION_UTM) + if ( window.proj == PROJECTION_UTM ) str += htmlTableRow( QObject::tr( "Zone" ), QString::number( window.zone ) ); str += htmlTableRow( QObject::tr( "North" ), QString::number( window.north, 'f', 8 ) ); str += htmlTableRow( QObject::tr( "South" ), QString::number( window.south, 'f', 8 ) ); @@ -415,9 +416,9 @@ QString QgsGrassModelItem::info() str += htmlTableRow( QObject::tr( "3D Cols" ), QString::number( window.cols3 ) ); str += htmlTableRow( QObject::tr( "3D Rows" ), QString::number( window.rows3 ) ); str += htmlTableRow( QObject::tr( "Depths" ), QString::number( window.depths ) ); - str += htmlTableRow( QObject::tr( "E-W 3D resolution"), QString::number( window.ew_res3, 'f', 8 ) ); - str += htmlTableRow( QObject::tr( "N-S 3D resolution"), QString::number( window.ns_res3, 'f', 8 ) ); - } + str += htmlTableRow( QObject::tr( "E-W 3D resolution" ), QString::number( window.ew_res3, 'f', 8 ) ); + str += htmlTableRow( QObject::tr( "N-S 3D resolution" ), QString::number( window.ns_res3, 'f', 8 ) ); + } str += ""; return str; } diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp index ecf05280f7c9..bbd6360ab20a 100644 --- a/src/plugins/grass/qgsgrassmodule.cpp +++ b/src/plugins/grass/qgsgrassmodule.cpp @@ -1501,7 +1501,7 @@ void QgsGrassModule::viewOutput() QString name = QgsGrassUtils::vectorLayerName( map, layers[j], 1 ); - + mIface->addVectorLayer( uri, name, "grass" ); } } @@ -3016,7 +3016,7 @@ QgsGrassModuleFile::QgsGrassModuleFile( if ( qdesc.attribute( "type" ).toLower() == "new" ) { mType = New; - } + } if ( qdesc.attribute( "type" ).toLower() == "multiple" ) { mType = Multiple; @@ -3081,7 +3081,8 @@ void QgsGrassModuleFile::browse() static QDir currentDir = QDir::current(); fd->setDirectory( currentDir ); - switch( mType ) { + switch ( mType ) + { case New: fd->setFileMode( QFileDialog::AnyFile ); fd->setAcceptMode( QFileDialog::AcceptSave ); @@ -3104,11 +3105,11 @@ void QgsGrassModuleFile::browse() if ( fd->exec() == QDialog::Accepted ) { QString selectedFile = fd->selectedFiles().last(); - QFileInfo fi = QFileInfo(selectedFile); + QFileInfo fi = QFileInfo( selectedFile ); currentDir = fi.absoluteDir(); - if (mType == Multiple) + if ( mType == Multiple ) { - selectedFile = fd->selectedFiles().join(","); + selectedFile = fd->selectedFiles().join( "," ); } mLineEdit->setText( selectedFile ); } diff --git a/src/plugins/interpolation/DualEdgeTriangulation.cc b/src/plugins/interpolation/DualEdgeTriangulation.cc index c48bd839e0d3..78a44ea812ed 100644 --- a/src/plugins/interpolation/DualEdgeTriangulation.cc +++ b/src/plugins/interpolation/DualEdgeTriangulation.cc @@ -1121,7 +1121,7 @@ bool DualEdgeTriangulation::getTriangle( double x, double y, Point3D* p1, Point3 int ptnr1 = mHalfEdge[edge1]->getPoint(); int ptnr2 = mHalfEdge[edge2]->getPoint(); int ptnr3 = mHalfEdge[edge3]->getPoint(); - if(ptnr1 == -1 || ptnr2 == -1 || ptnr3 == -1) + if ( ptnr1 == -1 || ptnr2 == -1 || ptnr3 == -1 ) { return false; } diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h index d4445b22271e..17b873c73efd 100644 --- a/src/providers/postgres/qgspostgresprovider.h +++ b/src/providers/postgres/qgspostgresprovider.h @@ -196,7 +196,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider * @param index the index of the attribute * @param enumList reference to the list to fill @note: added in version 1.2*/ - virtual void enumValues( int index, QStringList& enumList); + virtual void enumValues( int index, QStringList& enumList ); /**Returns true if layer is valid */ @@ -349,14 +349,14 @@ class QgsPostgresProvider : public QgsVectorDataProvider @param enumValues the stringlist where the values are appended @param attributeName the name of the enum attribute @return true in case of success and fals in case of error (e.g. if the type is not an enum type)*/ - bool parseEnumRange(QStringList& enumValues, const QString& attributeName) const; + bool parseEnumRange( QStringList& enumValues, const QString& attributeName ) const; /** Parses the possible enum values of a domain type (given in the check constraint of the domain type) @param enumValues Reference to list that receives enum values @param attributeName Name of the domain type attribute @return true in case of success and false in case of error (e.g. if the attribute is not a domain type or does not have a check constraint) */ - bool parseDomainCheckConstraint(QStringList& enumValues, const QString& attributeName) const; + bool parseDomainCheckConstraint( QStringList& enumValues, const QString& attributeName ) const; bool mFetching; // true if a cursor was declared std::vector < QgsFeature > features;