Added "Percentage" option to QgsSymboV2::OutputUnit.

duncan-r · nyalldawson · commit a89c1830de72 · 2016-01-13T08:27:49.000+11:00
- Added percentage to OutputUnit enum.
- Updated qgssymbolv2utils to include percentage.
- Updated qgsunitselectionwidget to include percentage.
Changed selection widget in its own commit

Added Percentage to OutputUnit enum.

Added percentage to switches in utils
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -415,6 +415,8 @@ QString QgsSymbolLayerV2Utils::encodeOutputUnit( QgsSymbolV2::OutputUnit unit )
       return "MapUnit";
     case QgsSymbolV2::Pixel:
       return "Pixel";
+    case QgsSymbolV2::Percentage:
+      return "Percentage";
     default:
       return "MM";
   }
@@ -434,6 +436,10 @@ QgsSymbolV2::OutputUnit QgsSymbolLayerV2Utils::decodeOutputUnit( const QString&
   {
     return QgsSymbolV2::Pixel;
   }
+  else if ( str == "Percentage" )
+  {
+    return QgsSymbolV2::Percentage;
+  }
 
   // millimeters are default
   return QgsSymbolV2::MM;
@@ -3377,6 +3383,7 @@ double QgsSymbolLayerV2Utils::lineWidthScaleFactor( const QgsRenderContext& c, Q
     case QgsSymbolV2::Pixel:
       return 1.0 / c.rasterScaleFactor();
     case QgsSymbolV2::Mixed:
+    case QgsSymbolV2::Percentage:
       //no sensible value
       return 1.0;
   }
@@ -3421,6 +3428,7 @@ double QgsSymbolLayerV2Utils::pixelSizeScaleFactor( const QgsRenderContext& c, Q
     case QgsSymbolV2::Pixel:
       return 1.0;
     case QgsSymbolV2::Mixed:
+    case QgsSymbolV2::Percentage:
       //no sensible value
       return 1.0;
   }
@@ -3440,6 +3448,7 @@ double QgsSymbolLayerV2Utils::mapUnitScaleFactor( const QgsRenderContext &c, Qgs
     case QgsSymbolV2::Pixel:
       return scale.computeMapUnitsPerPixel( c );
     case QgsSymbolV2::Mixed:
+    case QgsSymbolV2::Percentage:
       //no sensible value
       return 1.0;
   }
diff --git a/src/core/symbology-ng/qgssymbolv2.h b/src/core/symbology-ng/qgssymbolv2.h
@@ -57,10 +57,11 @@ class CORE_EXPORT QgsSymbolV2
      */
     enum OutputUnit
     {
-      MM = 0,  //!< The output shall be in millimeters
-      MapUnit, //!< The output shall be in map unitx
-      Mixed,   //!< Mixed units in symbol layers
-      Pixel    //!< The output shall be in pixels
+      MM = 0,     //!< The output shall be in millimeters
+      MapUnit,    //!< The output shall be in map unitx
+      Mixed,      //!< Mixed units in symbol layers
+      Pixel,      //!< The output shall be in pixels
+      Percentage  //!< The ouput shall be in percentage of canvas
     };
 
     typedef QList<OutputUnit> OutputUnitList;
diff --git a/src/gui/qgsunitselectionwidget.cpp b/src/gui/qgsunitselectionwidget.cpp
@@ -138,6 +138,10 @@ void QgsUnitSelectionWidget::setUnits( const QgsSymbolV2::OutputUnitList &units
   {
     mUnitCombo->addItem( tr( "Map unit" ), QgsSymbolV2::MapUnit );
   }
+  if ( units.contains( QgsSymbolV2::Percentage ) )
+  {
+    mUnitCombo->addItem( tr( "Percentage" ), QgsSymbolV2::Percentage );
+  }
   blockSignals( false );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,10 @@ void QgsUnitSelectionWidget::setUnits( const QgsSymbolV2::OutputUnitList &units`
`138`	`138`	`{`
`139`	`139`	`mUnitCombo->addItem( tr( "Map unit" ), QgsSymbolV2::MapUnit );`
`140`	`140`	`}`
	`141`	`+ if ( units.contains( QgsSymbolV2::Percentage ) )`
	`142`	`+ {`
	`143`	`+ mUnitCombo->addItem( tr( "Percentage" ), QgsSymbolV2::Percentage );`
	`144`	`+ }`
`141`	`145`	`blockSignals( false );`
`142`	`146`	`}`
`143`	`147`