bugfixes for the legend

git-svn-id: http://svn.osgeo.org/qgis/trunk@3947 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 21, 2005 · 9dce781 · 9dce781
1 parent 739871f
commit 9dce781
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/qgis.dtd b/qgis.dtd
@@ -111,3 +111,26 @@ outlinecolor,outlinestyle,outlinewidth,fillcolor,fillpattern) >
 <!ATTLIST invertHistogramFlag boolean (1|0|true|false) "false">
 <!ATTLIST stdDevsToPlotDouble value CDATA "0">
 <!ATTLIST transparencyLevelInt value CDATA "0">
+
+<!--
+  --  Legend
+  --
+  -->
+
+<!ELEMENT legend (legendgroup* | legendlayer*) >
+<!ATTLIST legend open (1|0|true|false) "false"> #open or closed
+<!ELEMENT legendgroup>
+<!ATTLIST legendgroup open (1|0|true|false) "false"> #open or closed
+<!ELEMENT legendlayer>
+<!ATTLIST legendlayer open (1|0|true|false) "false"> #open or closed
+<!ELEMENT legendlayerfilegroup>
+<!ATTLIST legendlayerfile open (1|0|true|false) "false"> #open or closed
+<!ELEMENT legendlayerfile>
+<!ATTLIST legendlayerfile open (1|0|true|false) "false"> #open or closed
+<!ELEMENT legendsymbologygroup>
+<!ATTLIST legendsymbologygroup open (1|0|true|false) "false"> #open or closed
+<!ELEMENT legendsymbologyitem>
+<!ATTLIST legendsymbologyitem open (1|0|true|false) "false"> #open or closed
+<!ELEMENT legenpropertygroup>
+<!ATTLIST legendpropertygroup open (1|0|true|false) "false"> #open or closed
+
diff --git a/src/legend/qgslegend.cpp b/src/legend/qgslegend.cpp
@@ -98,8 +98,9 @@ void QgsLegend::updateLegendItem( QListViewItem * li )
 
 void QgsLegend::removeAll()
 {
-  clear();
-} // QgsLegend::removeAll()
+    mCheckBoxes.clear();
+    clear();
+}
 
 void QgsLegend::removeLayer(QString layer_key)
 {
@@ -220,6 +221,11 @@ void QgsLegend::contentsMouseReleaseEvent(QMouseEvent * e)
       QgsLegendItem* origin = dynamic_cast<QgsLegendItem*>(mItemBeingMoved);
       QgsLegendItem* dest = dynamic_cast<QgsLegendItem*>(destItem);
 
+      if(!dest || !origin)
+      {
+	  return;
+      }
+
       QgsLegendItem::DRAG_ACTION daction= dest->accept(origin->type());
 
       if (dest && origin && (origin != dest))
@@ -379,8 +385,6 @@ int QgsLegend::getItemPos(QListViewItem * item)
 
 void QgsLegend::addLayer( QgsMapLayer * layer )
 {
-    //QgsLegendGroup * lgroup = new QgsLegendGroup(this,QString("Layer Group"));
-    //lgroup->setRenameEnabled(0, true);
     QgsLegendLayer * llayer = new QgsLegendLayer(/*lgroup*/this,QString(layer->name()));
     llayer->setRenameEnabled(0, true);
     QgsLegendPropertyGroup * lpgroup = new QgsLegendPropertyGroup(llayer,QString("Properties"));
@@ -403,7 +407,6 @@ void QgsLegend::addLayer( QgsMapLayer * layer )
     layer->setLegendLayerFile(llfile);
     layer->initContextMenu(mApp);
 
-    /*lgroup->setOpen(true);*/
     llayer->setOpen(false);
     lpgroup->setOpen(false);
     lsgroup->setOpen(false); 

diff --git a/src/qgsmapcanvas.cpp b/src/qgsmapcanvas.cpp
@@ -1793,15 +1793,7 @@ void QgsMapCanvas::mouseReleaseEvent(QMouseEvent * e)
           QgsPoint endpoint = mCanvasProperties->coordXForm->transform(digitisedpoint.x(),digitisedpoint.y());
           paint.drawLine(static_cast<int>(lastpoint.x()),static_cast<int>(lastpoint.y()),
             static_cast<int>(endpoint.x()),static_cast<int>(endpoint.y()));
-          //draw it to an acetate layer
-          QgsLine digitline(*it,digitisedpoint);
-          QgsAcetateLines* acetate=new QgsAcetateLines();
-          acetate->add(digitline);
-          addAcetateObject(vlayer->name()+"_##digit##ac"+QString::number(mCaptureList.size()),acetate);
-  #ifdef QGISDEBUG
-          qWarning("adding "+vlayer->name()+"_##digit##ac"+QString::number(mCaptureList.size()));
-  #endif
-
+          repaint();
         }
 
         if (e->button() == Qt::RightButton)