2 changes: 1 addition & 1 deletion debian/control.jessie
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Build-Depends:
txt2tags,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
spawn-cgi, lighttpd, poppler-utils
spawn-fcgi, lighttpd, poppler-utils
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.9.5
Homepage: http://qgis.org/
Expand Down
2 changes: 1 addition & 1 deletion debian/control.precise
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Build-Depends:
txt2tags,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
spawn-cgi, lighttpd, poppler-utils
spawn-fcgi, lighttpd, poppler-utils
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Expand Down
2 changes: 1 addition & 1 deletion debian/control.quantal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Build-Depends:
txt2tags,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
spawn-cgi, lighttpd, poppler-utils
spawn-fcgi, lighttpd, poppler-utils
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.9.3
XS-Python-Version: current
Expand Down
2 changes: 1 addition & 1 deletion debian/control.raring
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Build-Depends:
txt2tags,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
spawn-cgi, lighttpd, poppler-utils
spawn-fcgi, lighttpd, poppler-utils
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Expand Down
2 changes: 1 addition & 1 deletion debian/control.saucy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Build-Depends:
txt2tags,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
spawn-cgi, lighttpd, poppler-utils
spawn-fcgi, lighttpd, poppler-utils
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Expand Down
2 changes: 1 addition & 1 deletion debian/control.sid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Build-Depends:
txt2tags,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
spawn-cgi, lighttpd, poppler-utils
spawn-fcgi, lighttpd, poppler-utils
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.9.5
Homepage: http://qgis.org/
Expand Down
2 changes: 1 addition & 1 deletion debian/control.sid-oracle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Build-Depends:
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
oracle-instantclient11.2-devel,
spawn-cgi, lighttpd, poppler-utils
spawn-fcgi, lighttpd, poppler-utils
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.9.5
Homepage: http://qgis.org/
Expand Down
2 changes: 1 addition & 1 deletion debian/control.trusty
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Build-Depends:
txt2tags,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
spawn-cgi, lighttpd, poppler-utils
spawn-fcgi, lighttpd, poppler-utils
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Expand Down
2 changes: 1 addition & 1 deletion debian/control.wheezy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Build-Depends:
txt2tags,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
spawn-cgi, lighttpd, poppler-utils
spawn-fcgi, lighttpd, poppler-utils
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.9.3
XS-Python-Version: current
Expand Down
43 changes: 43 additions & 0 deletions src/plugins/globe/globe_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,37 @@ static const QgisPlugin::PLUGINTYPE sPluginType = QgisPlugin::UI;
static const QString sIcon = ":/globe/globe.png";
static const QString sExperimental = QString( "true" );

#if 0
#include <qgsmessagelog.h>

class QgsMsgTrap : public std::streambuf
{
public:
inline virtual int_type overflow( int_type c = std::streambuf::traits_type::eof() )
{
if ( c == std::streambuf::traits_type::eof() )
return std::streambuf::traits_type::not_eof( c );

switch ( c )
{
case '\r':
break;
case '\n':
QgsMessageLog::logMessage( buf, QObject::tr( "Globe" ) );
buf.clear();
break;
default:
buf += c;
break;
}
return c;
}

private:
QString buf;
} msgTrap;
#endif


//constructor
GlobePlugin::GlobePlugin( QgisInterface* theQgisInterface )
Expand Down Expand Up @@ -255,6 +286,11 @@ void GlobePlugin::initGui()
SLOT( blankProjectReady() ) );
connect( this, SIGNAL( xyCoordinates( const QgsPoint & ) ),
mQGisIface->mapCanvas(), SIGNAL( xyCoordinates( const QgsPoint & ) ) );

#if 0
mCoutRdBuf = std::cout.rdbuf( &msgTrap );
mCerrRdBuf = std::cerr.rdbuf( &msgTrap );
#endif
}

void GlobePlugin::run()
Expand Down Expand Up @@ -939,6 +975,13 @@ void GlobePlugin::unload()
mQGisIface->removeToolBarIcon( mQActionPointer );

delete mQActionPointer;

#if 0
if ( mCoutRdBuf )
std::cout.rdbuf( mCoutRdBuf );
if ( mCerrRdBuf )
std::cerr.rdbuf( mCerrRdBuf );
#endif
}

void GlobePlugin::help()
Expand Down
8 changes: 8 additions & 0 deletions src/plugins/globe/globe_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ using namespace osgEarth::Util::Controls;
#endif
#include <osgEarth/Version>

#if 0
#include <iostream>
#endif

class QAction;
class QToolBar;
class QgisInterface;
Expand Down Expand Up @@ -178,6 +182,10 @@ class GlobePlugin : public QObject, public QgisPlugin
//! coordinates of the right-clicked point on the globe
double mSelectedLat, mSelectedLon, mSelectedElevation;

#if 0
std::streambuf *mCoutRdBuf, *mCerrRdBuf;
#endif

signals:
//! emits current mouse position
void xyCoordinates( const QgsPoint & p );
Expand Down
Loading