|
19 | 19 | #include "qgscurve.h"
|
20 | 20 | #include "qgscurvepolygon.h"
|
21 | 21 | #include "qgsgeometryutils.h"
|
| 22 | +#include "qgsgeometryvalidator.h" |
22 | 23 | #include "qgslogger.h"
|
23 | 24 | #include "qgsmapcanvas.h"
|
24 | 25 | #include "qgsmulticurve.h"
|
25 | 26 | #include "qgspointlocator.h"
|
26 | 27 | #include "qgsproject.h"
|
27 | 28 | #include "qgsrubberband.h"
|
| 29 | +#include "qgssettings.h" |
28 | 30 | #include "qgssnappingutils.h"
|
29 | 31 | #include "qgsvectorlayer.h"
|
30 | 32 | #include "qgsvertexmarker.h"
|
@@ -845,6 +847,9 @@ void QgsNodeTool2::onCachedGeometryChanged( QgsFeatureId fid, const QgsGeometry
|
845 | 847 |
|
846 | 848 | // refresh highlighted nodes - their position may have changed
|
847 | 849 | setHighlightedNodes( mSelectedNodes );
|
| 850 | + |
| 851 | + // re-run validation for the feature |
| 852 | + validateGeometry( layer, fid ); |
848 | 853 | }
|
849 | 854 |
|
850 | 855 | void QgsNodeTool2::onCachedGeometryDeleted( QgsFeatureId fid )
|
@@ -1521,7 +1526,6 @@ void QgsNodeTool2::deleteVertex()
|
1521 | 1526 | setHighlightedNodes( nodes_new );
|
1522 | 1527 | }
|
1523 | 1528 | }
|
1524 |
| - |
1525 | 1529 | }
|
1526 | 1530 |
|
1527 | 1531 | void QgsNodeTool2::setHighlightedNodes( QList<Vertex> listNodes )
|
@@ -1635,3 +1639,106 @@ void QgsNodeTool2::CircularBand::updateRubberBand( const QgsPoint &mapPoint )
|
1635 | 1639 | Q_FOREACH ( const QgsPointV2 &p, points )
|
1636 | 1640 | band->addPoint( p );
|
1637 | 1641 | }
|
| 1642 | + |
| 1643 | + |
| 1644 | +void QgsNodeTool2::validationErrorFound( QgsGeometry::Error e ) |
| 1645 | +{ |
| 1646 | + QgsGeometryValidator *validator = qobject_cast<QgsGeometryValidator *>( sender() ); |
| 1647 | + if ( !validator ) |
| 1648 | + return; |
| 1649 | + |
| 1650 | + QHash< QPair<QgsVectorLayer *, QgsFeatureId>, GeometryValidation>::iterator it = mValidations.begin(); |
| 1651 | + for ( ; it != mValidations.end(); ++it ) |
| 1652 | + { |
| 1653 | + GeometryValidation &validation = *it; |
| 1654 | + if ( validation.validator == validator ) |
| 1655 | + { |
| 1656 | + validation.addError( e ); |
| 1657 | + break; |
| 1658 | + } |
| 1659 | + } |
| 1660 | +} |
| 1661 | + |
| 1662 | +void QgsNodeTool2::validationFinished() |
| 1663 | +{ |
| 1664 | + QgsGeometryValidator *validator = qobject_cast<QgsGeometryValidator *>( sender() ); |
| 1665 | + if ( !validator ) |
| 1666 | + return; |
| 1667 | + |
| 1668 | + QHash< QPair<QgsVectorLayer *, QgsFeatureId>, GeometryValidation>::iterator it = mValidations.begin(); |
| 1669 | + for ( ; it != mValidations.end(); ++it ) |
| 1670 | + { |
| 1671 | + GeometryValidation &validation = *it; |
| 1672 | + if ( validation.validator == validator ) |
| 1673 | + { |
| 1674 | + QStatusBar *sb = QgisApp::instance()->statusBar(); |
| 1675 | + sb->showMessage( tr( "Validation finished (%n error(s) found).", "number of geometry errors", validation.errorMarkers.size() ) ); |
| 1676 | + } |
| 1677 | + } |
| 1678 | +} |
| 1679 | + |
| 1680 | +void QgsNodeTool2::GeometryValidation::start( QgsGeometry &geom, QgsNodeTool2 *t, QgsVectorLayer *l ) |
| 1681 | +{ |
| 1682 | + tool = t; |
| 1683 | + layer = l; |
| 1684 | + validator = new QgsGeometryValidator( &geom ); |
| 1685 | + connect( validator, &QgsGeometryValidator::errorFound, tool, &QgsNodeTool2::validationErrorFound ); |
| 1686 | + connect( validator, &QThread::finished, tool, &QgsNodeTool2::validationFinished ); |
| 1687 | + validator->start(); |
| 1688 | +} |
| 1689 | + |
| 1690 | +void QgsNodeTool2::GeometryValidation::addError( QgsGeometry::Error e ) |
| 1691 | +{ |
| 1692 | + if ( !errors.isEmpty() ) |
| 1693 | + errors += '\n'; |
| 1694 | + errors += e.what(); |
| 1695 | + |
| 1696 | + if ( e.hasWhere() ) |
| 1697 | + { |
| 1698 | + QgsVertexMarker *marker = new QgsVertexMarker( tool->canvas() ); |
| 1699 | + marker->setCenter( tool->canvas()->mapSettings().layerToMapCoordinates( layer, e.where() ) ); |
| 1700 | + marker->setIconType( QgsVertexMarker::ICON_X ); |
| 1701 | + marker->setColor( Qt::green ); |
| 1702 | + marker->setZValue( marker->zValue() + 1 ); |
| 1703 | + marker->setPenWidth( 2 ); |
| 1704 | + marker->setToolTip( e.what() ); |
| 1705 | + errorMarkers << marker; |
| 1706 | + } |
| 1707 | + |
| 1708 | + QStatusBar *sb = QgisApp::instance()->statusBar(); |
| 1709 | + sb->showMessage( e.what() ); |
| 1710 | + sb->setToolTip( errors ); |
| 1711 | +} |
| 1712 | + |
| 1713 | +void QgsNodeTool2::GeometryValidation::cleanup() |
| 1714 | +{ |
| 1715 | + if ( validator ) |
| 1716 | + { |
| 1717 | + validator->stop(); |
| 1718 | + validator->wait(); |
| 1719 | + validator->deleteLater(); |
| 1720 | + validator = nullptr; |
| 1721 | + } |
| 1722 | + |
| 1723 | + qDeleteAll( errorMarkers ); |
| 1724 | + errorMarkers.clear(); |
| 1725 | +} |
| 1726 | + |
| 1727 | +void QgsNodeTool2::validateGeometry( QgsVectorLayer *layer, QgsFeatureId featureId ) |
| 1728 | +{ |
| 1729 | + QgsSettings settings; |
| 1730 | + if ( settings.value( QStringLiteral( "qgis/digitizing/validate_geometries" ), 1 ).toInt() == 0 ) |
| 1731 | + return; |
| 1732 | + |
| 1733 | + QPair<QgsVectorLayer *, QgsFeatureId> id( layer, featureId ); |
| 1734 | + if ( mValidations.contains( id ) ) |
| 1735 | + { |
| 1736 | + mValidations[id].cleanup(); |
| 1737 | + mValidations.remove( id ); |
| 1738 | + } |
| 1739 | + |
| 1740 | + GeometryValidation validation; |
| 1741 | + QgsGeometry geom = cachedGeometry( layer, featureId ); |
| 1742 | + validation.start( geom, this, layer ); |
| 1743 | + mValidations.insert( id, validation ); |
| 1744 | +} |
0 commit comments