Just get the index of the column from the tabel model directly

slaclab · Jan 20, 2022 · 450169c · 450169c
1 parent 3c67b6f
commit 450169c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/pydm/tests/widgets/test_curve_editor.py b/pydm/tests/widgets/test_curve_editor.py
@@ -27,10 +27,10 @@ def test_waveform_curve_editor(qtbot):
     # Verify that the drop downs for columns with non built-in types are all put in the correct place
     # Note: We do need to check these on each individual type of curve editor (see below tests) and not just
     # in the base plot editor since each plot type can have varying numbers of columns
-    color_index = table_model._column_names.index('Color')
-    line_style_index = table_model._column_names.index('Line Style')
-    symbol_index = table_model._column_names.index('Symbol')
-    redraw_mode_index = table_model._column_names.index('Redraw Mode')
+    color_index = table_model.getColumnIndex('Color')
+    line_style_index = table_model.getColumnIndex('Line Style')
+    symbol_index = table_model.getColumnIndex('Symbol')
+    redraw_mode_index = table_model.getColumnIndex('Redraw Mode')
 
     assert type(table_view.itemDelegateForColumn(color_index)) is ColorColumnDelegate
     assert type(table_view.itemDelegateForColumn(line_style_index)) is LineColumnDelegate
@@ -57,9 +57,9 @@ def test_timeplot_curve_editor(qtbot):
     assert table_model.columnCount() == 8
 
     # Verify that the drop downs for columns with non built-in types are all put in the correct place
-    color_index = table_model._column_names.index('Color')
-    line_style_index = table_model._column_names.index('Line Style')
-    symbol_index = table_model._column_names.index('Symbol')
+    color_index = table_model.getColumnIndex('Color')
+    line_style_index = table_model.getColumnIndex('Line Style')
+    symbol_index = table_model.getColumnIndex('Symbol')
 
     assert type(table_view.itemDelegateForColumn(color_index)) is ColorColumnDelegate
     assert type(table_view.itemDelegateForColumn(line_style_index)) is LineColumnDelegate
@@ -85,10 +85,10 @@ def test_scatterplot_editor(qtbot):
     assert table_model.columnCount() == 11
 
     # Verify that the drop downs for columns with non built-in types are all put in the correct place
-    color_index = table_model._column_names.index('Color')
-    line_style_index = table_model._column_names.index('Line Style')
-    symbol_index = table_model._column_names.index('Symbol')
-    redraw_mode_index = table_model._column_names.index('Redraw Mode')
+    color_index = table_model.getColumnIndex('Color')
+    line_style_index = table_model.getColumnIndex('Line Style')
+    symbol_index = table_model.getColumnIndex('Symbol')
+    redraw_mode_index = table_model.getColumnIndex('Redraw Mode')
 
     assert type(table_view.itemDelegateForColumn(color_index)) is ColorColumnDelegate
     assert type(table_view.itemDelegateForColumn(line_style_index)) is LineColumnDelegate

diff --git a/pydm/widgets/baseplot_table_model.py b/pydm/widgets/baseplot_table_model.py
@@ -136,6 +136,10 @@ def append(self, name=None, color=None):
     def removeAtIndex(self, index):
         pass
 
+    def getColumnIndex(self, column_name):
+        """ Returns the column index of the name. Raises a ValueError if it's not a valid column name """
+        return self._column_names.index(column_name)
+
     def needsColorDialog(self, index):
         column_name = self._column_names[index.column()]
         if column_name == "Color":

diff --git a/pydm/widgets/scatterplot_curve_editor.py b/pydm/widgets/scatterplot_curve_editor.py
@@ -72,4 +72,4 @@ def __init__(self, plot, parent=None):
 
         self.setup_delegate_columns(index=3)
         redraw_mode_delegate = RedrawModeColumnDelegate(self)
-        self.table_view.setItemDelegateForColumn(9, redraw_mode_delegate)
+        self.table_view.setItemDelegateForColumn(self.table_model.getColumnIndex("Redraw Mode"), redraw_mode_delegate)
diff --git a/pydm/widgets/waveformplot_curve_editor.py b/pydm/widgets/waveformplot_curve_editor.py
@@ -68,4 +68,4 @@ def __init__(self, plot, parent=None):
 
         self.setup_delegate_columns(index=3)
         redraw_mode_delegate = RedrawModeColumnDelegate(self)
-        self.table_view.setItemDelegateForColumn(9, redraw_mode_delegate)
+        self.table_view.setItemDelegateForColumn(self.table_model.getColumnIndex("Redraw Mode"), redraw_mode_delegate)