Skip to content

Commit

Permalink
fix legend
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14523 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Nov 6, 2010
1 parent 3b08e3b commit b5f7006
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 36 deletions.
68 changes: 37 additions & 31 deletions src/app/legend/qgslegend.cpp
View file
Expand Up @@ -48,10 +48,10 @@ static const char *const ident_ = "$Id$";
const int AUTOSCROLL_MARGIN = 16;

QgsLegend::QgsLegend( QgsMapCanvas *canvas, QWidget * parent, const char *name )
: QTreeWidget( parent )
, mMousePressedFlag( false )
, mMapCanvas( canvas )
, mMinimumIconSize( 20, 20 )
: QTreeWidget( parent )
, mMousePressedFlag( false )
, mMapCanvas( canvas )
, mMinimumIconSize( 20, 20 )
{
setObjectName( name );

Expand Down Expand Up @@ -161,7 +161,6 @@ int QgsLegend::addGroup( QString name, bool expand )
else
group = new QgsLegendGroup( this, name );

group->setData( 0, Qt::UserRole, Qt::Checked );
QModelIndex groupIndex = indexFromItem( group );
setExpanded( groupIndex, expand );
setCurrentItem( group );
Expand Down Expand Up @@ -235,7 +234,6 @@ void QgsLegend::removeLayer( QString layerId )
delete ll;
break;
}

}
}

Expand Down Expand Up @@ -280,14 +278,14 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
QgsDebugMsg( "layers prior to move: " + mLayersPriorToMove.join( ", " ) );

// record which items were selected and hide them
foreach( QTreeWidgetItem *item, selectedItems() )
foreach( QTreeWidgetItem * item, selectedItems() )
{
item->setHidden( true );
mItemsBeingMoved << item;
}

// remove and unhide items, whose parent is already to be moved
foreach( QTreeWidgetItem *item, mItemsBeingMoved )
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
{
QTreeWidgetItem *parent = item->parent();

Expand Down Expand Up @@ -423,7 +421,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
hideLine();

// unhide
foreach( QTreeWidgetItem *item, mItemsBeingMoved )
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
{
item->setHidden( false );
}
Expand All @@ -441,7 +439,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )

showItem( "prev sibling", mDropTarget );

foreach( QTreeWidgetItem *item, mItemsBeingMoved )
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
{
moveItem( item, mDropTarget );
mDropTarget = item;
Expand All @@ -468,7 +466,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
{
showItem( "drop after", mDropTarget );

foreach( QTreeWidgetItem *item, mItemsBeingMoved )
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
{
moveItem( item, mDropTarget );
mDropTarget = item;
Expand All @@ -479,7 +477,7 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
{
showItem( "insert into", mDropTarget );

foreach( QTreeWidgetItem *item, mItemsBeingMoved )
foreach( QTreeWidgetItem * item, mItemsBeingMoved )
{
insertItem( item, mDropTarget );
}
Expand Down Expand Up @@ -592,12 +590,10 @@ void QgsLegend::addLayer( QgsMapLayer * layer )
if ( llayer->isVisible() )
{
llayer->setCheckState( 0, Qt::Checked );
llayer->setData( 0, Qt::UserRole, Qt::Checked );
}
else
{
llayer->setCheckState( 0, Qt::Unchecked );
llayer->setData( 0, Qt::UserRole, Qt::Unchecked );
}
blockSignals( false );

Expand Down Expand Up @@ -677,7 +673,7 @@ QList<QgsMapLayer *> QgsLegend::selectedLayers()
{
QList<QgsMapLayer *> layers;

foreach( QTreeWidgetItem *item, selectedItems() )
foreach( QTreeWidgetItem * item, selectedItems() )
{
QgsLegendLayer *ll = dynamic_cast<QgsLegendLayer *>( item );
if ( ll )
Expand Down Expand Up @@ -803,7 +799,7 @@ bool QgsLegend::writeXML( QDomNode &legendnode, QDomDocument &document )

bool QgsLegend::writeXML( QList<QTreeWidgetItem *> items, QDomNode &node, QDomDocument &document )
{
foreach( QTreeWidgetItem *currentItem, items )
foreach( QTreeWidgetItem * currentItem, items )
{
QgsLegendItem *item = dynamic_cast<QgsLegendItem *>( currentItem );
if ( !item )
Expand Down Expand Up @@ -944,17 +940,14 @@ bool QgsLegend::readXML( QgsLegendGroup *parent, const QDomNode &node )
if ( checked == "Qt::Checked" )
{
theGroup->setCheckState( 0, Qt::Checked );
theGroup->setData( 0, Qt::UserRole, Qt::Checked );
}
else if ( checked == "Qt::Unchecked" )
{
theGroup->setCheckState( 0, Qt::Unchecked );
theGroup->setData( 0, Qt::UserRole, Qt::Checked );
}
else if ( checked == "Qt::PartiallyChecked" )
{
theGroup->setCheckState( 0, Qt::PartiallyChecked );
theGroup->setData( 0, Qt::UserRole, Qt::PartiallyChecked );
}
blockSignals( false );

Expand Down Expand Up @@ -1070,13 +1063,11 @@ QgsLegendLayer* QgsLegend::readLayerFromXML( QDomElement& childelem, bool& isOpe
{
ll->setVisible( true );
ll->setCheckState( 0, Qt::Checked );
ll->setData( 0, Qt::UserRole, Qt::Checked );
}
else if ( checked == "Qt::Unchecked" )
{
ll->setVisible( false );
ll->setCheckState( 0, Qt::Unchecked );
ll->setData( 0, Qt::UserRole, Qt::Unchecked );
}
blockSignals( false );

Expand Down Expand Up @@ -1535,13 +1526,22 @@ void QgsLegend::handleItemChange( QTreeWidgetItem* item, int row )
if ( item->data( 0, Qt::UserRole ).toInt() == item->checkState( 0 ) )
return;

saveCheckStates( invisibleRootItem() );

bool renderFlagState = mMapCanvas->renderFlag();
if ( renderFlagState )
mMapCanvas->setRenderFlag( false );

foreach( QTreeWidgetItem *i, selectedItems() )
if ( !item->isSelected() )
{
propagateItemChange( i, item->checkState( 0 ) );
propagateItemChange( item, item->checkState( 0 ) );
}
else
{
foreach( QTreeWidgetItem * i, selectedItems() )
{
propagateItemChange( i, item->checkState( 0 ) );
}
}

// update layer set
Expand All @@ -1553,6 +1553,16 @@ void QgsLegend::handleItemChange( QTreeWidgetItem* item, int row )
mMapCanvas->setRenderFlag( true );
}

void QgsLegend::saveCheckStates( QTreeWidgetItem *item )
{
for ( int i = 0; i < item->childCount(); i++ )
{
QTreeWidgetItem *child = item->child( i );
child->setData( 0, Qt::UserRole, child->checkState( 0 ) );
saveCheckStates( child );
}
}

void QgsLegend::propagateItemChange( QTreeWidgetItem *item, Qt::CheckState state )
{
QgsLegendGroup* lg = dynamic_cast<QgsLegendGroup *>( item ); //item is a legend group
Expand Down Expand Up @@ -1588,17 +1598,14 @@ void QgsLegend::propagateItemChange( QTreeWidgetItem *item, Qt::CheckState state
items << lg->child( i );
}
}

item->setData( 0, Qt::UserRole, state );
}

QgsLegendLayer* ll = dynamic_cast<QgsLegendLayer *>( item ); //item is a legend layer
if ( ll )
{
blockSignals( true );
ll->setCheckState( 0, state );
blockSignals( false );
ll->setData( 0, Qt::UserRole, ll->checkState( 0 ) );

if ( ll->layer() )
{
ll->setVisible( state == Qt::Checked );
Expand All @@ -1608,11 +1615,10 @@ void QgsLegend::propagateItemChange( QTreeWidgetItem *item, Qt::CheckState state
while ( lg )
{
lg->updateCheckState();
lg->setData( 0, Qt::UserRole, lg->checkState( 0 ) );
lg = dynamic_cast<QgsLegendGroup*>( lg->parent() );
}
//update check state of the legend group
item->setData( 0, Qt::UserRole, state );

blockSignals( false );
}
}

Expand Down Expand Up @@ -1820,7 +1826,7 @@ void QgsLegend::removeSelectedLayers()
if ( renderFlagState )
mMapCanvas->setRenderFlag( false );

foreach( QTreeWidgetItem *item, selectedItems() )
foreach( QTreeWidgetItem * item, selectedItems() )
{
QgsLegendGroup* lg = dynamic_cast<QgsLegendGroup *>( item );
if ( lg )
Expand Down
3 changes: 3 additions & 0 deletions src/app/legend/qgslegend.h
View file
Expand Up @@ -419,6 +419,9 @@ class QgsLegend : public QTreeWidget
/**QgsLegend does not set the icon with/height to values lower than the minimum icon size*/
QSize mMinimumIconSize;

/** save item check states */
void saveCheckStates( QTreeWidgetItem *item );

/** structure which holds pixmap which are used in legend */
class QgsLegendPixmaps
{
Expand Down
8 changes: 3 additions & 5 deletions src/app/legend/qgslegendgroup.cpp
View file
Expand Up @@ -25,7 +25,7 @@
#include <QIcon>

QgsLegendGroup::QgsLegendGroup( QTreeWidgetItem * theItem, QString theName )
: QgsLegendItem( theItem, theName )
: QgsLegendItem( theItem, theName )
{
mType = LEGEND_GROUP;
setFlags( Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
Expand All @@ -34,7 +34,7 @@ QgsLegendGroup::QgsLegendGroup( QTreeWidgetItem * theItem, QString theName )
setIcon( 0, myIcon );
}
QgsLegendGroup::QgsLegendGroup( QTreeWidget* theListView, QString theString )
: QgsLegendItem( theListView, theString )
: QgsLegendItem( theListView, theString )
{
mType = LEGEND_GROUP;
setFlags( Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
Expand Down Expand Up @@ -114,7 +114,7 @@ void QgsLegendGroup::updateCheckState()
return;

Qt::CheckState theState = elements[0]->checkState( 0 );
foreach( QgsLegendItem *li, elements )
foreach( QgsLegendItem * li, elements )
{
if ( theState != li->checkState( 0 ) )
{
Expand All @@ -125,8 +125,6 @@ void QgsLegendGroup::updateCheckState()

if ( theState != checkState( 0 ) )
{
treeWidget()->blockSignals( true );
setCheckState( 0, theState );
treeWidget()->blockSignals( false );
}
}

0 comments on commit b5f7006

Please sign in to comment.