From 3a1b15a65b708118478f39c9dda98c7578882a83 Mon Sep 17 00:00:00 2001
From: Laura Sebesta <laurici@188-25-141-21.rdsnet.ro>
Date: Tue, 22 May 2012 00:40:01 +0300
Subject: [PATCH] Reworked scale plot entry to have a more descriptive name and
 function.

---
 .../plugins/scope/scopegadgetoptionspage.cpp  | 32 +++++++++----------
 .../plugins/scope/scopegadgetoptionspage.ui   |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.cpp b/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.cpp
index ec17108ba..b9ed9191e 100644
--- a/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.cpp
+++ b/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.cpp
@@ -72,22 +72,22 @@ QWidget* ScopeGadgetOptionsPage::createPage(QWidget *parent)
     if(options_page->cmbUAVObjects->currentIndex() >= 0)
         on_cmbUAVObjects_currentIndexChanged(options_page->cmbUAVObjects->currentText());
 
-    options_page->cmbScale->addItem("E-9", -9);
-    options_page->cmbScale->addItem("E-6", -6);
-    options_page->cmbScale->addItem("E-5",-5);
-    options_page->cmbScale->addItem("E-4",-4);
-    options_page->cmbScale->addItem("E-3",-3);
-    options_page->cmbScale->addItem("E-2",-2);
-    options_page->cmbScale->addItem("E-1",-1);
-    options_page->cmbScale->addItem("E0",0);
-    options_page->cmbScale->addItem("E1",1);
-    options_page->cmbScale->addItem("E2",2);
-    options_page->cmbScale->addItem("E3",3);
-    options_page->cmbScale->addItem("E4",4);
-    options_page->cmbScale->addItem("E5",5);
-    options_page->cmbScale->addItem("E6",6);
-    options_page->cmbScale->addItem("E9",9);
-    options_page->cmbScale->addItem("E12",12);
+    options_page->cmbScale->addItem("10^-9", -9);
+    options_page->cmbScale->addItem("10^-6", -6);
+    options_page->cmbScale->addItem("10^-5",-5);
+    options_page->cmbScale->addItem("10^-4",-4);
+    options_page->cmbScale->addItem("10^-3",-3);
+    options_page->cmbScale->addItem("10^-2",-2);
+    options_page->cmbScale->addItem("10^-1",-1);
+    options_page->cmbScale->addItem("1",0);
+    options_page->cmbScale->addItem("10^1",1);
+    options_page->cmbScale->addItem("10^2",2);
+    options_page->cmbScale->addItem("10^3",3);
+    options_page->cmbScale->addItem("10^4",4);
+    options_page->cmbScale->addItem("10^5",5);
+    options_page->cmbScale->addItem("10^6",6);
+    options_page->cmbScale->addItem("10^9",9);
+    options_page->cmbScale->addItem("10^12",12);
     options_page->cmbScale->setCurrentIndex(7);
 
     //Set widget values from settings
diff --git a/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.ui b/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.ui
index 320c3d314..64a331917 100644
--- a/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.ui
+++ b/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.ui
@@ -202,7 +202,7 @@
        <item row="8" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
-          <string>Scale:</string>
+          <string>Y-axis scale factor:</string>
          </property>
         </widget>
        </item>