diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 98f9a12a5cc2..b150b6a289a6 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -120,7 +120,7 @@ SET(QGIS_APP_SRCS decorations/qgsdecorationgrid.cpp decorations/qgsdecorationgriddialog.cpp - vertextool/qgsselectedfeature.cpp + vertextool/qgslockedfeature.cpp vertextool/qgsvertexentry.cpp vertextool/qgsvertexeditor.cpp vertextool/qgsvertextool.cpp @@ -372,7 +372,7 @@ SET (QGIS_APP_MOC_HDRS decorations/qgsdecorationgrid.h decorations/qgsdecorationgriddialog.h - vertextool/qgsselectedfeature.h + vertextool/qgslockedfeature.h vertextool/qgsvertexeditor.h vertextool/qgsvertextool.h diff --git a/src/app/vertextool/qgsselectedfeature.cpp b/src/app/vertextool/qgslockedfeature.cpp similarity index 72% rename from src/app/vertextool/qgsselectedfeature.cpp rename to src/app/vertextool/qgslockedfeature.cpp index 1a47ca3f6c8d..26d9dc306a22 100644 --- a/src/app/vertextool/qgsselectedfeature.cpp +++ b/src/app/vertextool/qgslockedfeature.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsselectedfeature.cpp - selected feature of vertextool + qgslockedfeature.cpp - locked feature of vertextool --------------------- begin : April 2009 copyright : (C) 2009 by Richard Kostecky @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include "vertextool/qgsselectedfeature.h" +#include "vertextool/qgslockedfeature.h" #include "vertextool/qgsvertexentry.h" #include "qgsfeatureiterator.h" @@ -32,16 +32,16 @@ #include "qgsmapcanvas.h" -QgsSelectedFeature::QgsSelectedFeature( QgsFeatureId featureId, - QgsVectorLayer *vlayer, - QgsMapCanvas *canvas ) +QgsLockedFeature::QgsLockedFeature( QgsFeatureId featureId, + QgsVectorLayer *vlayer, + QgsMapCanvas *canvas ) : mFeatureId( featureId ) , mChangingGeometry( false ) { setSelectedFeature( featureId, vlayer, canvas ); } -QgsSelectedFeature::~QgsSelectedFeature() +QgsLockedFeature::~QgsLockedFeature() { deleteVertexMap(); @@ -61,13 +61,13 @@ QgsSelectedFeature::~QgsSelectedFeature() delete mGeometry; } -void QgsSelectedFeature::currentLayerChanged( QgsMapLayer *layer ) +void QgsLockedFeature::currentLayerChanged( QgsMapLayer *layer ) { if ( layer == mLayer ) deleteLater(); } -void QgsSelectedFeature::updateGeometry( const QgsGeometry *geom ) +void QgsLockedFeature::updateGeometry( const QgsGeometry *geom ) { delete mGeometry; @@ -86,7 +86,7 @@ void QgsSelectedFeature::updateGeometry( const QgsGeometry *geom ) } } -void QgsSelectedFeature::setSelectedFeature( QgsFeatureId featureId, QgsVectorLayer *layer, QgsMapCanvas *canvas ) +void QgsLockedFeature::setSelectedFeature( QgsFeatureId featureId, QgsVectorLayer *layer, QgsMapCanvas *canvas ) { mFeatureId = featureId; mLayer = layer; @@ -96,58 +96,58 @@ void QgsSelectedFeature::setSelectedFeature( QgsFeatureId featureId, QgsVectorLa mGeometry = nullptr; // signal changing of current layer - connect( QgisApp::instance()->layerTreeView(), &QgsLayerTreeView::currentLayerChanged, this, &QgsSelectedFeature::currentLayerChanged ); + connect( QgisApp::instance()->layerTreeView(), &QgsLayerTreeView::currentLayerChanged, this, &QgsLockedFeature::currentLayerChanged ); // feature was deleted - connect( mLayer, &QgsVectorLayer::featureDeleted, this, &QgsSelectedFeature::featureDeleted ); + connect( mLayer, &QgsVectorLayer::featureDeleted, this, &QgsLockedFeature::featureDeleted ); // rolling back - connect( mLayer, &QgsVectorLayer::beforeRollBack, this, &QgsSelectedFeature::beforeRollBack ); + connect( mLayer, &QgsVectorLayer::beforeRollBack, this, &QgsLockedFeature::beforeRollBack ); // projection or extents changed - connect( canvas, &QgsMapCanvas::destinationCrsChanged, this, &QgsSelectedFeature::updateVertexMarkersPosition ); - connect( canvas, &QgsMapCanvas::extentsChanged, this, &QgsSelectedFeature::updateVertexMarkersPosition ); + connect( canvas, &QgsMapCanvas::destinationCrsChanged, this, &QgsLockedFeature::updateVertexMarkersPosition ); + connect( canvas, &QgsMapCanvas::extentsChanged, this, &QgsLockedFeature::updateVertexMarkersPosition ); // geometry was changed - connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsSelectedFeature::geometryChanged ); + connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsLockedFeature::geometryChanged ); replaceVertexMap(); } -void QgsSelectedFeature::beforeRollBack() +void QgsLockedFeature::beforeRollBack() { - disconnect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsSelectedFeature::geometryChanged ); + disconnect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsLockedFeature::geometryChanged ); deleteVertexMap(); } -void QgsSelectedFeature::beginGeometryChange() +void QgsLockedFeature::beginGeometryChange() { Q_ASSERT( !mChangingGeometry ); mChangingGeometry = true; - disconnect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsSelectedFeature::geometryChanged ); + disconnect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsLockedFeature::geometryChanged ); } -void QgsSelectedFeature::endGeometryChange() +void QgsLockedFeature::endGeometryChange() { Q_ASSERT( mChangingGeometry ); mChangingGeometry = false; - connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsSelectedFeature::geometryChanged ); + connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsLockedFeature::geometryChanged ); } -void QgsSelectedFeature::canvasLayersChanged() +void QgsLockedFeature::canvasLayersChanged() { currentLayerChanged( mCanvas->currentLayer() ); } -void QgsSelectedFeature::featureDeleted( QgsFeatureId fid ) +void QgsLockedFeature::featureDeleted( QgsFeatureId fid ) { if ( fid == mFeatureId ) deleteLater(); } -void QgsSelectedFeature::geometryChanged( QgsFeatureId fid, const QgsGeometry &geom ) +void QgsLockedFeature::geometryChanged( QgsFeatureId fid, const QgsGeometry &geom ) { QgsDebugCall; @@ -159,7 +159,7 @@ void QgsSelectedFeature::geometryChanged( QgsFeatureId fid, const QgsGeometry &g replaceVertexMap(); } -void QgsSelectedFeature::validateGeometry( QgsGeometry *g ) +void QgsLockedFeature::validateGeometry( QgsGeometry *g ) { QgsSettings settings; if ( settings.value( QStringLiteral( "qgis/digitizing/validate_geometries" ), 1 ).toInt() == 0 ) @@ -190,15 +190,15 @@ void QgsSelectedFeature::validateGeometry( QgsGeometry *g ) if ( settings.value( QStringLiteral( "qgis/digitizing/validate_geometries" ), 1 ).toInt() == 2 ) method = QgsGeometry::ValidatorGeos; mValidator = new QgsGeometryValidator( *g, nullptr, method ); - connect( mValidator, &QgsGeometryValidator::errorFound, this, &QgsSelectedFeature::addError ); - connect( mValidator, &QThread::finished, this, &QgsSelectedFeature::validationFinished ); + connect( mValidator, &QgsGeometryValidator::errorFound, this, &QgsLockedFeature::addError ); + connect( mValidator, &QThread::finished, this, &QgsLockedFeature::validationFinished ); mValidator->start(); QgsStatusBar *sb = QgisApp::instance()->statusBarIface(); sb->showMessage( tr( "Validation started." ) ); } -void QgsSelectedFeature::addError( QgsGeometry::Error e ) +void QgsLockedFeature::addError( QgsGeometry::Error e ) { mGeomErrors << e; if ( !mTip.isEmpty() ) @@ -223,13 +223,13 @@ void QgsSelectedFeature::addError( QgsGeometry::Error e ) sb->setToolTip( mTip ); } -void QgsSelectedFeature::validationFinished() +void QgsLockedFeature::validationFinished() { QgsStatusBar *sb = QgisApp::instance()->statusBarIface(); sb->showMessage( tr( "Validation finished (%n error(s) found).", "number of geometry errors", mGeomErrorMarkers.size() ) ); } -void QgsSelectedFeature::replaceVertexMap() +void QgsLockedFeature::replaceVertexMap() { // delete old map deleteVertexMap(); @@ -243,7 +243,7 @@ void QgsSelectedFeature::replaceVertexMap() emit vertexMapChanged(); } -void QgsSelectedFeature::deleteVertexMap() +void QgsLockedFeature::deleteVertexMap() { Q_FOREACH ( QgsVertexEntry *entry, mVertexMap ) { @@ -253,18 +253,18 @@ void QgsSelectedFeature::deleteVertexMap() mVertexMap.clear(); } -bool QgsSelectedFeature::isSelected( int vertexNr ) +bool QgsLockedFeature::isSelected( int vertexNr ) { return mVertexMap.at( vertexNr )->isSelected(); } -QgsGeometry *QgsSelectedFeature::geometry() +QgsGeometry *QgsLockedFeature::geometry() { Q_ASSERT( mGeometry ); return mGeometry; } -void QgsSelectedFeature::createVertexMap() +void QgsLockedFeature::createVertexMap() { if ( !mGeometry ) @@ -292,7 +292,7 @@ void QgsSelectedFeature::createVertexMap() } } -void QgsSelectedFeature::selectVertex( int vertexNr ) +void QgsLockedFeature::selectVertex( int vertexNr ) { if ( vertexNr < 0 || vertexNr >= mVertexMap.size() ) return; @@ -303,7 +303,7 @@ void QgsSelectedFeature::selectVertex( int vertexNr ) emit selectionChanged(); } -void QgsSelectedFeature::deselectVertex( int vertexNr ) +void QgsLockedFeature::deselectVertex( int vertexNr ) { if ( vertexNr < 0 || vertexNr >= mVertexMap.size() ) return; @@ -314,7 +314,7 @@ void QgsSelectedFeature::deselectVertex( int vertexNr ) emit selectionChanged(); } -void QgsSelectedFeature::deselectAllVertices() +void QgsLockedFeature::deselectAllVertices() { for ( int i = 0; i < mVertexMap.size(); i++ ) { @@ -323,7 +323,7 @@ void QgsSelectedFeature::deselectAllVertices() emit selectionChanged(); } -void QgsSelectedFeature::invertVertexSelection( int vertexNr ) +void QgsLockedFeature::invertVertexSelection( int vertexNr ) { if ( vertexNr < 0 || vertexNr >= mVertexMap.size() ) return; @@ -336,7 +336,7 @@ void QgsSelectedFeature::invertVertexSelection( int vertexNr ) emit selectionChanged(); } -void QgsSelectedFeature::invertVertexSelection( const QVector &vertexIndices ) +void QgsLockedFeature::invertVertexSelection( const QVector &vertexIndices ) { Q_FOREACH ( int index, vertexIndices ) { @@ -349,7 +349,7 @@ void QgsSelectedFeature::invertVertexSelection( const QVector &vertexIndice emit selectionChanged(); } -void QgsSelectedFeature::updateVertexMarkersPosition() +void QgsLockedFeature::updateVertexMarkersPosition() { Q_FOREACH ( QgsVertexEntry *vertexEntry, mVertexMap ) { @@ -357,17 +357,17 @@ void QgsSelectedFeature::updateVertexMarkersPosition() } } -QgsFeatureId QgsSelectedFeature::featureId() +QgsFeatureId QgsLockedFeature::featureId() { return mFeatureId; } -QList &QgsSelectedFeature::vertexMap() +QList &QgsLockedFeature::vertexMap() { return mVertexMap; } -QgsVectorLayer *QgsSelectedFeature::layer() +QgsVectorLayer *QgsLockedFeature::layer() { return mLayer; } diff --git a/src/app/vertextool/qgsselectedfeature.h b/src/app/vertextool/qgslockedfeature.h similarity index 94% rename from src/app/vertextool/qgsselectedfeature.h rename to src/app/vertextool/qgslockedfeature.h index 6231e8b9096e..fcbcf82f3c7d 100644 --- a/src/app/vertextool/qgsselectedfeature.h +++ b/src/app/vertextool/qgslockedfeature.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsselectedfeature.h - selected feature of vertextool + qgslockedfeature.h - selected feature of vertextool --------------------- begin : April 2009 copyright : (C) 2009 by Richard Kostecky @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QGSSELECTEDFEATURE_H -#define QGSSELECTEDFEATURE_H +#ifndef QGSLOCKEDFEATURE_H +#define QGSLOCKEDFEATURE_H #include "qgsgeometry.h" #include "qgsfeatureid.h" @@ -38,13 +38,13 @@ static const double ZERO_TOLERANCE = 0.000000001; /** * Class that keeps the selected feature */ -class QgsSelectedFeature: public QObject +class QgsLockedFeature: public QObject { Q_OBJECT public: - QgsSelectedFeature( QgsFeatureId id, QgsVectorLayer *layer, QgsMapCanvas *canvas ); - ~QgsSelectedFeature() override; + QgsLockedFeature( QgsFeatureId id, QgsVectorLayer *layer, QgsMapCanvas *canvas ); + ~QgsLockedFeature() override; /** * Setting selected feature diff --git a/src/app/vertextool/qgsvertexeditor.cpp b/src/app/vertextool/qgsvertexeditor.cpp index f06f90852a1a..aed91dd20722 100644 --- a/src/app/vertextool/qgsvertexeditor.cpp +++ b/src/app/vertextool/qgsvertexeditor.cpp @@ -19,7 +19,7 @@ #include "qgsvertexeditor.h" #include "qgsmapcanvas.h" #include "qgsmessagelog.h" -#include "qgsselectedfeature.h" +#include "qgslockedfeature.h" #include "qgsvertexentry.h" #include "qgsvectorlayer.h" #include "qgsgeometryutils.h" @@ -47,7 +47,7 @@ QgsVertexEditorModel::QgsVertexEditorModel( QgsMapCanvas *canvas, QObject *paren mWidgetFont = parentWidget->font(); } -void QgsVertexEditorModel::setFeature( QgsSelectedFeature *selectedFeature ) +void QgsVertexEditorModel::setFeature( QgsLockedFeature *selectedFeature ) { beginResetModel(); @@ -332,7 +332,7 @@ QgsVertexEditor::QgsVertexEditor( QgsMapCanvas *canvas ) setWidget( content ); } -void QgsVertexEditor::updateEditor( QgsSelectedFeature *selectedFeature ) +void QgsVertexEditor::updateEditor( QgsLockedFeature *selectedFeature ) { mSelectedFeature = selectedFeature; @@ -344,7 +344,7 @@ void QgsVertexEditor::updateEditor( QgsSelectedFeature *selectedFeature ) mHintLabel->setVisible( false ); mTableView->setVisible( true ); - connect( mSelectedFeature, &QgsSelectedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection ); + connect( mSelectedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection ); } else { diff --git a/src/app/vertextool/qgsvertexeditor.h b/src/app/vertextool/qgsvertexeditor.h index 38d3b1b8dec6..786568ed0a16 100644 --- a/src/app/vertextool/qgsvertexeditor.h +++ b/src/app/vertextool/qgsvertexeditor.h @@ -25,7 +25,7 @@ #include class QgsMapCanvas; -class QgsSelectedFeature; +class QgsLockedFeature; class QgsVectorLayer; class QLabel; @@ -38,7 +38,7 @@ class QgsVertexEditorModel : public QAbstractTableModel QgsVertexEditorModel( QgsMapCanvas *canvas, QObject *parent = nullptr ); - void setFeature( QgsSelectedFeature *selectedFeature ); + void setFeature( QgsLockedFeature *selectedFeature ); int rowCount( const QModelIndex &parent = QModelIndex() ) const override; int columnCount( const QModelIndex &parent = QModelIndex() ) const override; @@ -48,7 +48,7 @@ class QgsVertexEditorModel : public QAbstractTableModel Qt::ItemFlags flags( const QModelIndex &index ) const override; private: - QgsSelectedFeature *mSelectedFeature = nullptr; + QgsLockedFeature *mSelectedFeature = nullptr; QgsMapCanvas *mCanvas = nullptr; bool mHasZ = false; @@ -72,8 +72,8 @@ class QgsVertexEditor : public QgsDockWidget QgsVertexEditor( QgsMapCanvas *canvas ); public: - void updateEditor( QgsSelectedFeature *selectedFeature ); - QgsSelectedFeature *mSelectedFeature = nullptr; + void updateEditor( QgsLockedFeature *selectedFeature ); + QgsLockedFeature *mSelectedFeature = nullptr; QgsMapCanvas *mCanvas = nullptr; QTableView *mTableView = nullptr; QgsVertexEditorModel *mVertexModel = nullptr; diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp index ead23c52585c..5baf51b09e2d 100644 --- a/src/app/vertextool/qgsvertextool.cpp +++ b/src/app/vertextool/qgsvertextool.cpp @@ -35,7 +35,7 @@ #include "qgsvertexmarker.h" #include "qgsstatusbar.h" #include "qgisapp.h" -#include "qgsselectedfeature.h" +#include "qgslockedfeature.h" #include "qgsvertexeditor.h" #include "qgsvertexentry.h" #include "qgsmapmouseevent.h" @@ -1328,7 +1328,7 @@ void QgsVertexTool::updateVertexEditor( QgsVectorLayer *layer, QgsFeatureId fid return; } - mLockedFeature.reset( new QgsSelectedFeature( fid, layer, mCanvas ) ); + mLockedFeature.reset( new QgsLockedFeature( fid, layer, mCanvas ) ); connect( mLockedFeature->layer(), &QgsVectorLayer::featureDeleted, this, &QgsVertexTool::cleanEditor ); for ( int i = 0; i < mSelectedVertices.length(); ++i ) { @@ -1372,7 +1372,7 @@ void QgsVertexTool::cleanupVertexEditor() mVertexEditor.reset(); } -static int _firstSelectedVertex( QgsSelectedFeature &selectedFeature ) +static int _firstSelectedVertex( QgsLockedFeature &selectedFeature ) { QList &vertexMap = selectedFeature.vertexMap(); for ( int i = 0, n = vertexMap.size(); i < n; ++i ) @@ -1385,7 +1385,7 @@ static int _firstSelectedVertex( QgsSelectedFeature &selectedFeature ) return -1; } -static void _safeSelectVertex( QgsSelectedFeature &selectedFeature, int vertexNr ) +static void _safeSelectVertex( QgsLockedFeature &selectedFeature, int vertexNr ) { int n = selectedFeature.vertexMap().size(); selectedFeature.selectVertex( ( vertexNr + n ) % n ); diff --git a/src/app/vertextool/qgsvertextool.h b/src/app/vertextool/qgsvertextool.h index 3344247ee8ba..407c4cd375ee 100644 --- a/src/app/vertextool/qgsvertextool.h +++ b/src/app/vertextool/qgsvertextool.h @@ -28,7 +28,7 @@ class QRubberBand; class QgsGeometryValidator; class QgsVertexEditor; -class QgsSelectedFeature; +class QgsLockedFeature; class QgsSnapIndicator; class QgsVertexMarker; @@ -436,7 +436,7 @@ class APP_EXPORT QgsVertexTool : public QgsMapToolAdvancedDigitizing // support for vertex editor //! Selected feature for the vertex editor - std::unique_ptr mLockedFeature; + std::unique_ptr mLockedFeature; //! Dock widget which allows editing vertices std::unique_ptr mVertexEditor;