improved legend checkbox handling in case of several QgsLegendLayerFi…

…les in one QgsLegendLayer git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4344 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 15, 2005 · bf7d5e2 · bf7d5e2
1 parent 9baf4e6
commit bf7d5e2
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 21 deletions.
diff --git a/src/legend/qgslegend.cpp b/src/legend/qgslegend.cpp
@@ -1287,6 +1287,27 @@ void QgsLegend::handleItemChange(QTreeWidgetItem* item, int row)
 		{
 		  bool checked = (item->checkState(0) == Qt::Checked); 
 		  theLayer->setVisible(checked);
+		  //todo: check, how the checkbox of the legendlayer needs to be updated
+		  QgsLegendLayer* ll = dynamic_cast<QgsLegendLayer*>(item->parent()->parent());
+		  std::list<QgsLegendLayerFile*> llfiles = ll->legendLayerFiles();
+		  std::list<QgsLegendLayerFile*>::iterator iter = llfiles.begin();
+		  Qt::CheckState theState = (*iter)->checkState(0);
+		  for(; iter != llfiles.end(); ++iter)
+		    {
+		      if(theState != (*iter)->checkState(0))
+			{
+			  theState = Qt::PartiallyChecked;
+			  break;
+			}
+		    }
+		  //and update the checkbox of the legendlayer if necessary
+		  if(theState != ll->checkState(0));
+		  {
+		    blockSignals(true);
+		    ll->setCheckState(0, theState);
+		    mStateOfCheckBoxes[ll] = theState;
+		    blockSignals(false);
+		  }
 		}
 	      mStateOfCheckBoxes[item] = item->checkState(0);
 	    }
@@ -1300,22 +1321,31 @@ void QgsLegend::handleItemChange(QTreeWidgetItem* item, int row)
 #ifdef QGISDEBUG
       qWarning("item is a QgsLegendLayer");
 #endif
-      bool checked = (item->checkState(0) == Qt::Checked); 
-      std::list<QgsLegendLayerFile*> llflist = ll->legendLayerFiles();
-      mMapCanvas->setRenderFlag(false);
-      for(std::list<QgsLegendLayerFile*>::iterator it = llflist.begin(); it != llflist.end(); ++it)
+      std::map<QTreeWidgetItem*, Qt::CheckState>::iterator it = mStateOfCheckBoxes.find(item);
+      if(it != mStateOfCheckBoxes.end())
 	{
-	  if(checked)
-	    {
-	      (*it)->setCheckState(0, Qt::Checked);
-	    }
-	  else
+	  if(it->second != item->checkState(0)) //the checkState has changed
 	    {
-	      (*it)->setCheckState(0, Qt::Unchecked);
+	      bool checked = (item->checkState(0) == Qt::Checked); 
+	      std::list<QgsLegendLayerFile*> llflist = ll->legendLayerFiles();
+	      mMapCanvas->setRenderFlag(false);
+	      //go through all the legendlayerfiles and set their checkState
+	      for(std::list<QgsLegendLayerFile*>::iterator it = llflist.begin(); it != llflist.end(); ++it)
+		{
+		  if(checked)
+		    {
+		      (*it)->setCheckState(0, Qt::Checked);
+		      mStateOfCheckBoxes[(*it)] = Qt::Checked;
+		    }
+		  else
+		    {
+		      (*it)->setCheckState(0, Qt::Unchecked);
+		      mStateOfCheckBoxes[(*it)] = Qt::Unchecked;
+		    }
+		}
 	    }
 	}
       mMapCanvas->setRenderFlag(true);
-
     }
 }
 

diff --git a/src/legend/qgslegendgroup.cpp b/src/legend/qgslegendgroup.cpp
@@ -30,7 +30,7 @@ QgsLegendGroup::QgsLegendGroup(QTreeWidgetItem * theItem ,QString theName)
 #else
   QString pkgDataPath(PKGDATAPATH);
 #endif
-  setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled);
+  setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
   QIcon myIcon(pkgDataPath+QString("/images/icons/folder.png"));
   setIcon(0, myIcon);
 }
@@ -43,7 +43,7 @@ QgsLegendGroup::QgsLegendGroup(QTreeWidget* theListView, QString theString)
 #else
   QString pkgDataPath(PKGDATAPATH);
 #endif
-  setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled);
+  setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
   QIcon myIcon(pkgDataPath+QString("/images/icons/folder.png"));
   setIcon(0, myIcon);
 }

diff --git a/src/legend/qgslegenditem.cpp b/src/legend/qgslegenditem.cpp
@@ -32,9 +32,7 @@ QgsLegendItem::QgsLegendItem(QTreeWidgetItem * theItem ,QString theName)
 #else
   QString pkgDataPath(PKGDATAPATH);
 #endif
-  QIcon myIcon(pkgDataPath+QString("/images/icons/group.png"));
   setText(0, theName);
-  setIcon(0,myIcon);
 }
 
 QgsLegendItem::QgsLegendItem(QTreeWidget* theListView,QString theString)
@@ -45,9 +43,7 @@ QgsLegendItem::QgsLegendItem(QTreeWidget* theListView,QString theString)
 #else
   QString pkgDataPath(PKGDATAPATH);
 #endif
-  QIcon myIcon(pkgDataPath+QString("/images/icons/group.png"));
   setText(0, theString);
-  setIcon(0,myIcon);
 }
 
 QgsLegendItem::QgsLegendItem(): QTreeWidgetItem()

diff --git a/src/legend/qgslegendlayer.cpp b/src/legend/qgslegendlayer.cpp
@@ -33,7 +33,7 @@ QgsLegendLayer::QgsLegendLayer(QTreeWidgetItem* parent,QString name)
 #else
     QString pkgDataPath(PKGDATAPATH);
 #endif
-    setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+    setFlags(Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
     QIcon myIcon(pkgDataPath+QString("/images/icons/layer.png"));
     setCheckState (0, Qt::Checked);
     setText(0, name);
@@ -48,7 +48,7 @@ QgsLegendLayer::QgsLegendLayer(QTreeWidget* parent, QString name): QObject(), Qg
 #else
     QString pkgDataPath(PKGDATAPATH);
 #endif
-    setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+    setFlags(Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
     setCheckState (0, Qt::Checked);
     QIcon myIcon(pkgDataPath+QString("/images/icons/layer.png"));
     setText(0, name);
@@ -63,7 +63,7 @@ QgsLegendLayer::QgsLegendLayer(QString name): QObject(), QgsLegendItem()
 #else
     QString pkgDataPath(PKGDATAPATH);
 #endif
-    setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+    setFlags(Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
     setCheckState (0, Qt::Checked);
     QIcon myIcon(pkgDataPath+QString("/images/icons/layer.png"));
     setText(0, name);

diff --git a/src/legend/qgslegendlayerfile.cpp b/src/legend/qgslegendlayerfile.cpp
@@ -42,7 +42,7 @@ QgsLegendLayerFile::QgsLegendLayerFile(QTreeWidgetItem * theLegendItem, QString
       p.drawPixmap(0,0,inOverviewPixmap);
   }
   QIcon originalIcon(originalPixmap);
-  setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+  setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
   setCheckState (0, Qt::Checked );
   setText(0, theString);
   setIcon(0, originalIcon);