combined two label functions into one (#2329)

1 files changed, 26 insertions, 39 deletions

diff --git a/SlideruleActivity.py b/SlideruleActivity.py
index ac362ff..2df2837 100644
--- a/SlideruleActivity.py
+++ b/SlideruleActivity.py
@@ -127,7 +127,7 @@ def _label_factory(label, toolbar):
     return my_label
 
 
-def _entry_factory(default_string, toolbar, tooltip='', max=15):
+def _entry_factory(default_string, toolbar, tooltip='', max=14):
     """ Factory for adding a text box to a toolbar """
     my_entry = gtk.Entry()
     my_entry.set_text(default_string)
@@ -211,10 +211,6 @@ class SlideruleActivity(activity.Activity):
                 self._calculate_function[i].set_text(
                     self.metadata['calculate' + str(i)])
                 self.custom_slides[i] = True
-            if 'results label' + str(i) in self.metadata:
-                self._results_label[i].set_text(
-                    self.metadata['results label' + str(i)])
-                self.custom_slides[i] = True
 
         function = self._predefined_function()
         if function is not None:
@@ -246,8 +242,6 @@ class SlideruleActivity(activity.Activity):
                     self._offset_function[i].get_text()
                 self.metadata['calculate' + str(i)] = \
                     self._calculate_function[i].get_text()
-                self.metadata['results label' + str(i)] = \
-                    self._results_label[i].get_text()
 
     def _hide_all(self):
         self._hide_top()
@@ -399,12 +393,11 @@ class SlideruleActivity(activity.Activity):
     def _set_custom_entries(self, slide, name):
         if not self.custom_slides[slide] and name in CUSTOM:
             self._offset_function[slide].set_text(CUSTOM[name][0])
-            self._label_function[slide].set_text(CUSTOM[name][1])
-            self._calculate_function[slide].set_text(CUSTOM[name][2])
-            self._results_label[slide].set_text(CUSTOM[name][3])
-            self._domain_min[slide].set_text(CUSTOM[name][4])
-            self._domain_max[slide].set_text(CUSTOM[name][5])
-            self._step_size[slide].set_text(CUSTOM[name][6])
+            self._calculate_function[slide].set_text(CUSTOM[name][1])
+            self._label_function[slide].set_text(CUSTOM[name][2])
+            self._domain_min[slide].set_text(CUSTOM[name][3])
+            self._domain_max[slide].set_text(CUSTOM[name][4])
+            self._step_size[slide].set_text(CUSTOM[name][5])
 
     # toolbar button callbacks
     def realign_cb(self, arg=None):
@@ -479,9 +472,8 @@ class SlideruleActivity(activity.Activity):
     def _customize(self, slide):
         self.custom_slides[slide] = True
         self.sr.make_custom_slide(self._offset_function[slide].get_text(),
-                                  self._label_function[slide].get_text(),
                                   self._calculate_function[slide].get_text(),
-                                  self._results_label[slide].get_text(),
+                                  self._label_function[slide].get_text(),
                                   self._domain_min[slide].get_text(),
                                   self._domain_max[slide].get_text(),
                                   self._step_size[slide].get_text(), slide)
@@ -565,9 +557,8 @@ class SlideruleActivity(activity.Activity):
                                               self.realign_cb, project_toolbar)
 
         self._offset_function = []
-        self._label_function = []
         self._calculate_function = []
-        self._results_label = []
+        self._label_function = []
         self._domain_min = []
         self._domain_max = []
         self._step_size = []
@@ -575,36 +566,32 @@ class SlideruleActivity(activity.Activity):
 
         self._offset_function.append(_entry_factory(CUSTOM['C'][0],
             custom_slide_toolbar, _('position function')))
-        self._label_function.append(_entry_factory(CUSTOM['C'][1],
-            custom_slide_toolbar, _('label function'), max=6))
-        self._calculate_function.append(_entry_factory(CUSTOM['C'][2],
+        self._calculate_function.append(_entry_factory(CUSTOM['C'][1],
             custom_slide_toolbar, _('results function')))
-        self._results_label.append(_entry_factory(CUSTOM['C'][3],
-            custom_slide_toolbar, _('results label function'), max=6))
-        self._domain_min.append(_entry_factory(CUSTOM['C'][4],
-            custom_slide_toolbar, _('domain minimum'), max=5))
-        self._domain_max.append(_entry_factory(CUSTOM['C'][5],
-            custom_slide_toolbar, _('domain maximum'), max=5))
-        self._step_size.append(_entry_factory(CUSTOM['C'][6],
-            custom_slide_toolbar, _('step size'), max=5))
+        self._label_function.append(_entry_factory(CUSTOM['C'][2],
+            custom_slide_toolbar, _('label function')))
+        self._domain_min.append(_entry_factory(CUSTOM['C'][3],
+            custom_slide_toolbar, _('domain minimum'), max=4))
+        self._domain_max.append(_entry_factory(CUSTOM['C'][4],
+            custom_slide_toolbar, _('domain maximum'), max=4))
+        self._step_size.append(_entry_factory(CUSTOM['C'][5],
+            custom_slide_toolbar, _('step size'), max=4))
         self.custom.append(_button_factory("custom-slide",
             _('create custom slide'), self._custom_slide_cb,
                                            custom_slide_toolbar))
 
         self._offset_function.append(_entry_factory(CUSTOM['D'][0],
             custom_stator_toolbar, _('position function')))
-        self._label_function.append(_entry_factory(CUSTOM['D'][1],
-            custom_stator_toolbar, _('label function'), max=6))
-        self._calculate_function.append(_entry_factory(CUSTOM['D'][2],
+        self._calculate_function.append(_entry_factory(CUSTOM['D'][1],
             custom_stator_toolbar, _('results function')))
-        self._results_label.append(_entry_factory(CUSTOM['D'][3],
-            custom_stator_toolbar, _('results label function'), max=6))
-        self._domain_min.append(_entry_factory(CUSTOM['D'][4],
-            custom_stator_toolbar, _('domain minimum'), max=5))
-        self._domain_max.append(_entry_factory(CUSTOM['D'][5],
-            custom_stator_toolbar, _('domain maximum'), max=5))
-        self._step_size.append(_entry_factory(CUSTOM['D'][6],
-            custom_stator_toolbar, _('step size'), max=5))
+        self._label_function.append(_entry_factory(CUSTOM['D'][2],
+            custom_stator_toolbar, _('label function')))
+        self._domain_min.append(_entry_factory(CUSTOM['D'][3],
+            custom_stator_toolbar, _('domain minimum'), max=4))
+        self._domain_max.append(_entry_factory(CUSTOM['D'][4],
+            custom_stator_toolbar, _('domain maximum'), max=4))
+        self._step_size.append(_entry_factory(CUSTOM['D'][5],
+            custom_stator_toolbar, _('step size'), max=4))
         self.custom.append(_button_factory("custom-stator",
             _('create custom stator'), self._custom_stator_cb,
                                            custom_stator_toolbar))