mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-19 00:04:52 -04:00
indentation update
This commit is contained in:
parent
c81a27ecf1
commit
8d3654baa7
@ -50,7 +50,7 @@ class APP_EXPORT QgsFeatureAction : public QAction
|
|||||||
*
|
*
|
||||||
* @return true if feature was added if showModal is true. If showModal is false, returns true in every case
|
* @return true if feature was added if showModal is true. If showModal is false, returns true in every case
|
||||||
*/
|
*/
|
||||||
bool addFeature(const QgsAttributeMap& defaultAttributes = QgsAttributeMap() , bool showModal = true );
|
bool addFeature( const QgsAttributeMap& defaultAttributes = QgsAttributeMap() , bool showModal = true );
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void onFeatureSaved( const QgsFeature& feature );
|
void onFeatureSaved( const QgsFeature& feature );
|
||||||
|
@ -163,7 +163,7 @@ QTreeWidgetItem *QgsFieldsProperties::loadAttributeEditorTreeItem( QgsAttributeE
|
|||||||
|
|
||||||
const QgsAttributeEditorContainer* container = dynamic_cast<const QgsAttributeEditorContainer*>( widgetDef );
|
const QgsAttributeEditorContainer* container = dynamic_cast<const QgsAttributeEditorContainer*>( widgetDef );
|
||||||
|
|
||||||
Q_FOREACH( QgsAttributeEditorElement* wdg, container->children() )
|
Q_FOREACH ( QgsAttributeEditorElement* wdg, container->children() )
|
||||||
{
|
{
|
||||||
loadAttributeEditorTreeItem( wdg, newWidget );
|
loadAttributeEditorTreeItem( wdg, newWidget );
|
||||||
}
|
}
|
||||||
@ -187,7 +187,7 @@ void QgsFieldsProperties::loadAttributeEditorTree()
|
|||||||
mDesignerTree->setAcceptDrops( true );
|
mDesignerTree->setAcceptDrops( true );
|
||||||
mDesignerTree->setDragDropMode( QAbstractItemView::DragDrop );
|
mDesignerTree->setDragDropMode( QAbstractItemView::DragDrop );
|
||||||
|
|
||||||
Q_FOREACH( QgsAttributeEditorElement* wdg, mLayer->attributeEditorElements() )
|
Q_FOREACH ( QgsAttributeEditorElement* wdg, mLayer->attributeEditorElements() )
|
||||||
{
|
{
|
||||||
loadAttributeEditorTreeItem( wdg, mDesignerTree->invisibleRootItem() );
|
loadAttributeEditorTreeItem( wdg, mDesignerTree->invisibleRootItem() );
|
||||||
}
|
}
|
||||||
@ -272,7 +272,7 @@ void QgsFieldsProperties::loadRelations()
|
|||||||
|
|
||||||
int idx = 0;
|
int idx = 0;
|
||||||
|
|
||||||
Q_FOREACH( const QgsRelation& relation, relations )
|
Q_FOREACH ( const QgsRelation& relation, relations )
|
||||||
{
|
{
|
||||||
mRelationsList->insertRow( idx );
|
mRelationsList->insertRow( idx );
|
||||||
|
|
||||||
@ -310,7 +310,7 @@ void QgsFieldsProperties::on_mAddItemButton_clicked()
|
|||||||
if ( parent->data( 0, DesignerTreeRole ).value<DesignerTreeItemData>().type() != DesignerTreeItemData::Container )
|
if ( parent->data( 0, DesignerTreeRole ).value<DesignerTreeItemData>().type() != DesignerTreeItemData::Container )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Q_FOREACH( QTableWidgetItem* item, listItems )
|
Q_FOREACH ( QTableWidgetItem* item, listItems )
|
||||||
{
|
{
|
||||||
if ( item->column() == 0 ) // Information is in the first column
|
if ( item->column() == 0 ) // Information is in the first column
|
||||||
mDesignerTree->addItem( parent , item->data( DesignerTreeRole ).value<DesignerTreeItemData>() );
|
mDesignerTree->addItem( parent , item->data( DesignerTreeRole ).value<DesignerTreeItemData>() );
|
||||||
@ -409,7 +409,7 @@ void QgsFieldsProperties::attributeTypeDialog()
|
|||||||
int index = -1;
|
int index = -1;
|
||||||
int row = -1;
|
int row = -1;
|
||||||
|
|
||||||
Q_FOREACH( QTableWidgetItem* wdg, mIndexedWidgets )
|
Q_FOREACH ( QTableWidgetItem* wdg, mIndexedWidgets )
|
||||||
{
|
{
|
||||||
cfg = wdg->data( FieldConfigRole ).value<FieldConfig>();
|
cfg = wdg->data( FieldConfigRole ).value<FieldConfig>();
|
||||||
if ( cfg.mButton == pb )
|
if ( cfg.mButton == pb )
|
||||||
@ -542,7 +542,7 @@ void QgsFieldsProperties::on_mDeleteAttributeButton_clicked()
|
|||||||
{
|
{
|
||||||
QSet<int> providerFields;
|
QSet<int> providerFields;
|
||||||
QSet<int> expressionFields;
|
QSet<int> expressionFields;
|
||||||
Q_FOREACH( QTableWidgetItem* item, mFieldsList->selectedItems() )
|
Q_FOREACH ( QTableWidgetItem* item, mFieldsList->selectedItems() )
|
||||||
{
|
{
|
||||||
if ( item->column() == 0 )
|
if ( item->column() == 0 )
|
||||||
{
|
{
|
||||||
@ -588,7 +588,7 @@ void QgsFieldsProperties::updateButtons()
|
|||||||
mDeleteAttributeButton->setEnabled( mFieldsList->selectedItems().count() > 0 );
|
mDeleteAttributeButton->setEnabled( mFieldsList->selectedItems().count() > 0 );
|
||||||
|
|
||||||
// and only if all selected items have their origin in an expression
|
// and only if all selected items have their origin in an expression
|
||||||
Q_FOREACH( QTableWidgetItem* item, mFieldsList->selectedItems() )
|
Q_FOREACH ( QTableWidgetItem* item, mFieldsList->selectedItems() )
|
||||||
{
|
{
|
||||||
if ( item->column() == 0 )
|
if ( item->column() == 0 )
|
||||||
{
|
{
|
||||||
@ -841,7 +841,7 @@ QMimeData* QgsFieldsProperties::DragList::mimeData( const QList<QTableWidgetItem
|
|||||||
QByteArray encoded;
|
QByteArray encoded;
|
||||||
QDataStream stream( &encoded, QIODevice::WriteOnly );
|
QDataStream stream( &encoded, QIODevice::WriteOnly );
|
||||||
|
|
||||||
Q_FOREACH( const QTableWidgetItem* item, items )
|
Q_FOREACH ( const QTableWidgetItem* item, items )
|
||||||
{
|
{
|
||||||
// Relevant information is always in the UserRole of the first column
|
// Relevant information is always in the UserRole of the first column
|
||||||
if ( item && item->column() == 0 )
|
if ( item && item->column() == 0 )
|
||||||
@ -1011,7 +1011,7 @@ QMimeData* QgsFieldsProperties::DesignerTree::mimeData( const QList<QTreeWidgetI
|
|||||||
QByteArray encoded;
|
QByteArray encoded;
|
||||||
QDataStream stream( &encoded, QIODevice::WriteOnly );
|
QDataStream stream( &encoded, QIODevice::WriteOnly );
|
||||||
|
|
||||||
Q_FOREACH( const QTreeWidgetItem* item, items )
|
Q_FOREACH ( const QTreeWidgetItem* item, items )
|
||||||
{
|
{
|
||||||
if ( item )
|
if ( item )
|
||||||
{
|
{
|
||||||
|
@ -25,6 +25,6 @@ class APP_EXPORT QgsMapToolAddFeature : public QgsMapToolCapture
|
|||||||
virtual ~QgsMapToolAddFeature();
|
virtual ~QgsMapToolAddFeature();
|
||||||
void canvasReleaseEvent( QMouseEvent * e );
|
void canvasReleaseEvent( QMouseEvent * e );
|
||||||
|
|
||||||
bool addFeature(QgsVectorLayer *vlayer, QgsFeature *f , bool showModal = true );
|
bool addFeature( QgsVectorLayer *vlayer, QgsFeature *f , bool showModal = true );
|
||||||
void activate();
|
void activate();
|
||||||
};
|
};
|
||||||
|
@ -2140,7 +2140,7 @@ bool QgsVectorLayer::deleteAttributes( QList<int> attrs )
|
|||||||
|
|
||||||
qSort( attrs.begin(), attrs.end(), qGreater<int>() );
|
qSort( attrs.begin(), attrs.end(), qGreater<int>() );
|
||||||
|
|
||||||
Q_FOREACH( int attr, attrs )
|
Q_FOREACH ( int attr, attrs )
|
||||||
{
|
{
|
||||||
if ( deleteAttribute( attr ) )
|
if ( deleteAttribute( attr ) )
|
||||||
{
|
{
|
||||||
|
@ -523,7 +523,7 @@ void QgsRasterInterface::cumulativeCut( int theBandNo,
|
|||||||
|
|
||||||
//get band stats to specify real histogram min/max (fix #9793 Byte bands)
|
//get band stats to specify real histogram min/max (fix #9793 Byte bands)
|
||||||
QgsRasterBandStats stats = bandStatistics( theBandNo, QgsRasterBandStats::Min, theExtent, theSampleSize );
|
QgsRasterBandStats stats = bandStatistics( theBandNo, QgsRasterBandStats::Min, theExtent, theSampleSize );
|
||||||
if( stats.maximumValue < stats.minimumValue )
|
if ( stats.maximumValue < stats.minimumValue )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// for byte bands make sure bin count == actual range
|
// for byte bands make sure bin count == actual range
|
||||||
|
@ -169,8 +169,8 @@ void QgsRendererRangeV2::toSld( QDomDocument &doc, QDomElement &element, QgsStri
|
|||||||
|
|
||||||
///////////
|
///////////
|
||||||
|
|
||||||
int QgsRendererRangeV2LabelFormat::MaxPrecision=15;
|
int QgsRendererRangeV2LabelFormat::MaxPrecision = 15;
|
||||||
int QgsRendererRangeV2LabelFormat::MinPrecision=-6;
|
int QgsRendererRangeV2LabelFormat::MinPrecision = -6;
|
||||||
|
|
||||||
QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat():
|
QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat():
|
||||||
mFormat( " %1 - %2 " ),
|
mFormat( " %1 - %2 " ),
|
||||||
@ -179,13 +179,13 @@ QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat():
|
|||||||
mNumberScale( 1.0 ),
|
mNumberScale( 1.0 ),
|
||||||
mNumberSuffix( "" ),
|
mNumberSuffix( "" ),
|
||||||
mReTrailingZeroes( "[.,]?0*$" ),
|
mReTrailingZeroes( "[.,]?0*$" ),
|
||||||
mReNegativeZero("^\\-0(?:[.,]0*)?$")
|
mReNegativeZero( "^\\-0(?:[.,]0*)?$" )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat( QString format, int precision, bool trimTrailingZeroes ):
|
QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat( QString format, int precision, bool trimTrailingZeroes ):
|
||||||
mReTrailingZeroes( "[.,]?0*$" ),
|
mReTrailingZeroes( "[.,]?0*$" ),
|
||||||
mReNegativeZero("^\\-0(?:[.,]0*)?$")
|
mReNegativeZero( "^\\-0(?:[.,]0*)?$" )
|
||||||
{
|
{
|
||||||
setFormat( format );
|
setFormat( format );
|
||||||
setPrecision( precision );
|
setPrecision( precision );
|
||||||
@ -212,13 +212,13 @@ void QgsRendererRangeV2LabelFormat::setPrecision( int precision )
|
|||||||
if ( precision < MinPrecision ) precision = MinPrecision;
|
if ( precision < MinPrecision ) precision = MinPrecision;
|
||||||
if ( precision > MaxPrecision ) precision = MaxPrecision;
|
if ( precision > MaxPrecision ) precision = MaxPrecision;
|
||||||
mPrecision = precision;
|
mPrecision = precision;
|
||||||
mNumberScale=1.0;
|
mNumberScale = 1.0;
|
||||||
mNumberSuffix="";
|
mNumberSuffix = "";
|
||||||
while( precision < 0 )
|
while ( precision < 0 )
|
||||||
{
|
{
|
||||||
precision++;
|
precision++;
|
||||||
mNumberScale /= 10.0;
|
mNumberScale /= 10.0;
|
||||||
mNumberSuffix.append('0');
|
mNumberSuffix.append( '0' );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -229,29 +229,29 @@ QString QgsRendererRangeV2LabelFormat::labelForRange( const QgsRendererRangeV2 &
|
|||||||
|
|
||||||
QString QgsRendererRangeV2LabelFormat::formatNumber( double value ) const
|
QString QgsRendererRangeV2LabelFormat::formatNumber( double value ) const
|
||||||
{
|
{
|
||||||
if( mPrecision > 0 )
|
if ( mPrecision > 0 )
|
||||||
{
|
{
|
||||||
QString valueStr=QString::number( value, 'f', mPrecision );
|
QString valueStr = QString::number( value, 'f', mPrecision );
|
||||||
if( mTrimTrailingZeroes ) valueStr=valueStr.replace(mReTrailingZeroes,"");
|
if ( mTrimTrailingZeroes ) valueStr = valueStr.replace( mReTrailingZeroes, "" );
|
||||||
if( mReNegativeZero.exactMatch(valueStr)) valueStr=valueStr.mid(1);
|
if ( mReNegativeZero.exactMatch( valueStr ) ) valueStr = valueStr.mid( 1 );
|
||||||
return valueStr;
|
return valueStr;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
QString valueStr=QString::number( value*mNumberScale, 'f', 0 );
|
QString valueStr = QString::number( value * mNumberScale, 'f', 0 );
|
||||||
if( valueStr == "-0" ) valueStr="0";
|
if ( valueStr == "-0" ) valueStr = "0";
|
||||||
if( valueStr != "0" ) valueStr=valueStr+mNumberSuffix;
|
if ( valueStr != "0" ) valueStr = valueStr + mNumberSuffix;
|
||||||
return valueStr;
|
return valueStr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QString QgsRendererRangeV2LabelFormat::labelForRange( double lower, double upper ) const
|
QString QgsRendererRangeV2LabelFormat::labelForRange( double lower, double upper ) const
|
||||||
{
|
{
|
||||||
QString lowerStr=formatNumber(lower);
|
QString lowerStr = formatNumber( lower );
|
||||||
QString upperStr=formatNumber(upper);
|
QString upperStr = formatNumber( upper );
|
||||||
|
|
||||||
QString legend(mFormat);
|
QString legend( mFormat );
|
||||||
return legend.replace( "%1",lowerStr).replace("%2",upperStr );
|
return legend.replace( "%1", lowerStr ).replace( "%2", upperStr );
|
||||||
}
|
}
|
||||||
|
|
||||||
void QgsRendererRangeV2LabelFormat::setFromDomElement( QDomElement &element )
|
void QgsRendererRangeV2LabelFormat::setFromDomElement( QDomElement &element )
|
||||||
@ -261,7 +261,7 @@ void QgsRendererRangeV2LabelFormat::setFromDomElement( QDomElement &element )
|
|||||||
element.attribute( "separator", " - " ) + "%2" +
|
element.attribute( "separator", " - " ) + "%2" +
|
||||||
element.attribute( "suffix", " " )
|
element.attribute( "suffix", " " )
|
||||||
);
|
);
|
||||||
setPrecision( element.attribute( "decimalplaces", "4" ).toInt());
|
setPrecision( element.attribute( "decimalplaces", "4" ).toInt() );
|
||||||
mTrimTrailingZeroes = element.attribute( "trimtrailingzeroes", "false" ) == "true";
|
mTrimTrailingZeroes = element.attribute( "trimtrailingzeroes", "false" ) == "true";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1113,7 +1113,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element
|
|||||||
double upperValue = rangeElem.attribute( "upper" ).toDouble();
|
double upperValue = rangeElem.attribute( "upper" ).toDouble();
|
||||||
QString symbolName = rangeElem.attribute( "symbol" );
|
QString symbolName = rangeElem.attribute( "symbol" );
|
||||||
QString label = rangeElem.attribute( "label" );
|
QString label = rangeElem.attribute( "label" );
|
||||||
bool render=rangeElem.attribute("render","true") != "false";
|
bool render = rangeElem.attribute( "render", "true" ) != "false";
|
||||||
if ( symbolMap.contains( symbolName ) )
|
if ( symbolMap.contains( symbolName ) )
|
||||||
{
|
{
|
||||||
QgsSymbolV2* symbol = symbolMap.take( symbolName );
|
QgsSymbolV2* symbol = symbolMap.take( symbolName );
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
static QColor _interpolate( QColor c1, QColor c2, double value )
|
static QColor _interpolate( QColor c1, QColor c2, double value )
|
||||||
{
|
{
|
||||||
if ( qIsNaN(value) ) value = 1;
|
if ( qIsNaN( value ) ) value = 1;
|
||||||
int r = ( int )( c1.red() + value * ( c2.red() - c1.red() ) );
|
int r = ( int )( c1.red() + value * ( c2.red() - c1.red() ) );
|
||||||
int g = ( int )( c1.green() + value * ( c2.green() - c1.green() ) );
|
int g = ( int )( c1.green() + value * ( c2.green() - c1.green() ) );
|
||||||
int b = ( int )( c1.blue() + value * ( c2.blue() - c1.blue() ) );
|
int b = ( int )( c1.blue() + value * ( c2.blue() - c1.blue() ) );
|
||||||
|
@ -73,7 +73,7 @@ void QgsCredentialDialog::requestCredentials( QString realm, QString *username,
|
|||||||
|
|
||||||
QApplication::restoreOverrideCursor();
|
QApplication::restoreOverrideCursor();
|
||||||
|
|
||||||
if( activeWindow )
|
if ( activeWindow )
|
||||||
activeWindow->raise();
|
activeWindow->raise();
|
||||||
|
|
||||||
if ( *ok )
|
if ( *ok )
|
||||||
|
@ -129,8 +129,8 @@ QVariant QgsGraduatedSymbolRendererV2Model::data( const QModelIndex &index, int
|
|||||||
{
|
{
|
||||||
case 1:
|
case 1:
|
||||||
{
|
{
|
||||||
int decimalPlaces=mRenderer->labelFormat().precision()+2;
|
int decimalPlaces = mRenderer->labelFormat().precision() + 2;
|
||||||
if( decimalPlaces < 0 ) decimalPlaces=0;
|
if ( decimalPlaces < 0 ) decimalPlaces = 0;
|
||||||
return QString::number( range.lowerValue(), 'f', decimalPlaces ) + " - " + QString::number( range.upperValue(), 'f', decimalPlaces );
|
return QString::number( range.lowerValue(), 'f', decimalPlaces ) + " - " + QString::number( range.upperValue(), 'f', decimalPlaces );
|
||||||
}
|
}
|
||||||
case 2: return range.label();
|
case 2: return range.label();
|
||||||
@ -399,8 +399,8 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto
|
|||||||
|
|
||||||
cboGraduatedColorRamp->populate( mStyle );
|
cboGraduatedColorRamp->populate( mStyle );
|
||||||
|
|
||||||
spinPrecision->setMinimum( QgsRendererRangeV2LabelFormat::MinPrecision);
|
spinPrecision->setMinimum( QgsRendererRangeV2LabelFormat::MinPrecision );
|
||||||
spinPrecision->setMaximum( QgsRendererRangeV2LabelFormat::MaxPrecision);
|
spinPrecision->setMaximum( QgsRendererRangeV2LabelFormat::MaxPrecision );
|
||||||
|
|
||||||
// set project default color ramp
|
// set project default color ramp
|
||||||
QString defaultColorRamp = QgsProject::instance()->readEntry( "DefaultStyles", "/ColorRamp", "" );
|
QString defaultColorRamp = QgsProject::instance()->readEntry( "DefaultStyles", "/ColorRamp", "" );
|
||||||
@ -743,8 +743,8 @@ void QgsGraduatedSymbolRendererV2Widget::changeRange( int rangeIdx )
|
|||||||
const QgsRendererRangeV2& range = mRenderer->ranges()[rangeIdx];
|
const QgsRendererRangeV2& range = mRenderer->ranges()[rangeIdx];
|
||||||
// Add arbitrary 2 to number of decimal places to retain a bit extra.
|
// Add arbitrary 2 to number of decimal places to retain a bit extra.
|
||||||
// Ensures users can see if legend is not completely honest!
|
// Ensures users can see if legend is not completely honest!
|
||||||
int decimalPlaces = mRenderer->labelFormat().precision()+2;
|
int decimalPlaces = mRenderer->labelFormat().precision() + 2;
|
||||||
if( decimalPlaces < 0 ) decimalPlaces=0;
|
if ( decimalPlaces < 0 ) decimalPlaces = 0;
|
||||||
dialog.setLowerValue( QString::number( range.lowerValue(), 'f', decimalPlaces ) );
|
dialog.setLowerValue( QString::number( range.lowerValue(), 'f', decimalPlaces ) );
|
||||||
dialog.setUpperValue( QString::number( range.upperValue(), 'f', decimalPlaces ) );
|
dialog.setUpperValue( QString::number( range.upperValue(), 'f', decimalPlaces ) );
|
||||||
|
|
||||||
|
@ -659,7 +659,7 @@ QImage* QgsWMSServer::getLegendGraphics()
|
|||||||
{
|
{
|
||||||
QgsMapLayer *ml = QgsMapLayerRegistry::instance()->mapLayer( layerId );
|
QgsMapLayer *ml = QgsMapLayerRegistry::instance()->mapLayer( layerId );
|
||||||
QgsLayerTreeLayer *layer = rootGroup.addLayer( ml );
|
QgsLayerTreeLayer *layer = rootGroup.addLayer( ml );
|
||||||
if( !ml->title().isEmpty() )
|
if ( !ml->title().isEmpty() )
|
||||||
layer->setLayerName( ml->title() );
|
layer->setLayerName( ml->title() );
|
||||||
}
|
}
|
||||||
QgsLayerTreeModel legendModel( &rootGroup );
|
QgsLayerTreeModel legendModel( &rootGroup );
|
||||||
|
@ -330,7 +330,7 @@ bool QgsPostgresFeatureIterator::declareCursor( const QString& whereClause )
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch ( mSource->mPrimaryKeyType )
|
switch ( mSource->mPrimaryKeyType )
|
||||||
{
|
{
|
||||||
case pktOid:
|
case pktOid:
|
||||||
query += delim + "oid";
|
query += delim + "oid";
|
||||||
delim = ",";
|
delim = ",";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user