forgot this files in last checkout

qgis · Jul 5, 2011 · db1b495 · db1b495
1 parent 2e214cb
commit db1b495
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
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>