Skip to content
Permalink
Browse files

automatic indentation update (r10009-r10065)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10066 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Jan 31, 2009
1 parent 70bbe63 commit 987cd4a14ad19c1fae73062a5d20aa19b35918e4
@@ -801,7 +801,7 @@ void QgisApp::createActions()
mActionLayerSelectionSaveAs->setStatusTip( tr( "Save the selection as a shapefile" ) );
connect( mActionLayerSelectionSaveAs, SIGNAL( triggered() ), this, SLOT( saveSelectionAsShapefile() ) );
mActionLayerSelectionSaveAs->setEnabled( false );

mActionRemoveLayer = new QAction( getThemeIcon( "mActionRemoveLayer.png" ), tr( "Remove Layer" ), this );
mActionRemoveLayer->setShortcut( tr( "Ctrl+D", "Remove a Layer" ) );
mActionRemoveLayer->setStatusTip( tr( "Remove a Layer" ) );
@@ -2173,15 +2173,16 @@ bool QgisApp::addVectorLayers( QStringList const & theLayerQStringList, const QS

// If the newly created layer has more than 1 layer of data available, we show the
// sublayers selection dialog so the user can select the sublayers to actually load.
if ( sublayers.count() > 1)
{
askUserForSublayers(layer);
if ( sublayers.count() > 1 )
{
askUserForSublayers( layer );

// The first layer loaded is not usefull in that case. The user can select it in
// The first layer loaded is not usefull in that case. The user can select it in
// the list if he wants to load it.
delete layer;

}else // there is 1 layer of data available
}
else // there is 1 layer of data available
{
// Register this layer with the layers registry
QgsMapLayerRegistry::instance()->addMapLayer( layer );
@@ -2219,57 +2220,57 @@ bool QgisApp::addVectorLayers( QStringList const & theLayerQStringList, const QS
} // QgisApp::addVectorLayer()

// This method is the method that does the real job. If the layer given in
// parameter is NULL, then the method tries to act on the activeLayer.
void QgisApp::askUserForSublayers(QgsVectorLayer *layer)
// parameter is NULL, then the method tries to act on the activeLayer.
void QgisApp::askUserForSublayers( QgsVectorLayer *layer )
{
if (layer == NULL)
if ( layer == NULL )
{
if (activeLayer() == NULL || activeLayer()->type() != QgsMapLayer::VectorLayer)
if ( activeLayer() == NULL || activeLayer()->type() != QgsMapLayer::VectorLayer )
return;
layer = (QgsVectorLayer*) activeLayer();
if (layer->dataProvider()->name() != "ogr")

layer = ( QgsVectorLayer* ) activeLayer();
if ( layer->dataProvider()->name() != "ogr" )
return;
}

QStringList sublayers = layer->dataProvider()->subLayers();

// We initialize a selection dialog and display it.
QgsOGRSublayersDialog chooseSublayersDialog( this );
chooseSublayersDialog.populateLayerTable( sublayers );
if (chooseSublayersDialog.exec())

if ( chooseSublayersDialog.exec() )
{
QString uri = layer->source();
if ( uri.contains('&', Qt::CaseSensitive) )
if ( uri.contains( '&', Qt::CaseSensitive ) )
{
// If we get here, there are some options added to the filename.
// A valid uri is of the form: filename&option1=value1&option2=value2,...
// We want only the filename here, so we get the first part of the split.
QStringList theURIParts = uri.split("&");
QStringList theURIParts = uri.split( "&" );
uri = theURIParts.at( 0 );
}

// the user has done his choice
loadOGRSublayers(uri, chooseSublayersDialog.getSelection());
loadOGRSublayers( uri, chooseSublayersDialog.getSelection() );
}
}

// This method will load with OGR the layers in parameter.
// This method will load with OGR the layers in parameter.
// This method has been conceived to use the new URI
// format of the ogrprovider so as to give precisions about which
// sublayer to load into QGIS. It is normally triggered by the
// sublayer selection dialog.
void QgisApp::loadOGRSublayers( QString uri, QStringList list)
void QgisApp::loadOGRSublayers( QString uri, QStringList list )
{
// The uri must contain the actual uri of the vectorLayer from which we are
// going to load the sublayers.
QString fileName = QFileInfo(uri).baseName();
for (int i = 0; i < list.size(); i++)
{
QString composedURI=uri+"&layername="+list.at(i);
QgsVectorLayer *layer=addVectorLayer(composedURI,fileName+":"+list.at(i),"ogr");
}
QString fileName = QFileInfo( uri ).baseName();
for ( int i = 0; i < list.size(); i++ )
{
QString composedURI = uri + "&layername=" + list.at( i );
QgsVectorLayer *layer = addVectorLayer( composedURI, fileName + ":" + list.at( i ), "ogr" );
}
}

/** This helper checks to see whether the file name appears to be a valid vector file name */
@@ -600,7 +600,7 @@ class QgisApp : public QMainWindow
/** This method will open a dialog so the user can select the sublayers
* to load
*/
void askUserForSublayers(QgsVectorLayer *layer);
void askUserForSublayers( QgsVectorLayer *layer );
/** Add a raster layer to the map (passed in as a ptr).
* It won't force a refresh.
*/
@@ -23,8 +23,8 @@ QgsOGRSublayersDialog::QgsOGRSublayersDialog( QWidget* parent, Qt::WFlags fl )
: QDialog( parent, fl )
{
setupUi( this );
QStringList labels=QStringList() << "Layer ID" << "Layer name" << "Nb of features" << "Geometry type";
layersTable->setHeaderLabels(labels);
QStringList labels = QStringList() << "Layer ID" << "Layer name" << "Nb of features" << "Geometry type";
layersTable->setHeaderLabels( labels );
}

QgsOGRSublayersDialog::~QgsOGRSublayersDialog()
@@ -33,22 +33,23 @@ QgsOGRSublayersDialog::~QgsOGRSublayersDialog()

QStringList QgsOGRSublayersDialog::getSelection()
{
QStringList list=QStringList();
for (int i = 0; i < layersTable-> selectedItems().size(); i++)
QStringList list = QStringList();
for ( int i = 0; i < layersTable-> selectedItems().size(); i++ )
{
QString theItem =layersTable-> selectedItems().at(i)->text(1);
list.append(theItem);
QString theItem = layersTable-> selectedItems().at( i )->text( 1 );
list.append( theItem );
}
return list;
}

void QgsOGRSublayersDialog::populateLayerTable (QStringList theList)
void QgsOGRSublayersDialog::populateLayerTable( QStringList theList )
{
for (int i =0; i< theList.size(); i++){
QString ligne = theList.at(i);
QStringList elements = ligne.split(":");
QStringList item=QStringList();
item << elements.at(0) << elements.at(1) << elements.at(2) << elements.at(3);
layersTable -> addTopLevelItem(new QTreeWidgetItem(item));
}
for ( int i = 0; i < theList.size(); i++ )
{
QString ligne = theList.at( i );
QStringList elements = ligne.split( ":" );
QStringList item = QStringList();
item << elements.at( 0 ) << elements.at( 1 ) << elements.at( 2 ) << elements.at( 3 );
layersTable -> addTopLevelItem( new QTreeWidgetItem( item ) );
}
}
@@ -28,8 +28,8 @@ class QgsOGRSublayersDialog : public QDialog, private Ui::QgsOGRSublayersDialogB
public:
QgsOGRSublayersDialog( QWidget* parent = 0, Qt::WFlags fl = 0 );
~QgsOGRSublayersDialog();
void populateLayerTable(QStringList theList);
QStringList getSelection();
void populateLayerTable( QStringList theList );
QStringList getSelection();

};

@@ -77,7 +77,7 @@ QgsServerSourceSelect::QgsServerSourceSelect( QWidget * parent, Qt::WFlags fl )
int i = 1;
while ( iter != m_PotentialFormats.end() )
{
QRadioButton* btn = new QRadioButton(iter.value().first);
QRadioButton* btn = new QRadioButton( iter.value().first );
m_imageFormatGroup->addButton( btn, iter.value().second );
m_imageFormatLayout->addWidget( btn );
if ( i == 1 )
@@ -584,7 +584,7 @@ QString QgsServerSourceSelect::selectedImageEncoding()
QString imageEncoding = m_PotentialFormats.key( qMakePair( label, id ) );

//substitute blanks with %20 (e.g. in "image/png; mode=24bit")
imageEncoding.replace(QRegExp(" "), "%20");
imageEncoding.replace( QRegExp( " " ), "%20" );
return imageEncoding;
}

@@ -372,7 +372,7 @@ void QgsComposerMap::setSceneRect( const QRectF& rectangle )
mExtent = QgsRectangle( mExtent.xMinimum(), mExtent.yMinimum(), mExtent.xMaximum(), mExtent.yMinimum() + newHeight );
mCacheUpdated = false;
emit extentChanged();
if(mPreviewMode != Rectangle)
if ( mPreviewMode != Rectangle )
{
cache();
}
@@ -5453,29 +5453,29 @@ QList<QgsGeometry*> QgsGeometry::asGeometryCollection()
if ( mGeos == NULL )
return QList<QgsGeometry*>();
}

int type = GEOSGeomTypeId( mGeos );
QgsDebugMsg("geom type: "+QString::number(type));
QgsDebugMsg( "geom type: " + QString::number( type ) );

QList<QgsGeometry*> geomCollection;

if ( type != GEOS_MULTIPOINT &&
type != GEOS_MULTILINESTRING &&
type != GEOS_MULTIPOLYGON &&
type != GEOS_GEOMETRYCOLLECTION )
{
// we have a single-part geometry - put there a copy of this one
geomCollection.append( new QgsGeometry(*this) );
geomCollection.append( new QgsGeometry( *this ) );
return geomCollection;
}

int count = GEOSGetNumGeometries( mGeos );
QgsDebugMsg("geom count: "+QString::number(count));
QgsDebugMsg( "geom count: " + QString::number( count ) );

for ( int i = 0; i < count; ++i )
{
const GEOSGeometry * geometry = GEOSGetGeometryN( mGeos, i );
geomCollection.append( fromGeosGeom( GEOSGeom_clone(geometry) ) );
geomCollection.append( fromGeosGeom( GEOSGeom_clone( geometry ) ) );
}

return geomCollection;
@@ -2324,7 +2324,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage

if ( !renderer )
{
errorMessage = tr("Unknown renderer");
errorMessage = tr( "Unknown renderer" );
return false;
}

@@ -122,11 +122,11 @@ void QgsDetailedItemDelegate::paintManually( QPainter * thepPainter,
if ( theOption.state & QStyle::State_Selected )
{
drawHighlight( theOption, thepPainter, height( theOption, theData ) );
thepPainter->setPen(theOption.palette.highlightedText().color());
thepPainter->setPen( theOption.palette.highlightedText().color() );
}
else
{
thepPainter->setPen(theOption.palette.text().color());
thepPainter->setPen( theOption.palette.text().color() );
}


@@ -431,14 +431,14 @@ void QgsMapCanvas::saveAsImage( QString theFileName, QPixmap * theQPixmap, QStri
myHeader += QString::number( myRect.xMinimum() ) + "\r\n";
//Origin Y (top left corner)
myHeader += QString::number( myRect.yMaximum() ) + "\r\n";
QFileInfo myInfo = QFileInfo(theFileName);
QFileInfo myInfo = QFileInfo( theFileName );
QString myWorldFileName = myInfo.absolutePath() + QDir::separator() + myInfo.baseName() + "." + theFormat + "w";
QFile myWorldFile(myWorldFileName);
if (!myWorldFile.open(QIODevice::WriteOnly | QIODevice::Text))
QFile myWorldFile( myWorldFileName );
if ( !myWorldFile.open( QIODevice::WriteOnly | QIODevice::Text ) )
{
return;
}
QTextStream myStream(&myWorldFile);
QTextStream myStream( &myWorldFile );
myStream << myHeader;
} // saveAsImage

0 comments on commit 987cd4a

Please sign in to comment.
You can’t perform that action at this time.