Skip to content

Commit 8e3aca4

Browse files
jef-njef-n
committed
add globe plugin to osgeo4w package
1 parent b50402e commit 8e3aca4

File tree

9 files changed

+29
-18
lines changed

9 files changed

+29
-18
lines changed

‎CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ ENDIF (WITH_BINDINGS)
7878

7979
SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
8080
IF (WITH_GLOBE)
81+
SET(QT_USE_QTOPENGL 1)
8182
FIND_PACKAGE(OSGEARTH REQUIRED)
8283
ENDIF (WITH_GLOBE)
8384

‎cmake/FindOSGEARTH.cmake

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ FIND_PATH( ${THIS_OSGEARTH_INCLUDE_DIR} ${THIS_OSGEARTH_INCLUDE_FILE}
2626
$ENV{OSGEARTH_SOURCE_DIR}
2727
$ENV{OSGEARTHDIR}
2828
$ENV{OSGEARTH_DIR}
29+
$ENV{OSGEO4W_ROOT}
2930
/usr/local/
3031
/usr/
3132
/sw/ # Fink
@@ -57,6 +58,7 @@ FIND_LIBRARY(${MYLIBRARY}
5758
$ENV{OSGEARTH_DIR}
5859
$ENV{OSGEARTHDIR}
5960
$ENV{OSGEARTH_ROOT}
61+
$ENV{OSGEO4W_ROOT}
6062
~/Library/Frameworks
6163
/Library/Frameworks
6264
/usr/local
@@ -79,13 +81,13 @@ FIND_LIBRARY(${MYLIBRARY}
7981
ENDMACRO(FIND_OSGEARTH_LIBRARY LIBRARY LIBRARYNAME)
8082

8183
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY osgEarth )
82-
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd)
84+
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd )
8385

8486
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY osgEarthUtil )
85-
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild)
87+
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild )
8688

8789
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY osgEarthFeatures )
88-
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd)
90+
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd )
8991

9092
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
9193
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )

‎ms-windows/osgeo4w/package.cmd

+8
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ cmake -G "Visual Studio 9 2008" ^
8989
-D PEDANTIC=TRUE ^
9090
-D WITH_SPATIALITE=TRUE ^
9191
-D WITH_MAPSERVER=TRUE ^
92+
-D WITH_GLOBE=TRUE ^
9293
-D WITH_INTERNAL_SPATIALITE=TRUE ^
9394
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
9495
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
@@ -157,6 +158,7 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
157158
--exclude "apps/%PACKAGENAME%/plugins/grassrasterprovider.dll" ^
158159
--exclude "apps/%PACKAGENAME%/plugins/grassplugin.dll" ^
159160
--exclude "apps/%PACKAGENAME%/plugins/grassprovider.dll" ^
161+
--exclude "apps/%PACKAGENAME%/plugins/globeplugin.dll" ^
160162
apps/%PACKAGENAME% ^
161163
bin/%PACKAGENAME%.bat.tmpl ^
162164
bin/%PACKAGENAME%-browser.bat.tmpl ^
@@ -179,6 +181,12 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz
179181
>>%LOG% 2>&1
180182
if errorlevel 1 goto error
181183

184+
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-globe-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
185+
"apps/%PACKAGENAME%/globe" ^
186+
"apps/%PACKAGENAME%/plugins/globeplugin.dll" ^
187+
>>%LOG% 2>&1
188+
if errorlevel 1 goto error
189+
182190
goto end
183191

184192
:error

‎src/plugins/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ IF (GRASS_FOUND)
3737
ENDIF (GRASS_FOUND)
3838

3939
IF (OSGEARTH_FOUND)
40-
SUBDIRS (globe)
40+
ADD_SUBDIRECTORY(globe)
4141
ENDIF (OSGEARTH_FOUND)
4242

4343
# headers installed in qgis_core target

‎src/plugins/globe/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# set path to additional CMake modules
32
SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules ${CMAKE_MODULE_PATH})
43

@@ -50,7 +49,7 @@ INCLUDE_DIRECTORIES(
5049
TARGET_LINK_LIBRARIES(globeplugin
5150
qgis_core
5251
qgis_gui
53-
QtOpenGL
52+
${QT_QTOPENGL_LIBRARY}
5453
${OSGDB_LIBRARY}
5554
${OSGGA_LIBRARY}
5655
${OSG_LIBRARY}

‎src/plugins/globe/CMakeModules/FindOSG.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ FIND_LIBRARY(${MYLIBRARY}
5757
$ENV{OSG_DIR}
5858
$ENV{OSGDIR}
5959
$ENV{OSG_ROOT}
60+
$ENV{OSGEO4W_ROOT}
6061
~/Library/Frameworks
6162
/Library/Frameworks
6263
/usr/local

‎src/plugins/globe/CMakeModules/FindOpenThreads.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ ENDIF(NOT OPENTHREADS_INCLUDE_DIR)
7676

7777

7878
FIND_LIBRARY(OPENTHREADS_LIBRARY
79-
NAMES OpenThreads OpenThreadsWin32
79+
NAMES OpenThreads OpenThreadsWin32
8080
PATHS
8181
$ENV{OPENTHREADS_LIBRARY_DIR}
8282
$ENV{OPENTHREADS_DIR}/lib64
@@ -99,7 +99,7 @@ ENDIF(NOT OPENTHREADS_LIBRARY)
9999

100100
IF(NOT OPENTHREADS_LIBRARY)
101101
FIND_LIBRARY(OPENTHREADS_LIBRARY
102-
NAMES OpenThreads OpenThreadsWin32
102+
NAMES OpenThreads OpenThreadsWin32
103103
PATHS
104104
~/Library/Frameworks
105105
/Library/Frameworks

‎src/plugins/globe/globe_plugin.cpp

+10-6
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ void GlobePlugin::setupControls()
440440
moveHControls->setFrame( new RoundedFrame() );
441441
moveHControls->getFrame()->setBackColor(1,1,1,0.5);
442442
moveHControls->setMargin( 0 );
443-
moveHControls->setSpacing( 47 );
443+
moveHControls->setChildSpacing( 47 );
444444
moveHControls->setVertAlign( Control::ALIGN_CENTER );
445445
moveHControls->setHorizAlign( Control::ALIGN_CENTER );
446446
moveHControls->setPosition( 5, 30 );
@@ -462,7 +462,7 @@ void GlobePlugin::setupControls()
462462
moveVControls->setFrame( new RoundedFrame() );
463463
moveVControls->getFrame()->setBackColor(1,1,1,0.5);
464464
moveVControls->setMargin( 0 );
465-
moveVControls->setSpacing( 36 );
465+
moveVControls->setChildSpacing( 36 );
466466
moveVControls->setVertAlign( Control::ALIGN_CENTER );
467467
moveVControls->setHorizAlign( Control::ALIGN_CENTER );
468468
moveVControls->setPosition( 35, 5 );
@@ -492,7 +492,7 @@ void GlobePlugin::setupControls()
492492
rotateControls->setFrame( new RoundedFrame() );
493493
rotateControls->getFrame()->setBackColor(1,1,1,0.5);
494494
rotateControls->setMargin( 0 );
495-
rotateControls->setSpacing( 10 );
495+
rotateControls->setChildSpacing( 10 );
496496
rotateControls->setVertAlign( Control::ALIGN_CENTER );
497497
rotateControls->setHorizAlign( Control::ALIGN_CENTER );
498498
rotateControls->setPosition( 5, 113 );
@@ -526,7 +526,7 @@ void GlobePlugin::setupControls()
526526
tiltControls->setFrame( new RoundedFrame() );
527527
tiltControls->getFrame()->setBackColor(1,1,1,0.5);
528528
tiltControls->setMargin( 0 );
529-
tiltControls->setSpacing( 30 );
529+
tiltControls->setChildSpacing( 30 );
530530
tiltControls->setVertAlign( Control::ALIGN_CENTER );
531531
tiltControls->setHorizAlign( Control::ALIGN_CENTER );
532532
tiltControls->setPosition( 35, 90 );
@@ -554,7 +554,7 @@ void GlobePlugin::setupControls()
554554
zoomControls->setFrame( new RoundedFrame() );
555555
zoomControls->getFrame()->setBackColor(1,1,1,0.5);
556556
zoomControls->setMargin( 0 );
557-
zoomControls->setSpacing( 5 );
557+
zoomControls->setChildSpacing( 5 );
558558
zoomControls->setVertAlign( Control::ALIGN_CENTER );
559559
zoomControls->setHorizAlign( Control::ALIGN_CENTER );
560560
zoomControls->setPosition( 35, 170 );
@@ -582,7 +582,7 @@ void GlobePlugin::setupControls()
582582
extraControls->setFrame( new RoundedFrame() );
583583
extraControls->getFrame()->setBackColor(1,1,1,0.5);
584584
extraControls->setMargin( 0 );
585-
extraControls->setSpacing( 10 );
585+
extraControls->setChildSpacing( 10 );
586586
extraControls->setVertAlign( Control::ALIGN_CENTER );
587587
extraControls->setHorizAlign( Control::ALIGN_CENTER );
588588
extraControls->setPosition( 5, 220 );
@@ -631,7 +631,11 @@ void GlobePlugin::setupProxy()
631631
if( !settings.value( "/proxyUser" ).toString().isEmpty() )
632632
{
633633
QString auth = settings.value( "/proxyUser" ).toString() + ":" + settings.value( "/proxyPassword" ).toString();
634+
#ifdef WIN32
635+
putenv( QString( "OSGEARTH_CURL_PROXYAUTH=%1" ).arg( auth ).toAscii() );
636+
#else
634637
setenv( "OSGEARTH_CURL_PROXYAUTH", auth.toStdString().c_str(), 0 );
638+
#endif
635639
}
636640
//TODO: settings.value("/proxyType")
637641
//TODO: URL exlusions

‎src/plugins/globe/globe_plugin.h

-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ class GlobePlugin : public QObject, public QgisPlugin
5656
//! show the help document
5757
void help();
5858

59-
//! Called when the main canvas is about to be rendered
60-
void renderStarting();
61-
//! Called when the main canvas has rendered.
62-
void renderComplete( QPainter * );
6359
//! Emitted when a new set of layers has been received
6460
void layersChanged();
6561
//! Called when the extents of the map change

0 commit comments

Comments
 (0)