[QGIS Commit] r12803 - in trunk/qgis/src: core/symbology-ng gui/symbology-ng

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-01-20 08:12:42 -0500 (Wed, 20 Jan 2010)
New Revision: 12803

Modified:
   trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp
   trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
Log:
Fixed #2379 - hang on line width set to zero (division by zero)


Modified: trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp	2010-01-20 12:07:47 UTC (rev 12802)
+++ trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.cpp	2010-01-20 13:12:42 UTC (rev 12803)
@@ -56,13 +56,12 @@
   return "SimpleLine";
 }
 
-
 void QgsSimpleLineSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
 {
   mPen.setColor( mColor );
   double scaledWidth = context.outputLineWidth( mWidth );
   mPen.setWidthF( scaledWidth );
-  if ( mUseCustomDashPattern )
+  if ( mUseCustomDashPattern && scaledWidth != 0 )
   {
     mPen.setStyle( Qt::CustomDashLine );
 
@@ -116,14 +115,7 @@
   map["joinstyle"] = QgsSymbolLayerV2Utils::encodePenJoinStyle( mPenJoinStyle );
   map["capstyle"] = QgsSymbolLayerV2Utils::encodePenCapStyle( mPenCapStyle );
   map["offset"] = QString::number( mOffset );
-  if ( mUseCustomDashPattern )
-  {
-    map["use_custom_dash"] = "1";
-  }
-  else
-  {
-    map["use_custom_dash"] = "0";
-  }
+  map["use_custom_dash"] = ( mUseCustomDashPattern ? "1" : "0" );
   map["customdash"] = QgsSymbolLayerV2Utils::encodeRealVector( mCustomDashVector );
   return map;
 }

Modified: trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp	2010-01-20 12:07:47 UTC (rev 12802)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp	2010-01-20 13:12:42 UTC (rev 12803)
@@ -59,14 +59,7 @@
   label_3->setEnabled( !useCustomDashPattern );
   cboPenStyle->setEnabled( !useCustomDashPattern );
   mCustomCheckBox->blockSignals( true );
-  if ( useCustomDashPattern )
-  {
-    mCustomCheckBox->setCheckState( Qt::Checked );
-  }
-  else
-  {
-    mCustomCheckBox->setCheckState( Qt::Unchecked );
-  }
+  mCustomCheckBox->setCheckState( useCustomDashPattern ? Qt::Checked : Qt::Unchecked );
   mCustomCheckBox->blockSignals( false );
   updatePatternIcon();
 }