forgot this files in last checkout

Marco Bernasocchi · pka · commit db1b49505dfb · 2011-07-05T22:16:19.000+02:00
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -163,7 +163,11 @@ void GlobePlugin::settings()
 {
   QgsGlobePluginDialog* settingsDialog = new QgsGlobePluginDialog( mQGisIface->mainWindow(), QgisGui::ModalDialogFlags );
   settingsDialog->setAttribute( Qt::WA_DeleteOnClose );
-  settingsDialog->show();
+  settingsDialog->exec();
+  
+  //QMessageBox msgBox;
+  //msgBox.setText(settingsDialog->stereoMode);
+  //msgBox.exec();
 }
 
 void GlobePlugin::setupMap()
diff --git a/src/plugins/globe/globe_plugin_dialog.cpp b/src/plugins/globe/globe_plugin_dialog.cpp
@@ -17,6 +17,7 @@
  ***************************************************************************/
 
 #include "globe_plugin_dialog.h"
+#include "globe_plugin.h"
 
 #include <qgsapplication.h>
 #include <qgslogger.h>
@@ -59,6 +60,9 @@ QString QgsGlobePluginDialog::openFile()
 
 void QgsGlobePluginDialog::setStereoMode()
 {
+  //TODO: Call QgsGLWidgetAdapter::setStereoMode(QString stereoMode)
+  //from GlobePlugin::settings() instead of code duplication
+  settings.setValue( "/Plugin-Globe/stereoMode", stereoMode );
   if("OFF" == stereoMode)
   {
     osg::DisplaySettings::instance()->setStereo( false );
@@ -79,6 +83,14 @@ void QgsGlobePluginDialog::setStereoMode()
     {
       osg::DisplaySettings::instance()->setStereoMode( osg::DisplaySettings::VERTICAL_SPLIT );
     }
+    else if("HORIZONTAL_SPLIT" == stereoMode)
+    {
+      osg::DisplaySettings::instance()->setStereoMode( osg::DisplaySettings::HORIZONTAL_SPLIT );
+    }
+    else if("QUAD_BUFFER" == stereoMode)
+    {
+      osg::DisplaySettings::instance()->setStereoMode( osg::DisplaySettings::QUAD_BUFFER );
+    }
     else
     {
       showMessageBox("This stereo mode has not been implemented yet. Defaulting to ANAGLYPHIC");
@@ -199,7 +211,6 @@ void QgsGlobePluginDialog::on_buttonBox_rejected()
 void QgsGlobePluginDialog::on_comboStereoMode_currentIndexChanged( QString mode )
 {
   stereoMode = mode;
-  settings.setValue( "/Plugin-Globe/stereoMode", stereoMode );
 }
 
 void QgsGlobePluginDialog::showMessageBox( QString text )
@@ -208,4 +219,3 @@ void QgsGlobePluginDialog::showMessageBox( QString text )
     msgBox.setText(text);
     msgBox.exec();
 }
-
diff --git a/src/plugins/globe/globe_plugin_dialog_guibase.ui b/src/plugins/globe/globe_plugin_dialog_guibase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>491</width>
-    <height>337</height>
+    <height>359</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -34,7 +34,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="elevation">
       <attribute name="title">
@@ -56,7 +56,7 @@
         <number>2</number>
        </property>
        <attribute name="horizontalHeaderVisible">
-        <bool>true</bool>
+        <bool>false</bool>
        </attribute>
        <attribute name="horizontalHeaderStretchLastSection">
         <bool>true</bool>
@@ -194,7 +194,7 @@
          </item>
          <item>
           <property name="text">
-           <string>QUAD_BUFFFER</string>
+           <string>QUAD_BUFFER</string>
           </property>
          </item>
          <item>

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,11 @@ void GlobePlugin::settings()`
`163`	`163`	`{`
`164`	`164`	`QgsGlobePluginDialog* settingsDialog = new QgsGlobePluginDialog( mQGisIface->mainWindow(), QgisGui::ModalDialogFlags );`
`165`	`165`	`settingsDialog->setAttribute( Qt::WA_DeleteOnClose );`
`166`		`- settingsDialog->show();`
	`166`	`+ settingsDialog->exec();`
	`167`	`+`
	`168`	`+ //QMessageBox msgBox;`
	`169`	`+ //msgBox.setText(settingsDialog->stereoMode);`
	`170`	`+ //msgBox.exec();`
`167`	`171`	`}`
`168`	`172`
`169`	`173`	`void GlobePlugin::setupMap()`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`***************************************************************************/`
`18`	`18`
`19`	`19`	`#include "globe_plugin_dialog.h"`
	`20`	`+#include "globe_plugin.h"`
`20`	`21`
`21`	`22`	`#include <qgsapplication.h>`
`22`	`23`	`#include <qgslogger.h>`
`@@ -59,6 +60,9 @@ QString QgsGlobePluginDialog::openFile()`
`59`	`60`
`60`	`61`	`void QgsGlobePluginDialog::setStereoMode()`
`61`	`62`	`{`
	`63`	`+ //TODO: Call QgsGLWidgetAdapter::setStereoMode(QString stereoMode)`
	`64`	`+ //from GlobePlugin::settings() instead of code duplication`
	`65`	`+ settings.setValue( "/Plugin-Globe/stereoMode", stereoMode );`
`62`	`66`	`if("OFF" == stereoMode)`
`63`	`67`	`{`
`64`	`68`	`osg::DisplaySettings::instance()->setStereo( false );`
`@@ -79,6 +83,14 @@ void QgsGlobePluginDialog::setStereoMode()`
`79`	`83`	`{`
`80`	`84`	`osg::DisplaySettings::instance()->setStereoMode( osg::DisplaySettings::VERTICAL_SPLIT );`
`81`	`85`	`}`
	`86`	`+ else if("HORIZONTAL_SPLIT" == stereoMode)`
	`87`	`+ {`
	`88`	`+ osg::DisplaySettings::instance()->setStereoMode( osg::DisplaySettings::HORIZONTAL_SPLIT );`
	`89`	`+ }`
	`90`	`+ else if("QUAD_BUFFER" == stereoMode)`
	`91`	`+ {`
	`92`	`+ osg::DisplaySettings::instance()->setStereoMode( osg::DisplaySettings::QUAD_BUFFER );`
	`93`	`+ }`
`82`	`94`	`else`
`83`	`95`	`{`
`84`	`96`	`showMessageBox("This stereo mode has not been implemented yet. Defaulting to ANAGLYPHIC");`
`@@ -199,7 +211,6 @@ void QgsGlobePluginDialog::on_buttonBox_rejected()`
`199`	`211`	`void QgsGlobePluginDialog::on_comboStereoMode_currentIndexChanged( QString mode )`
`200`	`212`	`{`
`201`	`213`	`stereoMode = mode;`
`202`		`- settings.setValue( "/Plugin-Globe/stereoMode", stereoMode );`
`203`	`214`	`}`
`204`	`215`
`205`	`216`	`void QgsGlobePluginDialog::showMessageBox( QString text )`
`@@ -208,4 +219,3 @@ void QgsGlobePluginDialog::showMessageBox( QString text )`
`208`	`219`	`msgBox.setText(text);`
`209`	`220`	`msgBox.exec();`
`210`	`221`	`}`
`211`		`-`