sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

[ui] Make vertex tool markers and rubber bands hidpi-friendly

Browse Source
This commit is contained in:
Mathieu Pellerin 2019-02-02 18:04:00 +07:00
parent 57695bd036
commit 59aea69894
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/vertextool/qgsvertextool.cpp
View File

@ -20,6 +20,7 @@
#include "qgscurvepolygon.h" #include "qgscurvepolygon.h"
#include "qgsgeometryutils.h" #include "qgsgeometryutils.h"
#include "qgsgeometryvalidator.h" #include "qgsgeometryvalidator.h"
#include "qgsguiutils.h"
#include "qgslogger.h" #include "qgslogger.h"
#include "qgsmapcanvas.h" #include "qgsmapcanvas.h"
#include "qgsmulticurve.h" #include "qgsmulticurve.h"
@ -256,7 +257,8 @@ QgsVertexTool::QgsVertexTool( QgsMapCanvas *canvas, QgsAdvancedDigitizingDockWid
mEdgeCenterMarker = new QgsVertexMarker( canvas ); mEdgeCenterMarker = new QgsVertexMarker( canvas );
mEdgeCenterMarker->setIconType( QgsVertexMarker::ICON_CROSS ); mEdgeCenterMarker->setIconType( QgsVertexMarker::ICON_CROSS );
mEdgeCenterMarker->setColor( Qt::red ); mEdgeCenterMarker->setColor( Qt::red );
mEdgeCenterMarker->setPenWidth( 3 ); mEdgeCenterMarker->setIconSize( QgsGuiUtils::scaleIconSize( 10 ) );
mEdgeCenterMarker->setPenWidth( QgsGuiUtils::scaleIconSize( 3 ) );
mEdgeCenterMarker->setVisible( false ); mEdgeCenterMarker->setVisible( false );
mFeatureBand = createRubberBand( QgsWkbTypes::LineGeometry ); mFeatureBand = createRubberBand( QgsWkbTypes::LineGeometry );
@ -266,26 +268,27 @@ QgsVertexTool::QgsVertexTool( QgsMapCanvas *canvas, QgsAdvancedDigitizingDockWid
mFeatureBandMarkers = new QgsRubberBand( canvas ); mFeatureBandMarkers = new QgsRubberBand( canvas );
mFeatureBandMarkers->setIcon( QgsRubberBand::ICON_CIRCLE ); mFeatureBandMarkers->setIcon( QgsRubberBand::ICON_CIRCLE );
mFeatureBandMarkers->setColor( color ); mFeatureBandMarkers->setColor( color );
mFeatureBandMarkers->setIconSize( 8 ); mFeatureBandMarkers->setIconSize( QgsGuiUtils::scaleIconSize( 8 ) );
mFeatureBandMarkers->setVisible( false ); mFeatureBandMarkers->setVisible( false );
mVertexBand = new QgsRubberBand( canvas ); mVertexBand = new QgsRubberBand( canvas );
mVertexBand->setIcon( QgsRubberBand::ICON_CIRCLE ); mVertexBand->setIcon( QgsRubberBand::ICON_CIRCLE );
mVertexBand->setColor( color ); mVertexBand->setColor( color );
mVertexBand->setIconSize( 15 ); mVertexBand->setIconSize( QgsGuiUtils::scaleIconSize( 15 ) );
mVertexBand->setVisible( false ); mVertexBand->setVisible( false );
QColor color2( color ); QColor color2( color );
color2.setAlpha( color2.alpha() / 3 ); color2.setAlpha( color2.alpha() / 3 );
mEdgeBand = new QgsRubberBand( canvas ); mEdgeBand = new QgsRubberBand( canvas );
mEdgeBand->setColor( color2 ); mEdgeBand->setColor( color2 );
mEdgeBand->setWidth( 10 ); mEdgeBand->setWidth( QgsGuiUtils::scaleIconSize( 10 ) );
mEdgeBand->setVisible( false ); mEdgeBand->setVisible( false );
mEndpointMarker = new QgsVertexMarker( canvas ); mEndpointMarker = new QgsVertexMarker( canvas );
mEndpointMarker->setIconType( QgsVertexMarker::ICON_CROSS ); mEndpointMarker->setIconType( QgsVertexMarker::ICON_CROSS );
mEndpointMarker->setColor( Qt::red ); mEndpointMarker->setColor( Qt::red );
mEndpointMarker->setPenWidth( 3 ); mEndpointMarker->setIconSize( QgsGuiUtils::scaleIconSize( 10 ) );
mEndpointMarker->setPenWidth( QgsGuiUtils::scaleIconSize( 3 ) );
mEndpointMarker->setVisible( false ); mEndpointMarker->setVisible( false );
} }
@ -1530,7 +1533,8 @@ void QgsVertexTool::buildDragBandsForVertices( const QSet<Vertex> &movingVertice
QgsVertexMarker *marker = new QgsVertexMarker( mCanvas ); QgsVertexMarker *marker = new QgsVertexMarker( mCanvas );
marker->setIconType( QgsVertexMarker::ICON_X ); marker->setIconType( QgsVertexMarker::ICON_X );
marker->setColor( Qt::red ); marker->setColor( Qt::red );
marker->setPenWidth( 3 ); marker->setIconSize( QgsGuiUtils::scaleIconSize( 10 ) );
marker->setPenWidth( QgsGuiUtils::scaleIconSize( 3 ) );
marker->setVisible( true ); marker->setVisible( true );
marker->setCenter( ptMapPoint ); marker->setCenter( ptMapPoint );
mDragPointMarkers << marker; mDragPointMarkers << marker;
@ -2103,7 +2107,8 @@ void QgsVertexTool::setHighlightedVertices( const QList<Vertex> &listVertices, H
QgsVertexMarker *marker = new QgsVertexMarker( canvas() ); QgsVertexMarker *marker = new QgsVertexMarker( canvas() );
marker->setIconType( QgsVertexMarker::ICON_CIRCLE ); marker->setIconType( QgsVertexMarker::ICON_CIRCLE );
marker->setPenWidth( 3 ); marker->setIconSize( QgsGuiUtils::scaleIconSize( 10 ) );
marker->setPenWidth( QgsGuiUtils::scaleIconSize( 3 ) );
marker->setColor( Qt::blue ); marker->setColor( Qt::blue );
marker->setFillColor( Qt::blue ); marker->setFillColor( Qt::blue );
marker->setCenter( toMapCoordinates( vertex.layer, geom.vertexAt( vertex.vertexId ) ) ); marker->setCenter( toMapCoordinates( vertex.layer, geom.vertexAt( vertex.vertexId ) ) );
@ -2312,7 +2317,8 @@ void QgsVertexTool::GeometryValidation::addError( QgsGeometry::Error e )
marker->setIconType( QgsVertexMarker::ICON_X ); marker->setIconType( QgsVertexMarker::ICON_X );
marker->setColor( Qt::green ); marker->setColor( Qt::green );
marker->setZValue( marker->zValue() + 1 ); marker->setZValue( marker->zValue() + 1 );
marker->setPenWidth( 2 ); marker->setIconSize( QgsGuiUtils::scaleIconSize( 10 ) );
marker->setPenWidth( QgsGuiUtils::scaleIconSize( 2 ) );
marker->setToolTip( e.what() ); marker->setToolTip( e.what() );
errorMarkers << marker; errorMarkers << marker;
} }