Skip to content

Commit

Permalink
fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Dec 17, 2011
1 parent a20cec3 commit 19716d2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions doc/changelog.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
- Reduce top and side margins for attribute table dialog
- Remove the (hopefully) last SVN reference
- More svn version removal
- Added missing colour accessor/mutator/member from composerlegenditem header
- Added missing color accessor/mutator/member from composerlegenditem header
- Get rid of svn version stuff from release branch.
- Other workaround for Qt#5114 (fixes #3250, #3028, #2598)
- Try to make the histogram smoother
Expand Down Expand Up @@ -264,7 +264,7 @@ changed so we will just provide a bullet list of key new features here.

- Support for icons of plugins in the plugin manager dialog.
- Removed quickprint plugin - use easyprint plugin rather from plugin repo.
- Removed ogr convertor plugin - use 'save as' context menu rather.
- Removed ogr converter plugin - use 'save as' context menu rather.
-

==Printing==
Expand Down
12 changes: 8 additions & 4 deletions src/app/qgsrasterlayerproperties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,10 +320,13 @@ void QgsRasterLayerProperties::populateColorMapTable( const QList<QgsColorRampSh
}
void QgsRasterLayerProperties::populateTransparencyTable()
{
//Clear existsing color transparency list
QgsDebugMsg( "entering." );

//Clear existing color transparency list
//NOTE: May want to just tableTransparency->clearContents() and fill back in after checking to be sure list and table are the same size
QString myNumberFormatter;
if ( rbtnThreeBand->isChecked() && QgsRasterLayer::PalettedColor != mRasterLayer->drawingStyle() &&
if ( rbtnThreeBand->isChecked() &&
QgsRasterLayer::PalettedColor != mRasterLayer->drawingStyle() &&
QgsRasterLayer::PalettedMultiBandColor != mRasterLayer->drawingStyle() )
{
for ( int myTableRunner = tableTransparency->rowCount() - 1; myTableRunner >= 0; myTableRunner-- )
Expand Down Expand Up @@ -356,7 +359,7 @@ void QgsRasterLayerProperties::populateTransparencyTable()
}
else
{
//Clear existing single band or pallet values gransparency list
//Clear existing single band or palette values transparency list
for ( int myTableRunner = tableTransparency->rowCount() - 1; myTableRunner >= 0; myTableRunner-- )
{
tableTransparency->removeRow( myTableRunner );
Expand Down Expand Up @@ -394,7 +397,7 @@ void QgsRasterLayerProperties::populateTransparencyTable()
tableTransparency->resizeRowsToContents();
}

/** Set the message indicating if any min max values are estimates */
// Set the message indicating if any min max values are estimates
void QgsRasterLayerProperties::setMinimumMaximumEstimateWarning()
{
bool myEstimatedValues = false;
Expand Down Expand Up @@ -761,6 +764,7 @@ void QgsRasterLayerProperties::sync()
}

QgsDebugMsg( "populate transparency tab" );

/*
* Transparent Pixel Tab
*/
Expand Down
2 changes: 0 additions & 2 deletions src/app/qgsrasterlayerproperties.h
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,9 @@ class QgsRasterLayerProperties : public QDialog, private Ui::QgsRasterLayerPrope
void toggleBuildPyramidsButton();

signals:

/** emitted when changes to layer were saved to update legend */
void refreshLegend( QString layerID, bool expandItem );


private:
/** \brief A constant that signals property not used */
const QString TRSTRING_NOT_SET;
Expand Down
6 changes: 3 additions & 3 deletions src/core/qgsmaprenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ void QgsMapRenderer::adjustExtentToSize()
dymax = mExtent.yMaximum() + whitespace;
}

QgsDebugMsg( QString( "Map units per pixel (x,y) : %1, %2\n" ).arg( mapUnitsPerPixelX, 0, 'f', 8 ).arg( mapUnitsPerPixelY, 0, 'f', 8 ) );
QgsDebugMsg( QString( "Pixmap dimensions (x,y) : %1, %2\n" ).arg( myWidth, 0, 'f', 8 ).arg( myHeight, 0, 'f', 8 ) );
QgsDebugMsg( QString( "Extent dimensions (x,y) : %1, %2\n" ).arg( mExtent.width(), 0, 'f', 8 ).arg( mExtent.height(), 0, 'f', 8 ) );
QgsDebugMsg( QString( "Map units per pixel (x,y) : %1, %2" ).arg( mapUnitsPerPixelX, 0, 'f', 8 ).arg( mapUnitsPerPixelY, 0, 'f', 8 ) );
QgsDebugMsg( QString( "Pixmap dimensions (x,y) : %1, %2" ).arg( myWidth, 0, 'f', 8 ).arg( myHeight, 0, 'f', 8 ) );
QgsDebugMsg( QString( "Extent dimensions (x,y) : %1, %2" ).arg( mExtent.width(), 0, 'f', 8 ).arg( mExtent.height(), 0, 'f', 8 ) );
QgsDebugMsg( mExtent.toString() );

// update extent
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsexpressionbuilderwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
registerItem( tr( "Operators" ), "NOT", " NOT " );


// Load the fuctions from the QgsExpression class
// Load the functions from the QgsExpression class
int count = QgsExpression::functionCount();
for ( int i = 0; i < count; i++ )
{
Expand Down

0 comments on commit 19716d2

Please sign in to comment.