Skip to content

Commit

Permalink
implement #1769
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11061 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jul 13, 2009
1 parent 572f01e commit c6bb6b7
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 27 deletions.
23 changes: 15 additions & 8 deletions src/app/qgslabeldialog.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ void QgsLabelDialog::init( )
mFont.setFamily( myLabelAttributes->family() ); mFont.setFamily( myLabelAttributes->family() );
if ( myLabelAttributes->sizeIsSet() ) if ( myLabelAttributes->sizeIsSet() )
{ {
mFont.setPointSize( static_cast<int>( myLabelAttributes->size() ) ); mFont.setPointSizeF( myLabelAttributes->size() );


int myTypeInt = myLabelAttributes->sizeType(); int myTypeInt = myLabelAttributes->sizeType();
if ( myTypeInt == QgsLabelAttributes::PointUnits ) if ( myTypeInt == QgsLabelAttributes::PointUnits )
Expand All @@ -166,10 +166,12 @@ void QgsLabelDialog::init( )
} }
else //defaults for when no size has been set else //defaults for when no size has been set
{ {
mFont.setPointSize( static_cast<int>( myLabelAttributes->size() ) ); mFont.setPointSizeF( myLabelAttributes->size() );
radioFontSizeUnitsPoints->setChecked( true ); radioFontSizeUnitsPoints->setChecked( true );
} }


spinFontSize->setValue( myLabelAttributes->size() );

if ( myLabelAttributes->boldIsSet() ) if ( myLabelAttributes->boldIsSet() )
{ {
mFont.setBold( myLabelAttributes->bold() ); mFont.setBold( myLabelAttributes->bold() );
Expand Down Expand Up @@ -200,8 +202,8 @@ void QgsLabelDialog::init( )
{ {
radioOffsetUnitsMap->setChecked( true ); radioOffsetUnitsMap->setChecked( true );
} }
spinXOffset->setValue( static_cast<int>( myLabelAttributes->xOffset() ) ); spinXOffset->setValue( myLabelAttributes->xOffset() );
spinYOffset->setValue( static_cast<int>( myLabelAttributes->yOffset() ) ); spinYOffset->setValue( myLabelAttributes->yOffset() );
} }
else //defaults for when no offset is defined else //defaults for when no offset is defined
{ {
Expand Down Expand Up @@ -247,7 +249,7 @@ void QgsLabelDialog::init( )
{ {
radioBufferUnitsMap->setChecked( true ); radioBufferUnitsMap->setChecked( true );
} }
spinBufferSize->setValue( static_cast<int>( myLabelAttributes->bufferSize() ) ); spinBufferSize->setValue( myLabelAttributes->bufferSize() );
} }
else //defaults for when no offset is defined else //defaults for when no offset is defined
{ {
Expand All @@ -259,7 +261,7 @@ void QgsLabelDialog::init( )
chkUseBuffer->setChecked( myLabelAttributes->bufferEnabled() ); chkUseBuffer->setChecked( myLabelAttributes->bufferEnabled() );


//NOTE: do we need this line too? TS //NOTE: do we need this line too? TS
spinBufferSize->setValue( static_cast<int>( myLabelAttributes->bufferSize() ) ); spinBufferSize->setValue( myLabelAttributes->bufferSize() );
//TODO - transparency attributes for buffers //TODO - transparency attributes for buffers


listWidget->setItemSelected( listWidget->item( 0 ), true ); listWidget->setItemSelected( listWidget->item( 0 ), true );
Expand All @@ -271,11 +273,16 @@ void QgsLabelDialog::changeFont( void )
{ {
QgsDebugMsg( "entering." ); QgsDebugMsg( "entering." );


qreal fontSize = mFont.pointSizeF();
bool resultFlag; bool resultFlag;
mFont = QFontDialog::getFont( &resultFlag, mFont, this ); mFont = QFontDialog::getFont( &resultFlag, mFont, this );
if ( resultFlag ) if ( resultFlag )
{ {
// font is set to the font the user selected if ( mFont.pointSizeF() != fontSize )
{
// font is set to the font the user selected
spinFontSize->setValue( mFont.pointSizeF() );
}
} }
else else
{ {
Expand Down Expand Up @@ -341,7 +348,7 @@ void QgsLabelDialog::apply()
{ {
myTypeInt = QgsLabelAttributes::MapUnits; myTypeInt = QgsLabelAttributes::MapUnits;
} }
myLabelAttributes->setSize( mFont.pointSize(), myTypeInt ); myLabelAttributes->setSize( mFont.pointSizeF(), myTypeInt );
myLabelAttributes->setBold( mFont.bold() ); myLabelAttributes->setBold( mFont.bold() );
myLabelAttributes->setItalic( mFont.italic() ); myLabelAttributes->setItalic( mFont.italic() );
myLabelAttributes->setUnderline( mFont.underline() ); myLabelAttributes->setUnderline( mFont.underline() );
Expand Down
4 changes: 3 additions & 1 deletion src/app/qgslabeldialog.h
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ class QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase


void on_cboLabelField_activated( int ) {emit labelSourceSet(); } void on_cboLabelField_activated( int ) {emit labelSourceSet(); }


void on_spinFontSize_valueChanged( double d ) { mFont.setPointSizeF( d ); lblSample->setFont( mFont ); }

signals: signals:
/* emitted when anitem in label source list is chosen */ /* emitted when an item in label source list is chosen */
void labelSourceSet(); void labelSourceSet();


protected: protected:
Expand Down
24 changes: 6 additions & 18 deletions src/ui/qgslabeldialogbase.ui
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -180,22 +180,16 @@
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QLabel" name="textLabel5_2_2_3_2" > <widget class="QLabel" name="textLabel5_2_2_3_2" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" > <property name="text" >
<string>Font transparency</string> <string>Font size</string>
</property> </property>
<property name="alignment" > <property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="0" column="2" >
<widget class="QSpinBox" name="spinFontTransparency" > <widget class="QDoubleSpinBox" name="spinFontSize" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
Expand All @@ -208,12 +202,6 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="suffix" >
<string>%</string>
</property>
<property name="maximum" >
<number>100</number>
</property>
<property name="value" > <property name="value" >
<number>0</number> <number>0</number>
</property> </property>
Expand Down Expand Up @@ -469,7 +457,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1" >
<widget class="QSpinBox" name="spinBufferSize" /> <widget class="QDoubleSpinBox" name="spinBufferSize" />
</item> </item>
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="textLabel5_2_2_3" > <widget class="QLabel" name="textLabel5_2_2_3" >
Expand Down Expand Up @@ -575,7 +563,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QSpinBox" name="spinXOffset" > <widget class="QDoubleSpinBox" name="spinXOffset" >
<property name="minimum" > <property name="minimum" >
<number>-99</number> <number>-99</number>
</property> </property>
Expand All @@ -589,7 +577,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1" >
<widget class="QSpinBox" name="spinYOffset" > <widget class="QDoubleSpinBox" name="spinYOffset" >
<property name="minimum" > <property name="minimum" >
<number>-99</number> <number>-99</number>
</property> </property>
Expand Down Expand Up @@ -1055,7 +1043,7 @@
<tabstop>leDefaultLabel</tabstop> <tabstop>leDefaultLabel</tabstop>
<tabstop>btnDefaultFont</tabstop> <tabstop>btnDefaultFont</tabstop>
<tabstop>pbnDefaultFontColor</tabstop> <tabstop>pbnDefaultFontColor</tabstop>
<tabstop>spinFontTransparency</tabstop> <tabstop>spinFontSize</tabstop>
<tabstop>radioFontSizeUnitsPoints</tabstop> <tabstop>radioFontSizeUnitsPoints</tabstop>
<tabstop>radioFontSizeUnitsMap</tabstop> <tabstop>radioFontSizeUnitsMap</tabstop>
<tabstop>spinAngle</tabstop> <tabstop>spinAngle</tabstop>
Expand Down

0 comments on commit c6bb6b7

Please sign in to comment.