sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix nightly build

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@14445 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-10-29 05:24:47 +00:00
parent fb48cc0cc3
commit d1fe144899
8 changed files with 139 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Bison.cmake
View File

@ -93,4 +93,4 @@ MACRO(ADD_BISON_FILES_PREFIX _sources prefix)
SET(${_sources} ${${_sources}} ${_out} )
ENDFOREACH (_current_FILE)
ENDMACRO(ADD_BISON_FILES)
ENDMACRO(ADD_BISON_FILES_PREFIX)

5
src/analysis/raster/qgsrastercalcnode.cpp
View File

@ -116,4 +116,9 @@ bool QgsRasterCalcNode::calculate( QMap<QString, QgsRasterMatrix*>& rasterData,
return false;
}
QgsRasterCalcNode* QgsRasterCalcNode::parseRasterCalcString( const QString& str, QString& parserErrorMsg )
{
extern QgsRasterCalcNode* localParseRasterCalcString( const QString& str, QString& parserErrorMsg );
return localParseRasterCalcString( str, parserErrorMsg );
}

3
src/analysis/raster/qgsrastercalcnode.h
View File

@ -66,6 +66,8 @@ class ANALYSIS_EXPORT QgsRasterCalcNode
/**Calculates result (might be real matrix or single number)*/
bool calculate( QMap<QString, QgsRasterMatrix*>& rasterData, QgsRasterMatrix& result ) const;
static QgsRasterCalcNode* parseRasterCalcString( const QString& str, QString& parserErrorMsg );
private:
Type mType;
QgsRasterCalcNode* mLeft;
@ -76,4 +78,5 @@ class ANALYSIS_EXPORT QgsRasterCalcNode
Operator mOperator;
};
#endif // QGSRASTERCALCNODE_H

2
src/analysis/raster/qgsrastercalcparser.yy
View File

@ -104,7 +104,7 @@ void joinTmpNodes(QgsRasterCalcNode* parent, QgsRasterCalcNode* left, QgsRasterC
}
QgsRasterCalcNode* parseRasterCalcString(const QString& str, QString& parserErrorMsg)
QgsRasterCalcNode* localParseRasterCalcString(const QString& str, QString& parserErrorMsg)
{
// list should be empty when starting
Q_ASSERT(gTmpNodes.count() == 0);

4
src/analysis/raster/qgsrastercalculator.cpp
View File

@ -22,8 +22,6 @@
#include "cpl_string.h"
#include <QProgressDialog>
extern QgsRasterCalcNode* parseRasterCalcString( const QString& str, QString& parserErrorMsg );
QgsRasterCalculator::QgsRasterCalculator( const QString& formulaString, const QString& outputFile, const QString& outputFormat,
const QgsRectangle& outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry>& rasterEntries ): mFormulaString( formulaString ), mOutputFile( outputFile ), mOutputFormat( outputFormat ),
mOutputRectangle( outputExtent ), mNumOutputColumns( nOutputColumns ), mNumOutputRows( nOutputRows ), mRasterEntries( rasterEntries )
@ -38,7 +36,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
{
//prepare search string / tree
QString errorString;
QgsRasterCalcNode* calcNode = parseRasterCalcString( mFormulaString, errorString );
QgsRasterCalcNode* calcNode = QgsRasterCalcNode::parseRasterCalcString( mFormulaString, errorString );
if ( !calcNode )
{
//error

8
src/analysis/raster/qgsrastermatrix.cpp
View File

@ -232,13 +232,13 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
}
break;
case opPOW:
if( !testPowerValidity( mData[0], other.number() ) )
if ( !testPowerValidity( mData[0], ( float ) other.number() ) )
{
mData[0] = -10000;
}
else
{
mData[0] = pow( mData[0], other.number() );
mData[0] = pow( mData[0], ( float ) other.number() );
}
break;
}
@ -349,7 +349,7 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
}
else
{
mData[i] = pow( value, matrix[i] );
mData[i] = pow(( float ) value, matrix[i] );
}
}
break;
@ -404,7 +404,7 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
}
else
{
mData[i] = pow( mData[i], value );
mData[i] = pow( mData[i], ( float ) value );
}
}
break;

6
src/app/qgsrastercalcdialog.cpp
View File

@ -25,8 +25,6 @@
#include <QFileDialog>
#include <QSettings>
extern QgsRasterCalcNode* parseRasterCalcString( const QString& str, QString& parserErrorMsg );
QgsRasterCalcDialog::QgsRasterCalcDialog( QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f )
{
setupUi( this );
@ -127,7 +125,7 @@ void QgsRasterCalcDialog::insertAvailableRasterBands()
firstLayer = false;
}
//get number of bands
for( int i = 0; i < rlayer->bandCount(); ++i )
for ( unsigned int i = 0; i < rlayer->bandCount(); ++i )
{
QgsRasterCalculatorEntry entry;
entry.raster = rlayer;
@ -293,7 +291,7 @@ void QgsRasterCalcDialog::setAcceptButtonState()
bool QgsRasterCalcDialog::expressionValid() const
{
QString errorString;
QgsRasterCalcNode* testNode = parseRasterCalcString( mExpressionTextEdit->toPlainText(), errorString );
QgsRasterCalcNode* testNode = QgsRasterCalcNode::parseRasterCalcString( mExpressionTextEdit->toPlainText(), errorString );
if ( testNode )
{
delete testNode;