sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes for the legend

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3947 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mhugent 2005-09-21 16:18:48 +00:00
parent 582fad1d2e
commit 409e1a7c2c
3 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qgis.dtd
View File

@ -111,3 +111,26 @@ outlinecolor,outlinestyle,outlinewidth,fillcolor,fillpattern) >
<!ATTLIST invertHistogramFlag boolean (1|0|true|false) "false"> <!ATTLIST invertHistogramFlag boolean (1|0|true|false) "false">
<!ATTLIST stdDevsToPlotDouble value CDATA "0"> <!ATTLIST stdDevsToPlotDouble value CDATA "0">
<!ATTLIST transparencyLevelInt 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

13
src/legend/qgslegend.cpp
View File

@ -98,8 +98,9 @@ void QgsLegend::updateLegendItem( QListViewItem * li )
void QgsLegend::removeAll() void QgsLegend::removeAll()
{ {
clear(); mCheckBoxes.clear();
} // QgsLegend::removeAll() clear();
}
void QgsLegend::removeLayer(QString layer_key) void QgsLegend::removeLayer(QString layer_key)
{ {
@ -220,6 +221,11 @@ void QgsLegend::contentsMouseReleaseEvent(QMouseEvent * e)
QgsLegendItem* origin = dynamic_cast<QgsLegendItem*>(mItemBeingMoved); QgsLegendItem* origin = dynamic_cast<QgsLegendItem*>(mItemBeingMoved);
QgsLegendItem* dest = dynamic_cast<QgsLegendItem*>(destItem); QgsLegendItem* dest = dynamic_cast<QgsLegendItem*>(destItem);
if(!dest || !origin)
{
return;
}
QgsLegendItem::DRAG_ACTION daction= dest->accept(origin->type()); QgsLegendItem::DRAG_ACTION daction= dest->accept(origin->type());
if (dest && origin && (origin != dest)) if (dest && origin && (origin != dest))
@ -379,8 +385,6 @@ int QgsLegend::getItemPos(QListViewItem * item)
void QgsLegend::addLayer( QgsMapLayer * layer ) 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())); QgsLegendLayer * llayer = new QgsLegendLayer(/*lgroup*/this,QString(layer->name()));
llayer->setRenameEnabled(0, true); llayer->setRenameEnabled(0, true);
QgsLegendPropertyGroup * lpgroup = new QgsLegendPropertyGroup(llayer,QString("Properties")); QgsLegendPropertyGroup * lpgroup = new QgsLegendPropertyGroup(llayer,QString("Properties"));
@ -403,7 +407,6 @@ void QgsLegend::addLayer( QgsMapLayer * layer )
layer->setLegendLayerFile(llfile); layer->setLegendLayerFile(llfile);
layer->initContextMenu(mApp); layer->initContextMenu(mApp);
/*lgroup->setOpen(true);*/
llayer->setOpen(false); llayer->setOpen(false);
lpgroup->setOpen(false); lpgroup->setOpen(false);
lsgroup->setOpen(false); lsgroup->setOpen(false);

10
src/qgsmapcanvas.cpp
View File

@ -1793,15 +1793,7 @@ void QgsMapCanvas::mouseReleaseEvent(QMouseEvent * e)
QgsPoint endpoint = mCanvasProperties->coordXForm->transform(digitisedpoint.x(),digitisedpoint.y()); QgsPoint endpoint = mCanvasProperties->coordXForm->transform(digitisedpoint.x(),digitisedpoint.y());
paint.drawLine(static_cast<int>(lastpoint.x()),static_cast<int>(lastpoint.y()), paint.drawLine(static_cast<int>(lastpoint.x()),static_cast<int>(lastpoint.y()),
static_cast<int>(endpoint.x()),static_cast<int>(endpoint.y())); static_cast<int>(endpoint.x()),static_cast<int>(endpoint.y()));
//draw it to an acetate layer repaint();
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
} }
if (e->button() == Qt::RightButton) if (e->button() == Qt::RightButton)