From 0fecc915201ea9d9946837ae3266f9b4eec98aea Mon Sep 17 00:00:00 2001
From: rblazek <rblazek@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Thu, 18 May 2006 14:13:27 +0000
Subject: [PATCH] real width

git-svn-id: http://svn.osgeo.org/qgis/trunk@5470 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/composer/qgscomposerscalebar.cpp | 10 +++++-----
 src/composer/qgscomposerscalebar.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/composer/qgscomposerscalebar.cpp b/src/composer/qgscomposerscalebar.cpp
index 90ec6698279..014fc1c1a38 100644
--- a/src/composer/qgscomposerscalebar.cpp
+++ b/src/composer/qgscomposerscalebar.cpp
@@ -348,7 +348,7 @@ void QgsComposerScalebar::sizeChanged ( )
 {
     mSegmentLength = mSegmentLengthLineEdit->text().toDouble();
     mNumSegments = mNumSegmentsLineEdit->text().toInt();
-    mPen.setWidth ( mLineWidthSpinBox->value() );
+    mPen.setWidthF ( mLineWidthSpinBox->value() );
     mMapUnitsPerUnit = mMapUnitsPerUnitLineEdit->text().toInt();
     recalculate();
     Q3CanvasPolygonalItem::update();
@@ -356,7 +356,7 @@ void QgsComposerScalebar::sizeChanged ( )
     writeSettings();
 }
 
-void QgsComposerScalebar::on_mLineWidthSpinBox_returnPressed() { sizeChanged(); }
+void QgsComposerScalebar::on_mLineWidthSpinBox_valueChanged() { sizeChanged(); }
 void QgsComposerScalebar::on_mMapUnitsPerUnitLineEdit_returnPressed() { sizeChanged(); }
 void QgsComposerScalebar::on_mNumSegmentsLineEdit_returnPressed() { sizeChanged(); }
 void QgsComposerScalebar::on_mSegmentLengthLineEdit_returnPressed() { sizeChanged(); }
@@ -411,7 +411,7 @@ void QgsComposerScalebar::setOptions ( void )
     mUnitLabelLineEdit->setText( mUnitLabel );
     mMapUnitsPerUnitLineEdit->setText( QString::number(mMapUnitsPerUnit ) );
 
-    mLineWidthSpinBox->setValue ( mPen.width() );
+    mLineWidthSpinBox->setValue ( mPen.widthF() );
     
     // Maps
     mMapComboBox->clear();
@@ -478,7 +478,7 @@ bool QgsComposerScalebar::writeSettings ( void )
     QgsProject::instance()->writeEntry( "Compositions", path+"font/underline", mFont.underline() );
     QgsProject::instance()->writeEntry( "Compositions", path+"font/strikeout", mFont.strikeOut() );
     
-    QgsProject::instance()->writeEntry( "Compositions", path+"pen/width", (int)mPen.width() );
+    QgsProject::instance()->writeEntry( "Compositions", path+"pen/width", (double)mPen.widthF() );
 
     return true; 
 }
@@ -505,7 +505,7 @@ bool QgsComposerScalebar::readSettings ( void )
     mFont.setUnderline(  QgsProject::instance()->readBoolEntry("Compositions", path+"font/underline", false, &ok) );
     mFont.setStrikeOut(  QgsProject::instance()->readBoolEntry("Compositions", path+"font/strikeout", false, &ok) );
 
-    mPen.setWidth(  QgsProject::instance()->readNumEntry("Compositions", path+"pen/width", 1, &ok) );
+    mPen.setWidthF(  QgsProject::instance()->readDoubleEntry("Compositions", path+"pen/width", 1, &ok) );
     
     recalculate();
     
diff --git a/src/composer/qgscomposerscalebar.h b/src/composer/qgscomposerscalebar.h
index bea0e2ce05e..179775f5fe8 100644
--- a/src/composer/qgscomposerscalebar.h
+++ b/src/composer/qgscomposerscalebar.h
@@ -97,7 +97,7 @@ public slots:
     void on_mUnitLabelLineEdit_returnPressed ( void );
 
     // Size changed
-    void on_mLineWidthSpinBox_returnPressed ( void );
+    void on_mLineWidthSpinBox_valueChanged ( void );
     void on_mMapUnitsPerUnitLineEdit_returnPressed ( void );
     void on_mNumSegmentsLineEdit_returnPressed ( void );
     void on_mSegmentLengthLineEdit_returnPressed ( void );