rework EnumType to use better Enum's

unfortunately IntEnum can't be bent like we would need it (extensible).
So we had to write our own....

The members of the Enum still behave like ints, but also have
.name and .value attributes, should they be needed.

needed adoptions to correctly use (and test) the EnumType are included.

Change-Id: Ie019d2f449a244c4fab00554b6c6daaac8948b59
Reviewed-on: https://forge.frm2.tum.de/review/17843
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>

secop/gui/nodectrl.py

@@ -211,12 +211,11 @@ class ReadableWidget(QWidget):
         if self._is_enum:
             self._map = {}  # maps QT-idx to name/value
             self._revmap = {}  # maps value/name to QT-idx
-            for idx, (val, name) in enumerate(
-                    sorted(datatype.entries.items())):
-                self._map[idx] = (name, val)
-                self._revmap[name] = idx
-                self._revmap[val] = idx
-                self.targetComboBox.addItem(name, val)
+            for idx, member in enumerate(datatype._enum.members):
+                self._map[idx] = member
+                self._revmap[member.name] = idx
+                self._revmap[member.value] = idx
+                self.targetComboBox.addItem(member.name, member.value)
 
         self._init_status_widgets()
         self._init_current_widgets()
@@ -298,7 +297,8 @@ class DrivableWidget(ReadableWidget):
 
     def update_current(self, value, qualifiers=None):
         if self._is_enum:
-            self.currentLineEdit.setText(self._map[self._revmap[value]][0])
+            member = self._map[self._revmap[value]]
+            self.currentLineEdit.setText('%s.%s (%d)' % (member.enum.name, member.name, member.value))
         else:
             self.currentLineEdit.setText(str(value))
 
@@ -333,5 +333,5 @@ class DrivableWidget(ReadableWidget):
         self.target_go(self.targetLineEdit.text())
 
     @pyqtSlot(unicode)
-    def on_targetComboBox_activated(self, stuff):
-        self.target_go(stuff)
+    def on_targetComboBox_activated(self, selection):
+        self.target_go(selection)

secop/gui/params/__init__.py

@@ -21,6 +21,8 @@
 #
 # *****************************************************************************
 
+from __future__ import print_function
+
 try:
     # py2
     unicode(u'')
@@ -32,6 +34,7 @@ from secop.gui.qt import QWidget, QLabel, QPushButton as QButton, QLineEdit, \
 
 from secop.gui.util import loadUi
 from secop.datatypes import EnumType
+from secop.lib import formatExtendedStack
 
 
 class ParameterWidget(QWidget):
@@ -94,15 +97,12 @@ class EnumParameterWidget(GenericParameterWidget):
         loadUi(self, 'parambuttons_select.ui')
 
         # transfer allowed settings from datatype to comboBoxes
-        self._map = {}  # maps index to enumstring
-        self._revmap = {}  # maps enumstring to index
-        index = 0
-        for enumval, enumname in sorted(self._datatype.entries.items()):
-            self.setComboBox.addItem(enumname, enumval)
-            self._map[index] = (enumval, enumname)
-            self._revmap[enumname] = index
-            self._revmap[enumval] = index
-            index += 1
+        self._map = {}  # maps index to EnumMember
+        self._revmap = {}  # maps Enum.name + Enum.value to index
+        for index, member in enumerate(self._datatype._enum.members):
+            self.setComboBox.addItem(member.name, member.value)
+            self._map[index] = member
+            self._revmap[member.name] = self._revmap[member.value] = index
         if self._readonly:
             self.setLabel.setEnabled(False)
             self.setComboBox.setEnabled(False)
@@ -115,19 +115,16 @@ class EnumParameterWidget(GenericParameterWidget):
 
     @pyqtSlot()
     def on_setPushButton_clicked(self):
-        _enumval, enumname = self._map[self.setComboBox.currentIndex()]
-        self.setRequested.emit(self._module, self._paramcmd, enumname)
+        member = self._map[self.setComboBox.currentIndex()]
+        self.setRequested.emit(self._module, self._paramcmd, member)
 
     def updateValue(self, value):
         try:
-            value = int(value)
-        except ValueError:
-            pass
-        if value in self._revmap:
-            index = self._revmap[value]
-            self.currentLineEdit.setText('(%d): %s' % self._map[index])
-        else:
+            member = self._map[self._revmap[int(value)]]
+            self.currentLineEdit.setText('%s.%s (%d)' % (member.enum.name, member.name, member.value))
+        except Exception:
             self.currentLineEdit.setText('undefined Value: %r' % value)
+            print(formatExtendedStack())
 
 
 class GenericCmdWidget(ParameterWidget):

secop/gui/valuewidgets.py

@@ -62,16 +62,14 @@ class EnumWidget(QComboBox):
 
         self._map = {}
         self._revmap = {}
-        for idx, (val, name) in enumerate(datatype.entries.items()):
-            self._map[idx] = (name, val)
-            self._revmap[name] = idx
-            self._revmap[val] = idx
-            self.addItem(name, val)
-        # XXX: fill Combobox from datatype
+        for idx, member in enumerate(datatype._enum.members):
+            self._map[idx] = member
+            self._revmap[member.name] = idx
+            self._revmap[member.value] = idx
+            self.addItem(member.name, member.value)
 
     def get_value(self):
-        # XXX: return integer corresponding to the selected item
-        return self._map[self.currentIndex()][1]
+        return self._map[self.currentIndex()].value
 
     def set_value(self, value):
         self.setCurrentIndex(self._revmap[value])