[FEATURE] Add inches as a measurement choice for symbology/labeling

"Make imperial great again!"

python/core/qgsunittypes.sip

@@ -69,6 +69,7 @@ class QgsUnitTypes
       RenderPixels, //!< pixels
       RenderPercentage, //!< percentage of another measurement (e.g., canvas size, feature size)
       RenderPoints, //! points (e.g., for font sizes)
+      RenderInches,
       RenderUnknownUnit, //!< mixed or unknown units
     };
 

src/app/qgsdiagramproperties.cpp

@@ -104,9 +104,9 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
   connect( mAttributeBasedScalingRadio, SIGNAL( toggled( bool ) ), this, SLOT( scalingTypeChanged() ) );
 
   mDiagramUnitComboBox->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                  << QgsUnitTypes::RenderPoints );
+                                  << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mDiagramLineUnitComboBox->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                      << QgsUnitTypes::RenderPoints );
+                                      << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   QgsWkbTypes::GeometryType layerType = layer->geometryType();
   if ( layerType == QgsWkbTypes::UnknownGeometry || layerType == QgsWkbTypes::NullGeometry )

src/app/qgsmaptooloffsetpointsymbol.cpp

@@ -240,6 +240,10 @@ QPointF QgsMapToolOffsetPointSymbol::calculateOffset( const QgsPoint& startPoint
       factor = 2.83464567 * 25.4 / mCanvas->mapSettings().outputDpi() / mCanvas->mapSettings().mapUnitsPerPixel() ;
       break;
 
+    case QgsUnitTypes::RenderInches:
+      factor = 1.0 / mCanvas->mapSettings().outputDpi() / mCanvas->mapSettings().mapUnitsPerPixel() ;
+      break;
+
     case QgsUnitTypes::RenderPixels:
       factor = 1.0 / mCanvas->mapSettings().mapUnitsPerPixel();
       break;

src/core/qgsrendercontext.cpp

@@ -24,6 +24,7 @@
 #include "qgsfeaturefilterprovider.h"
 
 #define POINTS_TO_MM 2.83464567
+#define INCH_TO_MM 25.4
 
 QgsRenderContext::QgsRenderContext()
     : mFlags( DrawEditingInfo | UseAdvancedEffects | DrawSelection | UseRenderingOptimization )
@@ -224,6 +225,10 @@ double QgsRenderContext::convertToPainterUnits( double size, QgsUnitTypes::Rende
       conversionFactor = mScaleFactor / POINTS_TO_MM;
       break;
 
+    case QgsUnitTypes::RenderInches:
+      conversionFactor = mScaleFactor * INCH_TO_MM;
+      break;
+
     case QgsUnitTypes::RenderMapUnits:
     {
       double mup = scale.computeMapUnitsPerPixel( *this );
@@ -303,6 +308,10 @@ double QgsRenderContext::convertToMapUnits( double size, QgsUnitTypes::RenderUni
     {
       return size * mScaleFactor * mup / POINTS_TO_MM;
     }
+    case QgsUnitTypes::RenderInches:
+    {
+      return size * mScaleFactor * mup * INCH_TO_MM;
+    }
     case QgsUnitTypes::RenderPixels:
     {
       return size * mup;
@@ -334,6 +343,10 @@ double QgsRenderContext::convertFromMapUnits( double sizeInMapUnits, QgsUnitType
     {
       return sizeInMapUnits / ( mScaleFactor * mup / POINTS_TO_MM );
     }
+    case QgsUnitTypes::RenderInches:
+    {
+      return sizeInMapUnits / ( mScaleFactor * mup * INCH_TO_MM );
+    }
     case QgsUnitTypes::RenderPixels:
     {
       return sizeInMapUnits / mup;

src/core/qgsunittypes.cpp

@@ -1081,9 +1081,12 @@ QString QgsUnitTypes::encodeUnit( RenderUnit unit )
       return QStringLiteral( "Percentage" );
     case RenderPoints:
       return QStringLiteral( "Point" );
-    default:
+    case RenderInches:
-      return QStringLiteral( "MM" );
+      return QStringLiteral( "Inch" );
+    case RenderUnknownUnit:
+      return QString();
   }
+  return QString();
 }
 
 QgsUnitTypes::RenderUnit QgsUnitTypes::decodeRenderUnit( const QString& string, bool* ok )
@@ -1109,6 +1112,8 @@ QgsUnitTypes::RenderUnit QgsUnitTypes::decodeRenderUnit( const QString& string,
     return RenderPoints;
   if ( normalized == QLatin1String( "points" ) )
     return RenderPoints;
+  if ( normalized == encodeUnit( RenderInches ).toLower() )
+    return RenderInches;
 
   if ( ok )
     *ok = false;

src/core/qgsunittypes.h

@@ -96,6 +96,7 @@ class CORE_EXPORT QgsUnitTypes
       RenderPixels, //!< Pixels
       RenderPercentage, //!< Percentage of another measurement (e.g., canvas size, feature size)
       RenderPoints, //! points (e.g., for font sizes)
+      RenderInches, //! Inches
       RenderUnknownUnit, //!< Mixed or unknown units
     };
 

src/gui/effects/qgspainteffectwidget.cpp

@@ -256,7 +256,7 @@ QgsShadowEffectWidget::QgsShadowEffectWidget( QWidget *parent )
   mShadowColorBtn->setContext( QStringLiteral( "symbology" ) );
 
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   initGui();
 }
@@ -422,7 +422,7 @@ QgsGlowWidget::QgsGlowWidget( QWidget *parent )
   mColorBtn->setContext( QStringLiteral( "symbology" ) );
 
   mSpreadUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   btnColorRamp->setShowGradientOnly( true );
 
@@ -612,7 +612,7 @@ QgsTransformWidget::QgsTransformWidget( QWidget *parent )
   setupUi( this );
 
   mTranslateUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits
-                                  << QgsUnitTypes::RenderPoints );
+                                  << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mSpinTranslateX->setClearValue( 0 );
   mSpinTranslateY->setClearValue( 0 );
   mSpinShearX->setClearValue( 0 );

src/gui/qgstextformatwidget.cpp

@@ -75,28 +75,28 @@ void QgsTextFormatWidget::initWidget()
     unitWidget->setMapCanvas( mMapCanvas );
   }
   mFontSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderMapUnits
-                                 << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels );
+                                 << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderInches );
   mBufferUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mShapeSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                  << QgsUnitTypes::RenderPoints );
+                                  << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mShapeOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                    << QgsUnitTypes::RenderPoints );
+                                    << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mShapeRadiusUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits
                                     << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderPercentage
-                                    << QgsUnitTypes::RenderPoints );
+                                    << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mShapeBorderWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                         << QgsUnitTypes::RenderPoints );
+                                         << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mShadowOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                     << QgsUnitTypes::RenderPoints );
+                                     << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mShadowRadiusUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                     << QgsUnitTypes::RenderPoints );
+                                     << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mPointOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                    << QgsUnitTypes::RenderPoints );
+                                    << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mLineDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                     << QgsUnitTypes::RenderPoints );
+                                     << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mRepeatDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                       << QgsUnitTypes::RenderPoints );
+                                       << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   mFontLineHeightSpinBox->setClearValue( 1.0 );
   mShapeRotationDblSpnBx->setClearValue( 0.0 );

src/gui/qgsunitselectionwidget.cpp

@@ -28,24 +28,24 @@ QgsMapUnitScaleWidget::QgsMapUnitScaleWidget( QWidget* parent )
   mComboBoxMaxScale->setScale( 1 );
   mSpinBoxMinSize->setShowClearButton( false );
   mSpinBoxMaxSize->setShowClearButton( false );
-  connect( mCheckBoxMinScale, SIGNAL( toggled( bool ) ), this, SLOT( configureMinComboBox() ) );
+  connect( mCheckBoxMinScale, &QCheckBox::toggled, this, &QgsMapUnitScaleWidget::configureMinComboBox );
-  connect( mCheckBoxMaxScale, SIGNAL( toggled( bool ) ), this, SLOT( configureMaxComboBox() ) );
+  connect( mCheckBoxMaxScale, &QCheckBox::toggled, this, &QgsMapUnitScaleWidget::configureMaxComboBox );
-  connect( mComboBoxMinScale, SIGNAL( scaleChanged( double ) ), this, SLOT( configureMaxComboBox() ) );
+  connect( mComboBoxMinScale, &QgsScaleWidget::scaleChanged, this, &QgsMapUnitScaleWidget::configureMaxComboBox );
-  connect( mComboBoxMinScale, SIGNAL( scaleChanged( double ) ), mComboBoxMaxScale, SLOT( setMinScale( double ) ) );
+  connect( mComboBoxMinScale, &QgsScaleWidget::scaleChanged, mComboBoxMaxScale, &QgsScaleWidget::setMinScale );
-  connect( mComboBoxMaxScale, SIGNAL( scaleChanged( double ) ), this, SLOT( configureMinComboBox() ) );
+  connect( mComboBoxMaxScale, &QgsScaleWidget::scaleChanged, this, &QgsMapUnitScaleWidget::configureMinComboBox );
 
-  connect( mCheckBoxMinSize, SIGNAL( toggled( bool ) ), mSpinBoxMinSize, SLOT( setEnabled( bool ) ) );
+  connect( mCheckBoxMinSize, &QCheckBox::toggled, mSpinBoxMinSize, &QgsDoubleSpinBox::setEnabled );
-  connect( mCheckBoxMaxSize, SIGNAL( toggled( bool ) ), mSpinBoxMaxSize, SLOT( setEnabled( bool ) ) );
+  connect( mCheckBoxMaxSize, &QCheckBox::toggled, mSpinBoxMaxSize, &QgsDoubleSpinBox::setEnabled );
 
   // notification of setting changes
-  connect( mCheckBoxMinScale, SIGNAL( toggled( bool ) ), this, SLOT( settingsChanged() ) );
+  connect( mCheckBoxMinScale, &QCheckBox::toggled, this, &QgsMapUnitScaleWidget::settingsChanged );
-  connect( mCheckBoxMaxScale, SIGNAL( toggled( bool ) ), this, SLOT( settingsChanged() ) );
+  connect( mCheckBoxMaxScale, &QCheckBox::toggled, this, &QgsMapUnitScaleWidget::settingsChanged );
-  connect( mComboBoxMinScale, SIGNAL( scaleChanged( double ) ), this, SLOT( settingsChanged() ) );
+  connect( mComboBoxMinScale, &QgsScaleWidget::scaleChanged, this, &QgsMapUnitScaleWidget::settingsChanged );
-  connect( mComboBoxMaxScale, SIGNAL( scaleChanged( double ) ), this, SLOT( settingsChanged() ) );
+  connect( mComboBoxMaxScale, &QgsScaleWidget::scaleChanged, this, &QgsMapUnitScaleWidget::settingsChanged );
-  connect( mCheckBoxMinSize, SIGNAL( toggled( bool ) ), this, SLOT( settingsChanged() ) );
+  connect( mCheckBoxMinSize, &QCheckBox::toggled, this, &QgsMapUnitScaleWidget::settingsChanged );
-  connect( mCheckBoxMaxSize, SIGNAL( toggled( bool ) ), this, SLOT( settingsChanged() ) );
+  connect( mCheckBoxMaxSize, &QCheckBox::toggled, this, &QgsMapUnitScaleWidget::settingsChanged );
-  connect( mSpinBoxMinSize, SIGNAL( valueChanged( double ) ), this, SLOT( settingsChanged() ) );
+  connect( mSpinBoxMinSize, static_cast < void ( QgsDoubleSpinBox::* )( double ) > ( &QgsDoubleSpinBox::valueChanged ), this, &QgsMapUnitScaleWidget::settingsChanged );
-  connect( mSpinBoxMaxSize, SIGNAL( valueChanged( double ) ), this, SLOT( settingsChanged() ) );
+  connect( mSpinBoxMaxSize, static_cast < void ( QgsDoubleSpinBox::* )( double ) > ( &QgsDoubleSpinBox::valueChanged ), this, &QgsMapUnitScaleWidget::settingsChanged );
   mBlockSignals = false;
 }
 
@@ -136,9 +136,9 @@ QgsUnitSelectionWidget::QgsUnitSelectionWidget( QWidget *parent )
   setFocusPolicy( Qt::StrongFocus );
   setFocusProxy( mUnitCombo );
 
-  connect( mUnitCombo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( toggleUnitRangeButton() ) );
+  connect( mUnitCombo, static_cast < void ( QComboBox::* )( int ) > ( &QComboBox::currentIndexChanged ), this, &QgsUnitSelectionWidget::toggleUnitRangeButton );
-  connect( mMapScaleButton, SIGNAL( clicked() ), this, SLOT( showDialog() ) );
+  connect( mMapScaleButton, &QPushButton::clicked, this, &QgsUnitSelectionWidget::showDialog );
-  connect( mUnitCombo, SIGNAL( currentIndexChanged( int ) ), this, SIGNAL( changed() ) );
+  connect( mUnitCombo, static_cast < void ( QComboBox::* )( int ) > ( &QComboBox::currentIndexChanged ), this, &QgsUnitSelectionWidget::changed );
 }
 
 void QgsUnitSelectionWidget::setUnits( const QStringList &units, int mapUnitIdx )
@@ -178,6 +178,10 @@ void QgsUnitSelectionWidget::setUnits( const QgsUnitTypes::RenderUnitList &units
   {
     mUnitCombo->addItem( tr( "Percentage" ), QgsUnitTypes::RenderPercentage );
   }
+  if ( units.contains( QgsUnitTypes::RenderInches ) )
+  {
+    mUnitCombo->addItem( tr( "Inches" ), QgsUnitTypes::RenderInches );
+  }
   blockSignals( false );
 }
 
@@ -222,7 +226,7 @@ void QgsUnitSelectionWidget::showDialog()
     widget->setPanelTitle( tr( "Adjust scaling range" ) );
     widget->setMapCanvas( mCanvas );
     widget->setMapUnitScale( mMapUnitScale );
-    connect( widget, SIGNAL( mapUnitScaleChanged( QgsMapUnitScale ) ), this, SLOT( widgetChanged( QgsMapUnitScale ) ) );
+    connect( widget, &QgsMapUnitScaleWidget::mapUnitScaleChanged, this, &QgsUnitSelectionWidget::widgetChanged );
     panel->openPanel( widget );
     return;
   }
@@ -267,8 +271,8 @@ QgsMapUnitScaleDialog::QgsMapUnitScaleDialog( QWidget* parent )
   mWidget = new QgsMapUnitScaleWidget();
   vLayout->addWidget( mWidget );
   QDialogButtonBox* bbox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal );
-  connect( bbox, SIGNAL( accepted() ), this, SLOT( accept() ) );
+  connect( bbox, &QDialogButtonBox::accepted, this, &QgsMapUnitScaleDialog::accept );
-  connect( bbox, SIGNAL( rejected() ), this, SLOT( reject() ) );
+  connect( bbox, &QDialogButtonBox::rejected, this, &QgsMapUnitScaleDialog::reject );
   vLayout->addWidget( bbox );
   setLayout( vLayout );
 }

src/gui/symbology-ng/qgsarrowsymbollayerwidget.cpp

@@ -24,15 +24,15 @@ QgsArrowSymbolLayerWidget::QgsArrowSymbolLayerWidget( const QgsVectorLayer* vl,
   setupUi( this );
 
   mArrowWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                   << QgsUnitTypes::RenderPoints );
+                                   << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mArrowStartWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                        << QgsUnitTypes::RenderPoints );
+                                        << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mHeadLengthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                   << QgsUnitTypes::RenderPoints );
+                                   << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mHeadThicknessUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                      << QgsUnitTypes::RenderPoints );
+                                      << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   mOffsetSpin->setClearValue( 0.0 );
 }

src/gui/symbology-ng/qgsellipsesymbollayerwidget.cpp

@@ -24,13 +24,13 @@ QgsEllipseSymbolLayerWidget::QgsEllipseSymbolLayerWidget( const QgsVectorLayer*
   setupUi( this );
 
   mSymbolWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                    << QgsUnitTypes::RenderPoints );
+                                    << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mSymbolHeightUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                     << QgsUnitTypes::RenderPoints );
+                                     << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOutlineWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                     << QgsUnitTypes::RenderPoints );
+                                     << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   btnChangeColorFill->setAllowAlpha( true );
   btnChangeColorFill->setColorDialogTitle( tr( "Select fill color" ) );

src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp

@@ -446,7 +446,7 @@ QgsGraduatedSymbolRendererWidget::QgsGraduatedSymbolRendererWidget( QgsVectorLay
   mExpressionWidget->setLayer( mLayer );
 
   mSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                             << QgsUnitTypes::RenderPoints );
+                             << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   spinPrecision->setMinimum( QgsRendererRangeLabelFormat::MIN_PRECISION );
   spinPrecision->setMaximum( QgsRendererRangeLabelFormat::MAX_PRECISION );

src/gui/symbology-ng/qgsheatmaprendererwidget.cpp

@@ -85,7 +85,7 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsSt
   setupUi( this );
 
   mRadiusUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mWeightExpressionWidget->registerExpressionContextGenerator( this );
 
   if ( renderer )

src/gui/symbology-ng/qgspointclusterrendererwidget.cpp

@@ -49,7 +49,7 @@ QgsPointClusterRendererWidget::QgsPointClusterRendererWidget( QgsVectorLayer* la
   }
   setupUi( this );
   mDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                 << QgsUnitTypes::RenderPoints );
+                                 << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   if ( renderer )
   {

src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp

@@ -50,7 +50,7 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto
   setupUi( this );
 
   mDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                 << QgsUnitTypes::RenderPoints );
+                                 << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   if ( renderer )
   {

src/gui/symbology-ng/qgssymbollayerwidget.cpp

@@ -141,11 +141,11 @@ QgsSimpleLineSymbolLayerWidget::QgsSimpleLineSymbolLayerWidget( const QgsVectorL
 
   setupUi( this );
   mPenWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                 << QgsUnitTypes::RenderPoints );
+                                 << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mDashPatternUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                    << QgsUnitTypes::RenderPoints );
+                                    << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   btnChangeColor->setAllowAlpha( true );
   btnChangeColor->setColorDialogTitle( tr( "Select line color" ) );
@@ -389,11 +389,11 @@ QgsSimpleMarkerSymbolLayerWidget::QgsSimpleMarkerSymbolLayerWidget( const QgsVec
 
   setupUi( this );
   mSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                             << QgsUnitTypes::RenderPoints );
+                             << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOutlineWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                     << QgsUnitTypes::RenderPoints );
+                                     << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   btnChangeColorFill->setAllowAlpha( true );
   btnChangeColorFill->setColorDialogTitle( tr( "Select fill color" ) );
@@ -673,9 +673,9 @@ QgsSimpleFillSymbolLayerWidget::QgsSimpleFillSymbolLayerWidget( const QgsVectorL
 
   setupUi( this );
   mBorderWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                    << QgsUnitTypes::RenderPoints );
+                                    << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   btnChangeColor->setAllowAlpha( true );
   btnChangeColor->setColorDialogTitle( tr( "Select fill color" ) );
@@ -824,9 +824,9 @@ QgsFilledMarkerSymbolLayerWidget::QgsFilledMarkerSymbolLayerWidget( const QgsVec
 
   setupUi( this );
   mSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                             << QgsUnitTypes::RenderPoints );
+                             << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   spinOffsetX->setClearValue( 0.0 );
   spinOffsetY->setClearValue( 0.0 );
@@ -1007,7 +1007,7 @@ QgsGradientFillSymbolLayerWidget::QgsGradientFillSymbolLayerWidget( const QgsVec
 
   setupUi( this );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   btnColorRamp->setShowGradientOnly( true );
 
@@ -1335,9 +1335,9 @@ QgsShapeburstFillSymbolLayerWidget::QgsShapeburstFillSymbolLayerWidget( const Qg
 
   setupUi( this );
   mDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                 << QgsUnitTypes::RenderPoints );
+                                 << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   QButtonGroup* group1 = new QButtonGroup( this );
   group1->addButton( radioColorRamp );
@@ -1590,11 +1590,11 @@ QgsMarkerLineSymbolLayerWidget::QgsMarkerLineSymbolLayerWidget( const QgsVectorL
 
   setupUi( this );
   mIntervalUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                 << QgsUnitTypes::RenderPoints );
+                                 << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetAlongLineUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                        << QgsUnitTypes::RenderPoints );
+                                        << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   spinOffset->setClearValue( 0.0 );
 
@@ -1757,11 +1757,11 @@ QgsSvgMarkerSymbolLayerWidget::QgsSvgMarkerSymbolLayerWidget( const QgsVectorLay
 
   setupUi( this );
   mSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                             << QgsUnitTypes::RenderPoints );
+                             << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mBorderWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                    << QgsUnitTypes::RenderPoints );
+                                    << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   viewGroups->setHeaderHidden( true );
   mChangeColorButton->setAllowAlpha( true );
   mChangeColorButton->setColorDialogTitle( tr( "Select fill color" ) );
@@ -2149,9 +2149,9 @@ QgsSVGFillSymbolLayerWidget::QgsSVGFillSymbolLayerWidget( const QgsVectorLayer*
   mLayer = nullptr;
   setupUi( this );
   mTextureWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                     << QgsUnitTypes::RenderPoints );
+                                     << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mSvgOutlineWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                        << QgsUnitTypes::RenderPoints );
+                                        << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mSvgTreeView->setHeaderHidden( true );
   insertIcons();
 
@@ -2436,9 +2436,9 @@ QgsLinePatternFillSymbolLayerWidget::QgsLinePatternFillSymbolLayerWidget( const
 {
   setupUi( this );
   mDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                 << QgsUnitTypes::RenderPoints );
+                                 << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetSpinBox->setClearValue( 0 );
 }
 
@@ -2537,13 +2537,13 @@ QgsPointPatternFillSymbolLayerWidget::QgsPointPatternFillSymbolLayerWidget( cons
 {
   setupUi( this );
   mHorizontalDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-      << QgsUnitTypes::RenderPoints );
+      << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mVerticalDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                         << QgsUnitTypes::RenderPoints );
+                                         << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mHorizontalDisplacementUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-      << QgsUnitTypes::RenderPoints );
+      << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mVerticalDisplacementUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-      << QgsUnitTypes::RenderPoints );
+      << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 }
 
 
@@ -2681,11 +2681,11 @@ QgsFontMarkerSymbolLayerWidget::QgsFontMarkerSymbolLayerWidget( const QgsVectorL
 
   setupUi( this );
   mSizeUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                             << QgsUnitTypes::RenderPoints );
+                             << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mBorderWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                    << QgsUnitTypes::RenderPoints );
+                                    << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   widgetChar = new CharacterWidget;
   scrollArea->setWidget( widgetChar );
 
@@ -2958,9 +2958,9 @@ QgsRasterFillSymbolLayerWidget::QgsRasterFillSymbolLayerWidget( const QgsVectorL
   setupUi( this );
 
   mWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits
-                              << QgsUnitTypes::RenderPoints );
+                              << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   mSpinOffsetX->setClearValue( 0.0 );
   mSpinOffsetY->setClearValue( 0.0 );

src/gui/symbology-ng/qgssymbolslistwidget.cpp

@@ -57,7 +57,7 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbol* symbol, QgsStyle* style,
   setupUi( this );
 
   mSymbolUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                               << QgsUnitTypes::RenderPoints );
+                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   btnAdvanced->hide(); // advanced button is hidden by default
   if ( menu ) // show it if there is a menu pointer

src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp

@@ -21,7 +21,7 @@ QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( const QgsVecto
   setupUi( this );
 
   mDistanceUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
-                                 << QgsUnitTypes::RenderPoints );
+                                 << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
   if ( vectorLayer() )
   {

tests/src/python/test_qgsrendercontext.py

@@ -70,6 +70,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(sf, 11.8110236, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(sf, 4.166666665625, places=5)
+        sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(sf, 300.0, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(sf, 1.0, places=5)
 
@@ -82,6 +84,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(sf, 11.8110236, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(sf, 4.166666665625, places=5)
+        sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(sf, 300.0, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(sf, 1.0, places=5)
         c.minScale = 0
@@ -95,6 +99,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(sf, 11.8110236, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(sf, 4.166666665625, places=5)
+        sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(sf, 300.0, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(sf, 1.0, places=5)
 
@@ -117,6 +123,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(size, 23.622047, places=5)
         size = r.convertToPainterUnits(2, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(size, 8.33333333125, places=5)
+        size = r.convertToPainterUnits(2, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(size, 600.0, places=5)
         size = r.convertToPainterUnits(2, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(size, 2.0, places=5)
 
@@ -130,6 +138,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(size, 23.622047, places=5)
         size = r.convertToPainterUnits(2, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(size, 8.33333333125, places=5)
+        size = r.convertToPainterUnits(2, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(size, 600.0, places=5)
         size = r.convertToPainterUnits(2, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(size, 2.0, places=5)
         c.minSizeMMEnabled = False
@@ -144,6 +154,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(size, 23.622047, places=5)
         size = r.convertToPainterUnits(2, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(size, 8.33333333125, places=5)
+        size = r.convertToPainterUnits(2, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(size, 600.0, places=5)
         size = r.convertToPainterUnits(2, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(size, 2.0, places=5)
 
@@ -165,6 +177,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(size, 47.244094, places=5)
         size = r.convertToMapUnits(5.66929, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(size, 47.2440833, places=5)
+        size = r.convertToMapUnits(5.66929, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(size, 3401.574, places=5)
         size = r.convertToMapUnits(2, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(size, 4.0, places=5)
 
@@ -178,6 +192,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(size, 47.244094, places=5)
         size = r.convertToMapUnits(5.66929, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(size, 47.2440833, places=5)
+        size = r.convertToMapUnits(5.66929, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(size, 3401.574, places=5)
         size = r.convertToMapUnits(2, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(size, 4.0, places=5)
         c.minSizeMMEnabled = False
@@ -192,6 +208,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(size, 47.244094, places=5)
         size = r.convertToMapUnits(5.66929, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(size, 47.2440833, places=5)
+        size = r.convertToMapUnits(5.66929, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(size, 3401.574, places=5)
         size = r.convertToMapUnits(2, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(size, 4.0, places=5)
         c.maxSizeMMEnabled = False
@@ -205,6 +223,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(size, 47.244094, places=5)
         size = r.convertToMapUnits(5.66929, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(size, 47.2440833, places=5)
+        size = r.convertToMapUnits(5.66929, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(size, 3401.574, places=5)
         size = r.convertToMapUnits(2, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(size, 4.0, places=5)
         c.minScale = 0
@@ -218,11 +238,12 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(size, 47.244094, places=5)
         size = r.convertToMapUnits(5.66929, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(size, 47.2440833, places=5)
+        size = r.convertToMapUnits(5.66929, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(size, 3401.574, places=5)
         size = r.convertToMapUnits(2, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(size, 4.0, places=5)
         c.maxScale = 0
 
-
     def testPixelSizeScaleFactor(self):
 
         ms = QgsMapSettings()
@@ -242,6 +263,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(sf, 11.8110236, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(sf, 4.166666665625, places=5)
+        sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(sf, 300.0, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(sf, 1.0, places=5)
 
@@ -254,6 +277,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(sf, 11.811023, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(sf, 4.166666665625, places=5)
+        sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(sf, 300.0, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(sf, 1.0, places=5)
         c.minScale = 0
@@ -267,6 +292,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(sf, 11.8110236, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(sf, 4.166666665625, places=5)
+        sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(sf, 300.0, places=5)
         sf = r.convertToPainterUnits(1, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(sf, 1.0, places=5)
 
@@ -288,6 +315,8 @@ class TestQgsRenderContext(unittest.TestCase):
         self.assertAlmostEqual(sf, 23.622047, places=5)
         sf = r.convertToMapUnits(1, QgsUnitTypes.RenderPoints, c)
         self.assertAlmostEqual(sf, 8.33333324723, places=5)
+        sf = r.convertToMapUnits(1, QgsUnitTypes.RenderInches, c)
+        self.assertAlmostEqual(sf, 600.0, places=5)
         sf = r.convertToMapUnits(1, QgsUnitTypes.RenderPixels, c)
         self.assertAlmostEqual(sf, 2.0, places=5)
 

tests/src/python/test_qgsunittypes.py

@@ -175,7 +175,8 @@ class TestQgsUnitTypes(unittest.TestCase):
                  QgsUnitTypes.RenderMapUnits,
                  QgsUnitTypes.RenderPixels,
                  QgsUnitTypes.RenderPercentage,
-                 QgsUnitTypes.RenderPoints]
+                 QgsUnitTypes.RenderPoints,
+                 QgsUnitTypes.RenderInches]
 
         for u in units:
             res, ok = QgsUnitTypes.decodeRenderUnit(QgsUnitTypes.encodeUnit(u))