1 change: 1 addition & 0 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ qgis (1.9.0) UNRELEASED; urgency=low
* add python-unittest2 build dependency for maverick and squeeze
* disable PyQgsRectangle test on lucid (depends on unittest2)
* add python-qscintilla2 dependency to python-qgis
* add support for ubuntu quantal

-- Jürgen E. Fischer <jef@norbit.de> Tue, 18 Sep 2012 22:18:25 +0200

Expand Down
1 change: 1 addition & 0 deletions debian/compat.quantal
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7
221 changes: 221 additions & 0 deletions debian/control.quantal
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
Source: qgis
Section: science
Priority: extra
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Build-Depends:
bison,
cmake (>= 2.6),
debhelper (>= 7),
flex,
grass-dev,
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
python,
python-central (>=0.5),
python-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev,
libopenscenegraph-dev,
git,
doxygen,
graphviz,
txt2tags,
xvfb, xauth, xfonts-base
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Homepage: http://qgis.org/

Package: qgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis
Suggests: gpsbabel
Conflicts: uim-qt3
Description: Geographic Information System (GIS)
A Geographic Information System (GIS) manages, analyzes, and displays
databases of geographic information. Quantum GIS (QGIS) supports shape file
viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection
on-the-fly, map composition, and a number of other features via a plugin
interface. QGIS also supports display of various georeferenced raster and
Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid,
and USGS ASCII DEM.

Package: qgis-common
Architecture: all
Description: Quantum GIS - architecture-independent data
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
with Quantum GIS.

Package: libqgis{QGIS_ABI}
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
Description: Quantum GIS - shared libraries
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis-dev
Architecture: any
Section: libdevel
Depends:
grass-dev,
libexpat1-dev,
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
qt4-designer (>=4.4.0)
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Description: Quantum GIS - development files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the headers and libraries needed to develop plugins for
Quantum GIS.

Package: qgis-plugin-grass
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass{GRASS_ABI}
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This plugin enables GRASS data access in the Quantum GIS geographic data
viewer.

Package: qgis-plugin-grass-common
Architecture: all
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
with the Quantum GIS GRASS plugin.

Package: python-qgis
Section: python
Architecture: any
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the files for the Python support.

Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains architecture-independent files for the Quantum GIS
Python bindings.

Package: qgis-providers
Architecture: any
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<= 1.6)
Breaks: qgis (<= 1.6)
Description: collection of data providers to Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the provider plugins for Quantum GIS.

Package: qgis-providers-common
Architecture: all
Replaces: qgis-common (<= 1.6)
Breaks: qgis-common (<= 1.6)
Description: collection of data providers to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains architecture-independent files for the Quantum GIS
providers.

Package: qgis-mapserver
Architecture: any
Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Quantum GIS mapserver
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
Description: Quantum GIS sql anywhere plugin and provider
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS API documentation.

Package: qgis-plugin-globe
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: OSG globe plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This plugin enables 3D viewing using OSG globe in the Quantum GIS.

Package: qgis-plugin-globe-common
Architecture: all
Description: OSG GLOBE plugin for Quantum GIS - architecture-independent data
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
with the Quantum GIS GLOBE plugin.

5 changes: 5 additions & 0 deletions debian/python-qgis.install.quantal
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
usr/lib/python*/*-packages/qgis/*.py
usr/lib/python*/*-packages/qgis/*.so
usr/lib/python*/*-packages/pyspatialite/*.py
usr/lib/python*/*-packages/pyspatialite/*.so
usr/lib/libqgispython.so.{QGIS_ABI}
2 changes: 2 additions & 0 deletions src/core/symbology-ng/qgssymbollayerv2utils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,9 @@ QgsSymbolV2* QgsSymbolLayerV2Utils::loadSymbol( QDomElement& element )
QgsSymbolV2* subSymbol = loadSymbol( s );
bool res = layer->setSubSymbol( subSymbol );
if ( !res )
{
QgsDebugMsg( "symbol layer refused subsymbol: " + s.attribute( "name" ) );
}
}
layers.append( layer );
}
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/globe/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ SET (globe_plugin_UIS
SET (globe_plugin_MOC_HDRS
globe_plugin.h
globe_plugin_dialog.h
osgEarthQt/Common
osgEarthQt/ViewerWidget
)

SET (globe_plugin_RCCS globe_plugin.qrc)
Expand Down
1 change: 1 addition & 0 deletions src/plugins/globe/osgEarthQt/ViewerWidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ void ViewerWidget::reconfigure( osgViewer::View* view )

void ViewerWidget::paintEvent(QPaintEvent* e)
{
Q_UNUSED( e );
if (_viewer->getRunFrameScheme() == osgViewer::ViewerBase::CONTINUOUS ||
_viewer->checkNeedToDoFrame() )
{
Expand Down
41 changes: 21 additions & 20 deletions src/plugins/globe/osgEarthUtil/Controls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <osgText/Text>
#include <vector>
#include <queue>
#include <qglobal.h>

#undef OSGEARTHUTIL_EXPORT
#define OSGEARTHUTIL_EXPORT
Expand Down Expand Up @@ -100,25 +101,25 @@ namespace osgEarth { namespace Util { namespace Controls21
{
public:
/** Click event. */
virtual void onClick( class Control* control ) { }
virtual void onClick( class Control* control ) { Q_UNUSED(control); }

/** Click event with mouse button mask (see osgGA::GUIEventAdapter::MouseButtonMask) */
virtual void onClick( class Control* control, int mouseButtonMask ) { onClick(control); }
virtual void onClick( class Control* control, int mouseButtonMask ) { Q_UNUSED( mouseButtonMask ); onClick(control); }

/** Click event with click position (negative values mean you're in the left/top padding) */
virtual void onClick( class Control* control, const osg::Vec2f& pos, int mouseButtonMask ) { onClick(control, mouseButtonMask); }
virtual void onClick( class Control* control, const osg::Vec2f& pos, int mouseButtonMask ) { Q_UNUSED( pos); onClick(control, mouseButtonMask); }

/** Value events */
virtual void onValueChanged( class Control* control, bool value ) { }
virtual void onValueChanged( class Control* control, double value ) { }
virtual void onValueChanged( class Control* control, float value ) { }
virtual void onValueChanged( class Control* control, int value ) { }
virtual void onValueChanged( class Control* control, const osg::Vec3f& value ) { }
virtual void onValueChanged( class Control* control, const osg::Vec2f& value ) { }
virtual void onValueChanged( class Control* control, const osg::Vec3d& value ) { }
virtual void onValueChanged( class Control* control, const osg::Vec2d& value ) { }
virtual void onValueChanged( class Control* control, const std::string& value ) { }
virtual void onValueChanged( class Control* control, void* value ) { }
virtual void onValueChanged( class Control* control, bool value ) { Q_UNUSED( control ); Q_UNUSED( value ); }
virtual void onValueChanged( class Control* control, double value ) { Q_UNUSED( control ); Q_UNUSED( value );}
virtual void onValueChanged( class Control* control, float value ) { Q_UNUSED( control ); Q_UNUSED( value );}
virtual void onValueChanged( class Control* control, int value ) { Q_UNUSED( control ); Q_UNUSED( value ); }
virtual void onValueChanged( class Control* control, const osg::Vec3f& value ) { Q_UNUSED( control ); Q_UNUSED( value ); }
virtual void onValueChanged( class Control* control, const osg::Vec2f& value ) { Q_UNUSED( control ); Q_UNUSED( value ); }
virtual void onValueChanged( class Control* control, const osg::Vec3d& value ) { Q_UNUSED( control ); Q_UNUSED( value ); }
virtual void onValueChanged( class Control* control, const osg::Vec2d& value ) { Q_UNUSED( control ); Q_UNUSED( value ); }
virtual void onValueChanged( class Control* control, const std::string& value ) { Q_UNUSED( control ); Q_UNUSED( value ); }
virtual void onValueChanged( class Control* control, void* value ) { Q_UNUSED( control ); Q_UNUSED( value ); }
};

typedef std::list< osg::ref_ptr<ControlEventHandler> > ControlEventHandlerList;
Expand Down Expand Up @@ -181,10 +182,10 @@ namespace osgEarth { namespace Util { namespace Controls21
bool horizFill() const { return _hfill; }

void setVertFill( bool value, float minHeight =0.0f );
const bool vertFill() const { return _vfill; }
bool vertFill() const { return _vfill; }

void setVisible( bool value );
const bool visible() const { return _visible; }
bool visible() const { return _visible; }

void setForeColor( const osg::Vec4f& value );
void setForeColor( float r, float g, float b, float a ) { setForeColor( osg::Vec4f(r,g,b,a) ); }
Expand Down Expand Up @@ -218,7 +219,7 @@ namespace osgEarth { namespace Util { namespace Controls21
bool isDirty() const { return _dirty; }

virtual void calcSize( const ControlContext& context, osg::Vec2f& out_size );
virtual void calcFill( const ControlContext& context ) { }
virtual void calcFill( const ControlContext& context ) { Q_UNUSED( context ); }
virtual void calcPos ( const ControlContext& context, const osg::Vec2f& cursor, const osg::Vec2f& parentSize );
virtual void draw ( const ControlContext& context, DrawableList& out_drawables );

Expand Down Expand Up @@ -248,15 +249,15 @@ namespace osgEarth { namespace Util { namespace Controls21

private:
osgEarth::optional<float> _x, _y, _width, _height;
bool _hfill, _vfill;
Gutter _margin;
Gutter _padding;
bool _visible;
optional<Alignment> _valign, _halign;
optional<osg::Vec4f> _backColor, _foreColor, _activeColor;
osg::observer_ptr<Control> _parent;
bool _active;
bool _absorbEvents;
bool _hfill, _vfill;
osg::observer_ptr<Control> _parent;
osg::ref_ptr<osg::Geometry> _geom;
};

Expand Down Expand Up @@ -561,8 +562,8 @@ namespace osgEarth { namespace Util { namespace Controls21
{
PerViewData();
bool _obscured;
osg::Vec3f _screenPos;
float _visibleTime;
osg::Vec3f _screenPos;
unsigned _visitFrame;
osg::ref_ptr<osg::Uniform> _uniform;
osg::observer_ptr<osg::Camera> _canvas;
Expand Down Expand Up @@ -609,9 +610,9 @@ namespace osgEarth { namespace Util { namespace Controls21

osg::ref_ptr<osg::Group> _group;
std::vector<osg::BoundingBox> _taken;
bool _sortingEnabled;
bool _sortByDistance;
bool _fading;
bool _sortingEnabled;

friend class ControlCanvas;
friend class ControlNode;
Expand Down
Loading