Branch for 0.9.0 release

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_9_0@7220 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 24, 2007 · b41ce99 · b41ce99
2 parents 251bf75 + 5060577
commit b41ce99
Show file tree

Hide file tree

Showing 190 changed files with 1,816 additions and 7,150 deletions.
diff --git a/debian/control b/debian/control
@@ -3,11 +3,11 @@ Section: science
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie@debian.org>
-Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libpq-dev, 
+Build-Depends: debhelper (>= 5.0.0), libgdal1-dev | libgdal1-1.3.2-dev , libpq-dev, 
  libgeos-dev (>= 2.0.1-1), dpatch, grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
  flex, bison, python-dev, cmake (>=2.4.3) , python-sip4-dev, python-qt4-dev,
- sharutils, sip4 (>= 4.7), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
- libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.2.0), python-qt4-dev (>=4.2.0)
+ sharutils, sip4 (>= 4.4), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.0.0), python-qt4-dev (>=4.0.0)
 Standards-Version: 3.7.2
 
 Package: qgis
@@ -43,7 +43,7 @@ Description: QGIS Geographic Information System - shared library
 
 Package: libqgis1-dev
 Architecture: any
-Depends: qgis (= ${Source-Version}), libgdal1-dev, libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.2.0), python-qt4-dev (>=4.2.0), qt4-designer (>=4.2.0)
+Depends: qgis (= ${Source-Version}), libgdal1-dev | libgdal1-1.3.2-dev , libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.0.0), python-qt4-dev (>=4.0.0), qt4-designer (>=4.2.0)
 Provides: libqgis-dev
 Conflicts: libqgis-dev, qgis-dev
 Replaces: qgis-dev
@@ -60,7 +60,7 @@ Description: QGIS Geographic Information System - development files
 
 Package: qgis-plugin-grass
 Architecture: any
-Depends: qgis (= ${Source-Version}), libgdal1-1.4.0-grass
+Depends: qgis (= ${Source-Version}), libgdal1-1.4.0-grass | libgdal1-1.3.2-grass
 Description: Plugin for accessing GRASS data from QGIS
  This plugin enables a GRASS data access toolbox in the QGIS
  geographic data viewer.

diff --git a/debian/libqgis1.substvars b/debian/libqgis1.substvars
diff --git a/debian/qgis-plugin-grass.substvars b/debian/qgis-plugin-grass.substvars
diff --git a/debian/qgis.substvars b/debian/qgis.substvars
diff --git a/debian/rules b/debian/rules
@@ -29,7 +29,10 @@ CMakeCache.txt: CMakeLists.txt
 	dh_testdir
 	# Add here commands to configure the package.
 	uudecode -o $(CURDIR)/src/plugins/georeferencer/pencil.png $(CURDIR)/debian/pencil.uu
-	cmake -D CMAKE_INSTALL_PREFIX=/usr -D GDAL_INCLUDE_DIR=/usr/include/gdal .
+	cmake -D CMAKE_INSTALL_PREFIX=/usr \
+        -D GDAL_INCLUDE_DIR=/usr/include/gdal \
+        -D GDAL_LIBRARY=/usr/lib/libgdal1.3.2.so \
+        .
 
 build: patch build-stamp
 

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -674,7 +674,7 @@ void QgsComposer::on_mActionExportAsImage_activated(void)
 
   //find out the last used filter
   QSettings myQSettings;  // where we keep last used filter in persistant state
-  QString myLastUsedFormat = myQSettings.readEntry("/UI/lastSaveAsImageFormat", "PNG" ); //<- BUG #729 is probably here
+  QString myLastUsedFormat = myQSettings.readEntry("/UI/lastSaveAsImageFormat", "png" );
   QString myLastUsedFile = myQSettings.readEntry("/UI/lastSaveAsImageFile","qgis.png");
   QFileInfo file(myLastUsedFile);
 
@@ -686,6 +686,7 @@ void QgsComposer::on_mActionExportAsImage_activated(void)
   {
     QString myFormat=QString(QImageWriter::supportedImageFormats().at( myCounterInt ));
     QString myFilter = myFormat + " " + tr("format") + " (*." + myFormat.lower() + " *." + myFormat.upper() + ")";
+
     if ( myCounterInt > 0 ) myFilters += ";;";
     myFilters += myFilter;
     myFilterMap[myFilter] = myFormat;

diff --git a/src/app/composer/qgscomposermap.cpp b/src/app/composer/qgscomposermap.cpp
@@ -32,8 +32,10 @@
 #include <cmath>
 
 QgsComposerMap::QgsComposerMap ( QgsComposition *composition, int id, int x, int y, int width, int height )
-    : QWidget(), QGraphicsRectItem(x,y,width,height,0)
+    : QWidget(), QGraphicsRectItem(0,0,width,height,0)
 {
+std::cout << "QgsComposerMap::QgsComposerMap()" << std::endl;
+
     setupUi(this);
 
     mComposition = composition;
@@ -47,6 +49,7 @@ QgsComposerMap::QgsComposerMap ( QgsComposition *composition, int id, int x, int
     // Add to scene
     mComposition->canvas()->addItem(this);
 
+    QGraphicsRectItem::setPos(x, y);
     QGraphicsRectItem::show();
 
     writeSettings();

diff --git a/src/app/composer/qgscomposervectorlegend.cpp b/src/app/composer/qgscomposervectorlegend.cpp
@@ -48,7 +48,10 @@ QgsComposerVectorLegend::QgsComposerVectorLegend ( QgsComposition *composition,
 
   init();
 
-  // Font and pen 
+  // Font and pen
+  if(fontSize < 6){
+    fontSize = 6;
+  }
   mFont.setPointSize ( fontSize );
 
   // Set map to the first available if any
@@ -160,6 +163,7 @@ QRectF QgsComposerVectorLegend::render ( QPainter *p )
   }
 
   std::cout << "mComposition->scale() = " << mComposition->scale() << std::endl;
+
   // Font size in canvas units
   float titleSize = 25.4 * mComposition->scale() * mTitleFont.pointSizeFloat() / 72;
   float sectionSize = 25.4 * mComposition->scale() * mSectionFont.pointSizeFloat() / 72;
@@ -393,7 +397,7 @@ std::cout << "widthScale: " << widthScale << std::endl;
             painter->drawLine ( mMargin, localHeight+mSymbolHeight/2, 
                                 mMargin+mSymbolWidth, localHeight+mSymbolHeight/2 );
           } else if ( vector->vectorType() == QGis::Polygon ) {
-            pen.setWidth(0); //use a cosmetic pen to outline the fill box
+            //pen.setWidth(0); //use a cosmetic pen to outline the fill box
             pen.setCapStyle(Qt::FlatCap);
             painter->setPen ( pen );
             painter->drawRect ( mMargin, localHeight, mSymbolWidth, mSymbolHeight );

diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -1356,6 +1356,22 @@ void QgsLegend::updateOverview()
   mMapCanvas->updateOverview();
 }
 
+void QgsLegend::setOverviewAllLayers(bool inOverview)
+{
+  QTreeWidgetItem* theItem = firstItem();
+  while(theItem)
+    {
+      QgsLegendLayerFile* llf = dynamic_cast<QgsLegendLayerFile*>(theItem);
+      if(llf)
+	{
+	  llf->setInOverview(inOverview);
+	}
+      theItem = nextItem(theItem);
+    }
+  updateMapCanvasLayerSet();
+  updateOverview();
+}
+
 std::deque<QString> QgsLegend::layerIDs()
 {
   std::deque<QString> layers;

diff --git a/src/app/legend/qgslegend.h b/src/app/legend/qgslegend.h
@@ -147,6 +147,9 @@ class QgsLegend : public QTreeWidget
   /**Updates overview*/
   void updateOverview();
 
+  /**Show/remove all layer in/from overview*/
+  void setOverviewAllLayers(bool inOverview);
+
   /**Adds an entry to mPixmapWidthValues*/
   void addPixmapWidthValue(int width);
 

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2355,7 +2355,7 @@ findMissingFile_( QString const & fileFilters, QDomNode & layerNode )
 
   QStringList selectedFiles;
   QString     enc;
-  QString     title( QObject::trUtf8("Open an OGR Supported Layer") );
+  QString     title( QObject::tr("Where is '") + originalDataSource.fileName() + "'? (" + QObject::tr("original location: ") + originalDataSource.absoluteFilePath() + ")");
 
   openFilesRememberingFilter_(memoryQualifier,
       myFileFilters, 
@@ -3219,40 +3219,26 @@ void QgisApp::saveMapAsImage(QString theImageFileNameQString, QPixmap * theQPixm
 //reimplements method from base (gui) class
 void QgisApp::addAllToOverview()
 {
-  // TODO: move to legend
-  /*
-  std::map<QString, QgsMapLayer *> myMapLayers = QgsMapLayerRegistry::instance()->mapLayers();
-  std::map<QString, QgsMapLayer *>::iterator myMapIterator;
-  for ( myMapIterator = myMapLayers.begin(); myMapIterator != myMapLayers.end(); ++myMapIterator )
-  {
-    QgsMapLayer * myMapLayer = myMapIterator->second;
-    myMapLayer->inOverview(true); // won't do anything if already in overview
-  }
-  mMapCanvas->updateOverview();
-  
+  if(mMapLegend)
+    {
+      mMapLegend->setOverviewAllLayers(true);
+    }
+
   // notify the project we've made a change
   QgsProject::instance()->dirty(true);
-  */
 }
 
 //reimplements method from base (gui) class
 void QgisApp::removeAllFromOverview()
 {
-  // TODO: move to legend
-  /*
-  std::map<QString, QgsMapLayer *> myMapLayers = QgsMapLayerRegistry::instance()->mapLayers();
-  std::map<QString, QgsMapLayer *>::iterator myMapIterator;
-  for ( myMapIterator = myMapLayers.begin(); myMapIterator != myMapLayers.end(); ++myMapIterator )
-  {
-    QgsMapLayer * myMapLayer = myMapIterator->second;
-    myMapLayer->inOverview(false);
-  }
-  mMapCanvas->updateOverview();
-  
+  if(mMapLegend)
+    {
+      mMapLegend->setOverviewAllLayers(false);
+    }
+
   // notify the project we've made a change
   QgsProject::instance()->dirty(true);
-  */
-} // QgisApp::removeAllFromOverview()
+}
 
 
 //reimplements method from base (gui) class

diff --git a/src/app/qgsattributetable.cpp b/src/app/qgsattributetable.cpp
@@ -426,10 +426,29 @@ bool QgsAttributeTable::commitChanges(QgsVectorLayer* layer)
 	  {
 	    deletedIds.insert(provider->indexFromFieldName(*it));
 	  }
+
+	QgsChangedAttributesMap attributeChanges; //convert mChangedValues to QgsChangedAttributesMap
+	int fieldIndex;
+
+	QMap<int, QMap<QString, QString> >::const_iterator att_it = mChangedValues.constBegin();
+	for(; att_it != mChangedValues.constEnd(); ++att_it)
+	  {
+	    QgsAttributeMap newAttMap;
+	    QMap<QString, QString>::const_iterator record_it = att_it->constBegin();
+	    for(; record_it != att_it->constEnd(); ++record_it)
+	      {
+		fieldIndex = provider->indexFromFieldName(record_it.key());
+		if(fieldIndex != -1)
+		  {
+		    newAttMap.insert(fieldIndex, record_it.value());
+		  }
+	      }
+	    attributeChanges.insert(att_it.key(), newAttMap);
+	  } 
 
 	isSuccessful = layer->commitAttributeChanges(deletedIds,
 						     mAddedAttributes,
-						     mChangedValues);
+						     attributeChanges);
       }
   }
 
@@ -528,52 +547,23 @@ void QgsAttributeTable::putFeatureInTable(int row, QgsFeature& fet)
   }
 }
 
-int QgsAttributeTable::colIndexFromFieldIndex(int fieldId)
-{
-  int colIndex = 1; // index 0 is feature ID
-  QgsFieldMap::const_iterator it;
-  for (it = mFields.begin(); it != mFields.end(); ++it, ++colIndex)
-  {
-    if (it.key() == fieldId)
-      return colIndex;
-  }
-  return -1;
-}
-
-int QgsAttributeTable::fieldIndexFromColIndex(int colIndex)
-{
-  colIndex--; // first one is feature ID
-  QgsFieldMap::const_iterator it;
-  for (it = mFields.begin(); it != mFields.end(); ++it, --colIndex)
-  {
-    if (colIndex == 0)
-      return it.key();
-  }
-  return -1;
-}
-
 void QgsAttributeTable::storeChangedValue(int row, int column)
 {
-    //id column is not editable
-    if(column>0)
+  //id column is not editable
+  if(column>0)
     {
-	//find feature id
-	int id=text(row,0).toInt();
-	int field = fieldIndexFromColIndex(column);
-
-  QgsDebugMsg("feature id: " + QString::number(id));
-  QgsDebugMsg("attribute: " + QString::number(field) + ": " + mFields[field].name());
-
-  // add empty map for feature if doesn't exist
-  if (!mChangedValues.contains(id))
-  {
-    mChangedValues.insert(id, QgsAttributeMap());
-  }
-
-  mChangedValues[id].insert(field, QVariant(text(row,column)) );
-
-	QgsDebugMsg("value: " + text(row,column));
-	mEdited=true;
+      //find feature id
+      int id=text(row,0).toInt();
+      QString field = horizontalHeader()->label(column);
+
+      // add empty map for feature if doesn't exist
+      if (!mChangedValues.contains(id))
+	{
+	  mChangedValues.insert(id, QMap<QString, QString>());
+	}
+
+      mChangedValues[id].insert(field, text(row,column));
+      mEdited=true;
     }
 }
 

diff --git a/src/app/qgsattributetable.h b/src/app/qgsattributetable.h
@@ -133,7 +133,8 @@ class QgsAttributeTable:public Q3Table
     QSet<QString> mDeletedAttributes;
     /**Nested map containing the changed attribute values. The int is the feature id, 
       the first QString the attribute name and the second QString the new value*/
-    QgsChangedAttributesMap mChangedValues;
+    QMap<int, QMap<QString, QString> > mChangedValues;
+
     /**Stors the numbers of the last selected rows. This is used to check for selection changes before emit repaintRequested()*/
     std::set<int> mLastSelectedRows;
 
@@ -154,11 +155,6 @@ class QgsAttributeTable:public Q3Table
     /**This function compares the current selection and the selection of the last repaint. Returns true if there are differences in the selection.
      Also, mLastSelectedRows is updated*/
     bool checkSelectionChanges();
-
-    /** returns column index for field index or -1 on invalid field index */
-    int colIndexFromFieldIndex(int fieldId);
-    /** returns field index for a column or -1 when on invalid column */
-    int fieldIndexFromColIndex(int colIndex);
 
 signals:
 

diff --git a/src/app/qgscustomprojectiondialog.cpp b/src/app/qgscustomprojectiondialog.cpp
@@ -1,14 +1,21 @@
-//
-// C++ Implementation: qgscustomprojectiondialog
-//
-// Description: 
-//
-//
-// Author: Tim Sutton tim@linfiniti.com, (C) 2005
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/***************************************************************************
+                          qgscustomprojectiondialog.cpp 
+                       
+                             -------------------
+    begin                : 2005
+    copyright            : (C) 2005 by Tim Sutton
+    email                : tim@linfiniti.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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "qgscustomprojectiondialog.h"
 
 //qgis includes

diff --git a/src/app/qgscustomprojectiondialog.h b/src/app/qgscustomprojectiondialog.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: qgscustomprojectiondialog
-//
-// Description: 
-//
-//
-// Author: Tim Sutton tim@linfiniti.com, (C) 2005
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/***************************************************************************
+                          qgscustomprojectiondialog.h 
+                       
+                             -------------------
+    begin                : 2005
+    copyright            : (C) 2005 by Tim Sutton
+    email                : tim@linfiniti.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 QGSCUSTOMPROJECTIONDIALOG_H
 #define QGSCUSTOMPROJECTIONDIALOG_H