[QGIS Commit] r10236 - in trunk/qgis: python python/core python/gui
src/app src/app/composer src/core/composer src/gui
src/plugins src/plugins/interpolation src/providers
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Feb 25 14:15:23 EST 2009
Author: mhugent
Date: 2009-02-25 14:15:23 -0500 (Wed, 25 Feb 2009)
New Revision: 10236
Modified:
trunk/qgis/python/configure.py.in
trunk/qgis/python/core/core.sip
trunk/qgis/python/gui/gui.sip
trunk/qgis/python/gui/qgisinterface.sip
trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp
trunk/qgis/src/app/qgisapp.h
trunk/qgis/src/app/qgisappinterface.cpp
trunk/qgis/src/app/qgisappinterface.h
trunk/qgis/src/core/composer/qgscomposermap.h
trunk/qgis/src/gui/qgisinterface.h
trunk/qgis/src/plugins/CMakeLists.txt
trunk/qgis/src/plugins/interpolation/qgsinterpolator.cpp
trunk/qgis/src/providers/CMakeLists.txt
Log:
saver string list handling
Modified: trunk/qgis/python/configure.py.in
===================================================================
--- trunk/qgis/python/configure.py.in 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/python/configure.py.in 2009-02-25 19:15:23 UTC (rev 10236)
@@ -136,7 +136,7 @@
mk.extra_lib_dirs.append(geos_library_path)
if gdal_library_path!="":
mk.extra_lib_dirs.append(gdal_library_path)
- mk.extra_include_dirs = [src_path+"/src/core",
+ mk.extra_include_dirs = [src_path+"/src/core", src_path+"/src/core/composer",
src_path+"/src/core/raster",
src_path+"/src/core/renderer",
src_path+"/src/core/spatialindex",
Modified: trunk/qgis/python/core/core.sip
===================================================================
--- trunk/qgis/python/core/core.sip 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/python/core/core.sip 2009-02-25 19:15:23 UTC (rev 10236)
@@ -11,6 +11,13 @@
%Include qgis.sip
%Include qgsapplication.sip
+%Include qgscomposeritem.sip
+%Include qgscomposerlabel.sip
+%Include qgscomposerlegend.sip
+%Include qgscomposermap.sip
+%Include qgscomposerpicture.sip
+%Include qgscomposerscalebar.sip
+%Include qgscomposition.sip
%Include qgscontexthelp.sip
%Include qgscontinuouscolorrenderer.sip
%Include qgscontrastenhancement.sip
@@ -25,6 +32,7 @@
%Include qgsgraduatedsymbolrenderer.sip
%Include qgslabel.sip
%Include qgslabelattributes.sip
+%Include qgslegendmodel.sip
%Include qgslogger.sip
%Include qgsmaplayer.sip
%Include qgsmaplayerregistry.sip
@@ -32,6 +40,7 @@
%Include qgsmaptopixel.sip
%Include qgsmarkercatalogue.sip
%Include qgsmessageoutput.sip
+%Include qgspaperitem.sip
%Include qgspoint.sip
%Include qgsproject.sip
%Include qgsprovidermetadata.sip
@@ -47,6 +56,7 @@
%Include qgsrect.sip
%Include qgsrendercontext.sip
%Include qgsrenderer.sip
+%Include qgsscalebarstyle.sip
%Include qgsscalecalculator.sip
%Include qgssinglesymbolrenderer.sip
%Include qgssnapper.sip
Modified: trunk/qgis/python/gui/gui.sip
===================================================================
--- trunk/qgis/python/gui/gui.sip 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/python/gui/gui.sip 2009-02-25 19:15:23 UTC (rev 10236)
@@ -7,8 +7,8 @@
%Import core/core.sip
-
%Include qgisinterface.sip
+%Include qgscomposerview.sip
%Include qgsencodingfiledialog.sip
%Include qgsgenericprojectionselector.sip
%Include qgsmapcanvas.sip
Modified: trunk/qgis/python/gui/qgisinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgisinterface.sip 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/python/gui/qgisinterface.sip 2009-02-25 19:15:23 UTC (rev 10236)
@@ -73,6 +73,11 @@
/** Return a pointer to the main window (instance of QgisApp in case of QGIS) */
virtual QWidget * mainWindow()=0;
+ /** Return pointers to the composer views of the running instance (currently only one)*/
+ //virtual QList<QgsComposerView*> composerViews()=0;
+
+ virtual QList< QPair<QMainWindow*, QgsComposerView*> > composerList() = 0;
+
/** Add action to the plugins menu */
virtual void addPluginToMenu(QString name, QAction* action)=0;
/** Remove action from the plugins menu */
Modified: trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp 2009-02-25 19:15:23 UTC (rev 10236)
@@ -103,7 +103,13 @@
//extract id
int id;
bool conversionOk;
- QString idString = text.split( " " ).at( 1 );
+ QStringList textSplit = text.split( " " );
+ if(textSplit.size() < 1)
+ {
+ return;
+ }
+
+ QString idString = textSplit.at( textSplit.size() - 1 );
id = idString.toInt( &conversionOk );
if ( !conversionOk )
Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/src/app/qgisapp.h 2009-02-25 19:15:23 UTC (rev 10236)
@@ -137,6 +137,9 @@
void saveMapAsImage( QString, QPixmap * );
/** Get the mapcanvas object from the app */
QgsMapCanvas * mapCanvas() { return mMapCanvas; };
+
+ QgsComposer* printComposer() {return mComposer;}
+
//! Set theme (icons)
void setTheme( QString themeName = "default" );
//! Setup the toolbar popup menus for a given theme
Modified: trunk/qgis/src/app/qgisappinterface.cpp
===================================================================
--- trunk/qgis/src/app/qgisappinterface.cpp 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/src/app/qgisappinterface.cpp 2009-02-25 19:15:23 UTC (rev 10236)
@@ -24,6 +24,7 @@
#include "qgisappinterface.h"
#include "qgisapp.h"
+#include "qgscomposer.h"
#include "qgsmaplayer.h"
#include "qgsmaplayerregistry.h"
#include "qgsmapcanvas.h"
@@ -138,6 +139,45 @@
return qgis;
}
+#if 0
+QList<QgsComposerView*> QgisAppInterface::composerViews()
+{
+ QList<QgsComposerView*> composerViewList;
+ if(qgis)
+ {
+ QgsComposer* c = qgis->printComposer();
+ if(c)
+ {
+ QgsComposerView* v = c->view();
+ if(v)
+ {
+ composerViewList.push_back(v);
+ }
+ }
+ }
+ return composerViewList;
+}
+#endif //0
+
+QList< QPair<QMainWindow*, QgsComposerView*> > QgisAppInterface::composerList()
+{
+
+QList< QPair<QMainWindow*, QgsComposerView*> > composerList;
+ if(qgis)
+ {
+ QgsComposer* c = qgis->printComposer();
+ if(c)
+ {
+ QgsComposerView* v = c->view();
+ if(v)
+ {
+ composerList.push_back(qMakePair((QMainWindow*)(c), v));
+ }
+ }
+ }
+ return composerList;
+}
+
void QgisAppInterface::addDockWidget( Qt::DockWidgetArea area, QDockWidget * dockwidget )
{
qgis->addDockWidget( area, dockwidget );
Modified: trunk/qgis/src/app/qgisappinterface.h
===================================================================
--- trunk/qgis/src/app/qgisappinterface.h 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/src/app/qgisappinterface.h 2009-02-25 19:15:23 UTC (rev 10236)
@@ -92,6 +92,11 @@
*/
QWidget * mainWindow();
+ /** Return pointers to the composer views of the running instance (currently only one)*/
+ //QList<QgsComposerView*> composerViews();
+
+ QList< QPair<QMainWindow*, QgsComposerView*> > composerList();
+
/** Add action to the plugins menu */
void addPluginToMenu( QString name, QAction* action );
/** Remove action from the plugins menu */
Modified: trunk/qgis/src/core/composer/qgscomposermap.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.h 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/src/core/composer/qgscomposermap.h 2009-02-25 19:15:23 UTC (rev 10236)
@@ -55,9 +55,6 @@
Rectangle // Display only rectangle
};
- /** \brief Initialise GUI and other settings, shared by constructors */
- void init( void );
-
/** \brief Draw to paint device
@param extent map extent
@param size size in scene coordinates
@@ -67,9 +64,6 @@
/** \brief Reimplementation of QCanvasItem::paint - draw on canvas */
void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget );
- /** \brief Recalculate rectangle/extent/scale according to current rule */
- void recalculate( void );
-
/** \brief Create cache image */
void cache( void );
Modified: trunk/qgis/src/gui/qgisinterface.h
===================================================================
--- trunk/qgis/src/gui/qgisinterface.h 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/src/gui/qgisinterface.h 2009-02-25 19:15:23 UTC (rev 10236)
@@ -23,12 +23,16 @@
class QMenu;
class QToolBar;
class QDockWidget;
+class QMainWindow;
class QWidget;
#include <QObject>
+#include <QPair>
#include <map>
+
class QgisApp;
+class QgsComposerView;
class QgsMapLayer;
class QgsMapCanvas;
class QgsRasterLayer;
@@ -103,6 +107,12 @@
/** Return a pointer to the main window (instance of QgisApp in case of QGIS) */
virtual QWidget * mainWindow() = 0;
+ /** Return pointers to composer main windows*/
+ //virtual QList<QgsComposerView*> composerViews() = 0;
+
+ /**Return mainwindows / composer views of running composer instances (currently only one)*/
+ virtual QList< QPair<QMainWindow*, QgsComposerView*> > composerList() = 0;
+
/** Add action to the plugins menu */
virtual void addPluginToMenu( QString name, QAction* action ) = 0;
/** Remove action from the plugins menu */
Modified: trunk/qgis/src/plugins/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/CMakeLists.txt 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/src/plugins/CMakeLists.txt 2009-02-25 19:15:23 UTC (rev 10236)
@@ -1,4 +1,4 @@
-SUBDIRS (copyright_label delimited_text interpolation north_arrow scale_bar)
+SUBDIRS (copyright_label delimited_text interpolation north_arrow scale_bar beata)
IF (POSTGRES_FOUND)
SUBDIRS (spit)
Modified: trunk/qgis/src/plugins/interpolation/qgsinterpolator.cpp
===================================================================
--- trunk/qgis/src/plugins/interpolation/qgsinterpolator.cpp 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/src/plugins/interpolation/qgsinterpolator.cpp 2009-02-25 19:15:23 UTC (rev 10236)
@@ -76,6 +76,8 @@
QgsFeature theFeature;
double attributeValue = 0.0;
+ bool attributeConversionOk = false;
+
while ( provider->nextFeature( theFeature ) )
{
if ( !zCoordInterpolation )
@@ -86,7 +88,11 @@
{
return 3;
}
- attributeValue = att_it.value().toDouble();
+ attributeValue = att_it.value().toDouble(&attributeConversionOk);
+ if(!attributeConversionOk) //don't consider vertices with attributes like 'nan' for the interpolation
+ {
+ continue;
+ }
}
if ( addVerticesToCache( theFeature.geometry(), attributeValue ) != 0 )
Modified: trunk/qgis/src/providers/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/CMakeLists.txt 2009-02-25 18:41:20 UTC (rev 10235)
+++ trunk/qgis/src/providers/CMakeLists.txt 2009-02-25 19:15:23 UTC (rev 10236)
@@ -1,5 +1,5 @@
-SUBDIRS (memory ogr wms delimitedtext)
+SUBDIRS (memory ogr wms delimitedtext osm_provider)
IF (POSTGRES_FOUND)
SUBDIRS (postgres)
More information about the QGIS-commit
mailing list