Skip to content

Commit

Permalink
Add usual file headers and update indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@wonder-sk
wonder-sk committed May 21, 2014
1 parent bb7831f commit fd8722a
Show file tree
Hide file tree
Showing 22 changed files with 1,634 additions and 1,318 deletions.
82 changes: 41 additions & 41 deletions src/app/qgisapp.cpp 100755 → 100644
View file
Expand Up @@ -378,7 +378,7 @@ void QgisApp::emitCustomSrsValidation( QgsCoordinateReferenceSystem &srs )
emit customSrsValidation( srs );
}

void QgisApp::layerTreeViewDoubleClicked(const QModelIndex& index)
void QgisApp::layerTreeViewDoubleClicked( const QModelIndex& index )
{
Q_UNUSED( index );

Expand All @@ -396,7 +396,7 @@ void QgisApp::layerTreeViewDoubleClicked(const QModelIndex& index)
}
}

void QgisApp::activeLayerChanged(QgsMapLayer* layer)
void QgisApp::activeLayerChanged( QgsMapLayer* layer )
{
if ( mMapCanvas )
mMapCanvas->setCurrentLayer( layer );
Expand Down Expand Up @@ -553,7 +553,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
mMapCanvas->setFocus();

mLayerTreeView = new QgsLayerTreeView( this );
mLayerTreeView->setObjectName("theLayerTreeView"); // "theLayerTreeView" used to find this canonical instance later
mLayerTreeView->setObjectName( "theLayerTreeView" ); // "theLayerTreeView" used to find this canonical instance later

// create undo widget
mUndoWidget = new QgsUndoWidget( NULL, mMapCanvas );
Expand Down Expand Up @@ -1952,15 +1952,15 @@ void QgisApp::setupConnections()
// connect legend signals
connect( mLayerTreeView, SIGNAL( currentLayerChanged( QgsMapLayer * ) ),
this, SLOT( activateDeactivateLayerRelatedActions( QgsMapLayer * ) ) );
connect( mLayerTreeView->selectionModel(), SIGNAL( selectionChanged(QItemSelection,QItemSelection) ),
connect( mLayerTreeView->selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ),
this, SLOT( legendLayerSelectionChanged() ) );
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( addedChildren(QgsLayerTreeNode*,int,int) ),
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( addedChildren( QgsLayerTreeNode*, int, int ) ),
this, SLOT( markDirty() ) );
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( removedChildren(QgsLayerTreeNode*,int,int) ),
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( removedChildren( QgsLayerTreeNode*, int, int ) ),
this, SLOT( markDirty() ) );
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( visibilityChanged(QgsLayerTreeNode*,Qt::CheckState) ),
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( visibilityChanged( QgsLayerTreeNode*, Qt::CheckState ) ),
this, SLOT( markDirty() ) );
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( customPropertyChanged(QgsLayerTreeNode*,QString) ),
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( customPropertyChanged( QgsLayerTreeNode*, QString ) ),
this, SLOT( markDirty() ) );

// connect map layer registry
Expand Down Expand Up @@ -2214,24 +2214,24 @@ void QgisApp::initLayerTreeView()
mLayerTreeDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );

QgsLayerTreeModel* model = new QgsLayerTreeModel( QgsProject::instance()->layerTreeRoot(), this );
model->setFlag(QgsLayerTreeModel::AllowVisibilityManagement);
model->setFlag( QgsLayerTreeModel::AllowVisibilityManagement );

mLayerTreeView->setModel( model );
mLayerTreeView->setMenuProvider( new QgsAppLayerTreeViewMenuProvider(mLayerTreeView, mMapCanvas) );
mLayerTreeView->setMenuProvider( new QgsAppLayerTreeViewMenuProvider( mLayerTreeView, mMapCanvas ) );

connect( mLayerTreeView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(layerTreeViewDoubleClicked(QModelIndex)) );
connect( mLayerTreeView, SIGNAL(currentLayerChanged(QgsMapLayer*)), this, SLOT(activeLayerChanged(QgsMapLayer*)) );
connect( mLayerTreeView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(layerTreeViewCurrentChanged(QModelIndex,QModelIndex)));
connect( mLayerTreeView, SIGNAL( doubleClicked( QModelIndex ) ), this, SLOT( layerTreeViewDoubleClicked( QModelIndex ) ) );
connect( mLayerTreeView, SIGNAL( currentLayerChanged( QgsMapLayer* ) ), this, SLOT( activeLayerChanged( QgsMapLayer* ) ) );
connect( mLayerTreeView->selectionModel(), SIGNAL( currentChanged( QModelIndex, QModelIndex ) ), this, SLOT( layerTreeViewCurrentChanged( QModelIndex, QModelIndex ) ) );

mLayerTreeDock->setWidget( mLayerTreeView );
addDockWidget( Qt::LeftDockWidgetArea, mLayerTreeDock );

mLayerTreeCanvasBridge = new QgsLayerTreeMapCanvasBridge( QgsProject::instance()->layerTreeRoot(), mMapCanvas, this );
connect( QgsProject::instance(), SIGNAL(writeProject(QDomDocument&)), mLayerTreeCanvasBridge, SLOT(writeProject(QDomDocument&)));
connect( QgsProject::instance(), SIGNAL(readProject(QDomDocument)), mLayerTreeCanvasBridge, SLOT(readProject(QDomDocument)));
connect( QgsProject::instance(), SIGNAL( writeProject( QDomDocument& ) ), mLayerTreeCanvasBridge, SLOT( writeProject( QDomDocument& ) ) );
connect( QgsProject::instance(), SIGNAL( readProject( QDomDocument ) ), mLayerTreeCanvasBridge, SLOT( readProject( QDomDocument ) ) );

mMapLayerOrder = new QgsCustomLayerOrderWidget(mLayerTreeCanvasBridge, this);
mMapLayerOrder->setObjectName("theMapLayerOrder");
mMapLayerOrder = new QgsCustomLayerOrderWidget( mLayerTreeCanvasBridge, this );
mMapLayerOrder->setObjectName( "theMapLayerOrder" );

mMapLayerOrder->setWhatsThis( tr( "Map layer list that displays all layers in drawing order." ) );
mLayerOrderDock = new QDockWidget( tr( "Layer order" ), this );
Expand All @@ -2244,27 +2244,27 @@ void QgisApp::initLayerTreeView()
}


void QgisApp::layerTreeViewCurrentChanged(const QModelIndex& current, const QModelIndex& previous)
void QgisApp::layerTreeViewCurrentChanged( const QModelIndex& current, const QModelIndex& previous )
{
Q_UNUSED(previous);
Q_UNUSED( previous );

// defaults
QgsLayerTreeGroup* parentGroup = mLayerTreeView->layerTreeModel()->rootGroup();
int index = 0;

if (current.isValid())
if ( current.isValid() )
{
if (QgsLayerTreeNode* currentNode = mLayerTreeView->currentNode())
if ( QgsLayerTreeNode* currentNode = mLayerTreeView->currentNode() )
{
QgsLayerTreeNode* parentNode = currentNode->parent();
if (QgsLayerTree::isGroup(parentNode))
parentGroup = QgsLayerTree::toGroup(parentNode);
if ( QgsLayerTree::isGroup( parentNode ) )
parentGroup = QgsLayerTree::toGroup( parentNode );
}

index = current.row();
}

QgsProject::instance()->layerTreeRegistryBridge()->setLayerInsertionPoint(parentGroup, index);
QgsProject::instance()->layerTreeRegistryBridge()->setLayerInsertionPoint( parentGroup, index );
}


Expand Down Expand Up @@ -4047,7 +4047,7 @@ void QgisApp::addAllToOverview()
if ( mLayerTreeView )
{
foreach ( QgsLayerTreeLayer* nodeL, mLayerTreeView->layerTreeModel()->rootGroup()->findLayers() )
nodeL->setCustomProperty("overview", 1);
nodeL->setCustomProperty( "overview", 1 );
}

markDirty();
Expand All @@ -4059,7 +4059,7 @@ void QgisApp::removeAllFromOverview()
if ( mLayerTreeView )
{
foreach ( QgsLayerTreeLayer* nodeL, mLayerTreeView->layerTreeModel()->rootGroup()->findLayers() )
nodeL->setCustomProperty("overview", 0);
nodeL->setCustomProperty( "overview", 0 );
}

markDirty();
Expand Down Expand Up @@ -6545,7 +6545,7 @@ void QgisApp::removeLayer()
return;
}

QList<QgsLayerTreeNode*> selectedNodes = mLayerTreeView->selectedNodes(true);
QList<QgsLayerTreeNode*> selectedNodes = mLayerTreeView->selectedNodes( true );

//validate selection
if ( selectedNodes.isEmpty() )
Expand All @@ -6563,11 +6563,11 @@ void QgisApp::removeLayer()
return;
}

foreach (QgsLayerTreeNode* node, selectedNodes)
foreach ( QgsLayerTreeNode* node, selectedNodes )
{
QgsLayerTreeGroup* parentGroup = qobject_cast<QgsLayerTreeGroup*>(node->parent());
if (parentGroup)
parentGroup->removeChildNode(node);
QgsLayerTreeGroup* parentGroup = qobject_cast<QgsLayerTreeGroup*>( node->parent() );
if ( parentGroup )
parentGroup->removeChildNode( node );
}

showStatusMessage( tr( "%n legend entries removed.", "number of removed legend entries", selectedNodes.count() ) );
Expand Down Expand Up @@ -6657,19 +6657,19 @@ void QgisApp::duplicateLayers( QList<QgsMapLayer *> lyrList )
// add layer to layer registry and legend
QList<QgsMapLayer *> myList;
myList << dupLayer;
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled(false);
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( false );
QgsMapLayerRegistry::instance()->addMapLayers( myList );
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled(true);
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( true );

QgsLayerTreeLayer* nodeSelectedLyr = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer(selectedLyr->id());
Q_ASSERT(nodeSelectedLyr);
Q_ASSERT(QgsLayerTree::isGroup(nodeSelectedLyr->parent()));
QgsLayerTreeGroup* parentGroup = QgsLayerTree::toGroup(nodeSelectedLyr->parent());
QgsLayerTreeLayer* nodeSelectedLyr = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( selectedLyr->id() );
Q_ASSERT( nodeSelectedLyr );
Q_ASSERT( QgsLayerTree::isGroup( nodeSelectedLyr->parent() ) );
QgsLayerTreeGroup* parentGroup = QgsLayerTree::toGroup( nodeSelectedLyr->parent() );

QgsLayerTreeLayer* nodeDupLayer = parentGroup->insertLayer(parentGroup->children().indexOf(nodeSelectedLyr)+1, dupLayer);
QgsLayerTreeLayer* nodeDupLayer = parentGroup->insertLayer( parentGroup->children().indexOf( nodeSelectedLyr ) + 1, dupLayer );

// always set duplicated layers to not visible so layer can be configured before being turned on
nodeDupLayer->setVisible(Qt::Unchecked);
nodeDupLayer->setVisible( Qt::Unchecked );

// duplicate the layer style
copyStyle( selectedLyr );
Expand Down Expand Up @@ -6731,7 +6731,7 @@ void QgisApp::setLayerCRS()
else if ( QgsLayerTree::isLayer( node ) )
{
QgsLayerTreeLayer* nodeLayer = QgsLayerTree::toLayer( node );
if (nodeLayer->layer())
if ( nodeLayer->layer() )
nodeLayer->layer()->setCrs( crs );
}
}
Expand Down Expand Up @@ -7328,7 +7328,7 @@ bool QgisApp::setActiveLayer( QgsMapLayer *layer )
if ( !layer )
return false;

if ( !mLayerTreeView->layerTreeModel()->rootGroup()->findLayer(layer->id()) )
if ( !mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( layer->id() ) )
return false;

mLayerTreeView->setCurrentLayer( layer );
Expand Down
27 changes: 21 additions & 6 deletions src/core/layertree/qgslayertree.h
View file
@@ -1,3 +1,18 @@
/***************************************************************************
qgslayertree.h
--------------------------------------
Date : May 2014
Copyright : (C) 2014 by Martin Dobias
Email : wonder dot sk at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#ifndef QGSLAYERTREE_H
#define QGSLAYERTREE_H

Expand All @@ -7,22 +22,22 @@

namespace QgsLayerTree
{
inline bool isGroup(QgsLayerTreeNode* node)
inline bool isGroup( QgsLayerTreeNode* node )
{
return node && node->nodeType() == QgsLayerTreeNode::NodeGroup;
}
inline bool isLayer(QgsLayerTreeNode* node)
inline bool isLayer( QgsLayerTreeNode* node )
{
return node && node->nodeType() == QgsLayerTreeNode::NodeLayer;
}

inline QgsLayerTreeGroup* toGroup(QgsLayerTreeNode* node)
inline QgsLayerTreeGroup* toGroup( QgsLayerTreeNode* node )
{
return static_cast<QgsLayerTreeGroup*>(node);
return static_cast<QgsLayerTreeGroup*>( node );
}
inline QgsLayerTreeLayer* toLayer(QgsLayerTreeNode* node)
inline QgsLayerTreeLayer* toLayer( QgsLayerTreeNode* node )
{
return static_cast<QgsLayerTreeLayer*>(node);
return static_cast<QgsLayerTreeLayer*>( node );
}

}
Expand Down

0 comments on commit fd8722a

Please sign in to comment.