refactoring of setStereoMode done

Marco Bernasocchi · pka · commit 0f85a6c69341 · 2011-07-05T23:18:08.000+02:00
diff --git a/src/plugins/globe/globe_plugin_dialog.cpp b/src/plugins/globe/globe_plugin_dialog.cpp
@@ -41,6 +41,7 @@ QgsGlobePluginDialog::QgsGlobePluginDialog( QWidget* parent, Qt::WFlags fl )
   setupUi( this );
   stereoMode = settings.value( "/Plugin-Globe/stereoMode", "OFF" ).toString();
   comboStereoMode->setCurrentIndex( comboStereoMode->findText( stereoMode ) );
+  //showMessageBox("constructor " + stereoMode);
 }
 
 //destructor
@@ -58,46 +59,6 @@ QString QgsGlobePluginDialog::openFile()
   return path;
 }
 
-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 );
-    }
-  else if("ADVANCED" == stereoMode)
-  {
-    //osg::DisplaySettings::instance()->set
-    }
-  else
-  {
-    osg::DisplaySettings::instance()->setStereo( true );
-    
-    if("ANAGLYPHIC" == stereoMode)
-    {
-      osg::DisplaySettings::instance()->setStereoMode( osg::DisplaySettings::ANAGLYPHIC );
-    }
-    else if("VERTICAL_SPLIT" == stereoMode)
-    {
-      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");
-    }
-  }
-}
-
 void QgsGlobePluginDialog::restartGlobe()
 {
   //showMessageBox("TODO: restart globe");
@@ -194,7 +155,6 @@ void QgsGlobePluginDialog::on_buttonBox_accepted()
 
   // Close dialog box
   */
-  setStereoMode();
   
   if ( globeRunning() )
   {
@@ -211,6 +171,7 @@ void QgsGlobePluginDialog::on_buttonBox_rejected()
 void QgsGlobePluginDialog::on_comboStereoMode_currentIndexChanged( QString mode )
 {
   stereoMode = mode;
+  //showMessageBox("index_changed " + stereoMode);
 }
 
 void QgsGlobePluginDialog::showMessageBox( QString text )
diff --git a/src/plugins/globe/globe_plugin_dialog.h b/src/plugins/globe/globe_plugin_dialog.h
@@ -28,10 +28,10 @@ class QgsGlobePluginDialog:public QDialog, private Ui::QgsGlobePluginDialogGuiBa
   Q_OBJECT 
   
   public:
-    QString stereoMode;
     QgsGlobePluginDialog( QWidget * parent = 0, Qt::WFlags fl = 0 );
     ~QgsGlobePluginDialog();
-
+    QString stereoMode;
+    
   private:
     QString earthFile;
     QString openFile();
diff --git a/src/plugins/globe/globe_plugin_dialog_guibase.ui b/src/plugins/globe/globe_plugin_dialog_guibase.ui
@@ -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>
diff --git a/src/plugins/globe/qgsosgviewer.cpp b/src/plugins/globe/qgsosgviewer.cpp
@@ -95,15 +95,10 @@ void QgsGLWidgetAdapter::setStereoMode()
 void QgsGLWidgetAdapter::setStereoMode(QString stereoMode)
 {
   settings.setValue( "/Plugin-Globe/stereoMode", stereoMode );
-  
   if("OFF" == stereoMode)
   {
     osg::DisplaySettings::instance()->setStereo( false );
     }
-  else if("ADVANCED" == stereoMode)
-  {
-    //osg::DisplaySettings::instance()->set
-    }
   else
   {
     osg::DisplaySettings::instance()->setStereo( true );
@@ -127,6 +122,7 @@ void QgsGLWidgetAdapter::setStereoMode(QString stereoMode)
     else
     {
       //should never get here
+      settings.setValue( "/Plugin-Globe/stereoMode", "ANAGLYPHIC" );
       QMessageBox msgBox;
       msgBox.setText("This stereo mode has not been implemented yet. Defaulting to ANAGLYPHIC");
       msgBox.exec();

Original file line number	Diff line number	Diff line change
`@@ -95,15 +95,10 @@ void QgsGLWidgetAdapter::setStereoMode()`
`95`	`95`	`void QgsGLWidgetAdapter::setStereoMode(QString stereoMode)`
`96`	`96`	`{`
`97`	`97`	`settings.setValue( "/Plugin-Globe/stereoMode", stereoMode );`
`98`		`-`
`99`	`98`	`if("OFF" == stereoMode)`
`100`	`99`	`{`
`101`	`100`	`osg::DisplaySettings::instance()->setStereo( false );`
`102`	`101`	`}`
`103`		`- else if("ADVANCED" == stereoMode)`
`104`		`- {`
`105`		`- //osg::DisplaySettings::instance()->set`
`106`		`- }`
`107`	`102`	`else`
`108`	`103`	`{`
`109`	`104`	`osg::DisplaySettings::instance()->setStereo( true );`
`@@ -127,6 +122,7 @@ void QgsGLWidgetAdapter::setStereoMode(QString stereoMode)`
`127`	`122`	`else`
`128`	`123`	`{`
`129`	`124`	`//should never get here`
	`125`	`+ settings.setValue( "/Plugin-Globe/stereoMode", "ANAGLYPHIC" );`
`130`	`126`	`QMessageBox msgBox;`
`131`	`127`	`msgBox.setText("This stereo mode has not been implemented yet. Defaulting to ANAGLYPHIC");`
`132`	`128`	`msgBox.exec();`