[QGIS Commit] r10019 - branches/vector_overlay_branch/src/app

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-01-26 03:37:22 -0500 (Mon, 26 Jan 2009)
New Revision: 10019

Modified:
   branches/vector_overlay_branch/src/app/qgsoptions.cpp
Log:
Display hints if overlay placement algorithm is fast or slow

Modified: branches/vector_overlay_branch/src/app/qgsoptions.cpp
===================================================================
--- branches/vector_overlay_branch/src/app/qgsoptions.cpp	2009-01-26 08:11:48 UTC (rev 10018)
+++ branches/vector_overlay_branch/src/app/qgsoptions.cpp	2009-01-26 08:37:22 UTC (rev 10019)
@@ -200,11 +200,11 @@
 #endif //Q_WS_MAC
 
    //overlay placement algorithm
-  mOverlayAlgorithmComboBox->insertItem(0, "Central point");
-  mOverlayAlgorithmComboBox->insertItem(1, "Chain");
-  mOverlayAlgorithmComboBox->insertItem(2, "Popmusic tabu chain");
-  mOverlayAlgorithmComboBox->insertItem(3, "Popmusic tabu");
-  mOverlayAlgorithmComboBox->insertItem(4, "Popmusic chain");
+  mOverlayAlgorithmComboBox->insertItem(0, tr("Central point (fastest)"));
+  mOverlayAlgorithmComboBox->insertItem(1, tr("Chain (fast)"));
+  mOverlayAlgorithmComboBox->insertItem(2, tr("Popmusic tabu chain (slow)"));
+  mOverlayAlgorithmComboBox->insertItem(3, tr("Popmusic tabu (slow)"));
+  mOverlayAlgorithmComboBox->insertItem(4, tr("Popmusic chain (very slow)"));
 
   QString overlayAlgorithmString = settings.value( "qgis/overlayPlacementAlgorithm", "Central point").toString();
   if(overlayAlgorithmString == "Chain"){mOverlayAlgorithmComboBox->setCurrentIndex(1);}
@@ -286,8 +286,30 @@
   settings.setValue( "qgis/capitaliseLayerName", capitaliseCheckBox->isChecked() );
   settings.setValue( "qgis/askToSaveProjectChanges", chbAskToSaveProjectChanges->isChecked() );
   settings.setValue( "qgis/warnOldProjectVersion", chbWarnOldProjectVersion->isChecked() );
-  settings.setValue( "qgis/overlayPlacementAlgorithm", mOverlayAlgorithmComboBox->currentText() );
 
+  //overlay placement method
+  int overlayIndex = mOverlayAlgorithmComboBox->currentIndex();
+  if(overlayIndex == 1)
+  {
+    settings.setValue( "qgis/overlayPlacementAlgorithm", "Chain");
+  }
+  else if(overlayIndex == 2)
+  {
+    settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic tabu chain");
+  }
+  else if(overlayIndex == 3)
+  {
+    settings.setValue( "qgis/overlayPlacementAlgorithm",  "Popmusic tabu");
+  }
+  else if(overlayIndex == 4)
+  {
+    settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic chain");
+  }
+  else
+  {
+     settings.setValue( "qgis/overlayPlacementAlgorithm", "Central point" );
+  }
+
   if ( cmbTheme->currentText().length() == 0 )
   {
     settings.setValue( "/Themes", "default" );