added data_pool_tab to tst

added placeholder in s2k
small change in code order in tm_management

Ccs/s2k_partypes.py

@@ -36,7 +36,7 @@ ptt = {
         11: 'uint11', 12: 'uint12', 13: 'uint13', 14: 'uint14', 15: 'uint15', 16: 'H', 17: 'uint17', 18: 'uint18',
         19: 'uint19', 20: 'uint20', 21: 'uint21', 22: 'uint22', 23: 'uint23', 24: 'I24', 25: 'uint25', 26: 'uint26',
         27: 'uint27', 28: 'uint28', 29: 'uint29', 30: 'uint30', 31: 'uint31', 32: 'I'},
-    7: {0: 'vOCT', 382: '382s'},
+    7: {0: 'vOCT', 1: 'placeholder', 12: 'placeholder', 382: '382s'},
     8: {0: 'vASCII', 382: '382s'},
     9: {17: 'CUC917', 18: 'CUC918'},
     11: {0: 'deduced'},

Tst/tst/data_pool_tab.py

+import gi
+
+gi.require_version("Gtk", "3.0")
+gi.require_version("GtkSource", "3.0")
+from gi.repository import Gtk, Gdk, GtkSource
+import confignator
+import sys
+sys.path.append(confignator.get_option('paths', 'ccs'))
+import ccs_function_lib as cfl
+import s2k_partypes as s2k
+
+
+dictionary_of_data_pool = cfl.get_data_pool_items()
+list_of_data_pool = list(dictionary_of_data_pool.keys())
+
+data_pool_sublist = []
+
+pid_list = []
+
+def get_data_pool_sublist():
+    for counter in list_of_data_pool:
+        pcf_pid = str(counter[0])
+        pcf_descr = str(counter[1])
+        pcf_ptc = counter[2]
+        pcf_pfc = counter[3]
+
+        if pcf_ptc == None:
+            data_type = "None"
+        else:
+            data_type = s2k.ptt[pcf_ptc][pcf_pfc]
+
+        if pcf_pid not in pid_list:
+            pid_list.append(pcf_pid)
+
+        data_pool_sublist.append([pcf_pid, pcf_descr, data_type])
+
+    return data_pool_sublist, pid_list
+
+data_pool_sublist, pid_list = get_data_pool_sublist()
+print(data_pool_sublist)
+print(pid_list)
+
+
+
+
+class DataPoolTable(Gtk.Grid):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.data_pool_liststore = Gtk.ListStore(str, str, str)
+        for data_pool_ref in data_pool_sublist:
+            self.data_pool_liststore.append(list(data_pool_ref))
+        self.current_filter_data_pool = None
+
+        # Creating the filter, feeding it with the liststore model
+        self.data_pool_filter = self.data_pool_liststore.filter_new()
+        # setting the filter function
+        self.data_pool_filter.set_visible_func(self.data_pool_filter_func)
+
+        # Create ListStores for the ComboBoxes
+        self.pid_liststore = Gtk.ListStore(str)
+        for pid_ref in pid_list:
+            self.pid_liststore.append([pid_ref, ])
+        # self.current_filter_type = None
+
+        """
+        self.pid_combo = Gtk.ComboBox.new_with_model(self.pid_liststore)
+        self.pid_combo.connect("changed", self.on_pid_combo_changed)
+        renderer_text = Gtk.CellRendererText()
+        self.pid_combo.pack_start(renderer_text, True)
+        self.pid_combo.add_attribute(renderer_text, "text", 0)
+        self.attach(self.pid_combo, 0, 0, 1, 1)
+
+        self.clear_button = Gtk.Button(label="Clear")
+        self.clear_button.connect("clicked", self.on_clear_button_clicked)
+        self.attach_next_to(
+            self.clear_button, self.pid_combo, Gtk.PositionType.RIGHT, 1, 1
+        )
+        """
+
+        # creating the treeview, making it use the filter a model, adding columns
+        self.treeview = Gtk.TreeView.new_with_model(Gtk.TreeModelSort(self.data_pool_filter))
+        for i, column_title in enumerate(
+            ["pcf_pid", "pcf_descr", "datatype"]
+        ):
+            renderer = Gtk.CellRendererText()
+            column = Gtk.TreeViewColumn(column_title, renderer, text=i)
+            column.set_sort_column_id(i)
+            self.treeview.append_column(column)
+
+        # Handle selection
+        self.selected_row = self.treeview.get_selection()
+        self.selected_row.connect("changed", self.item_selected)
+
+        # setting up layout, treeview in scrollwindow
+        self.scrollable_treelist = Gtk.ScrolledWindow()
+        self.scrollable_treelist.set_vexpand(True)
+        self.scrollable_treelist.set_hexpand(True)
+        self.attach(self.scrollable_treelist, 0, 1, 8, 10)
+
+        self.scrollable_treelist.add(self.treeview)
+
+
+        self.show_all()
+
+    def on_pid_combo_changed(self, combo):
+        combo_iter = combo.get_active_iter()
+        if combo_iter is not None:
+            model = combo.get_model()
+            number = model[combo_iter][0]
+            self.current_filter_data_pool = int(number)
+
+        self.data_pool_filter.refilter()
+
+
+    def on_clear_button_clicked(self, widget):
+        self.current_filter_data_pool = None
+        self.data_pool_filter.refilter()
+
+
+    def item_selected(self, selection):
+        model, row = selection.get_selected()
+        if row is not None:
+            pass
+
+
+
+    def data_pool_filter_func(self, model, iter, data):
+
+        if (
+                self.current_filter_data_pool is None
+                or self.current_filter_data_pool == "None"
+        ):
+            return True
+        else:
+            return model[iter][0] == self.current_filter_data_pool

Tst/tst/tm_management.py

 #!/usr/bin/env python3
 import gi
-import s2k_partypes as s2k
 
 
 gi.require_version("Gtk", "3.0")
@@ -10,7 +9,7 @@ import confignator
 import sys
 sys.path.append(confignator.get_option('paths', 'ccs'))
 import ccs_function_lib as cfl
-
+import s2k_partypes as s2k
 
 dictionary_of_tms = cfl.get_tm_id()
 

Tst/tst/tst.py

@@ -23,11 +23,17 @@ import dbus
 import toolbox
 import tc_management as tcm
 import tm_management as tmm
+import data_pool_tab as dpt
 
 import json_to_barescript
 import json_to_csv
+
 import spec_to_json
 
+#print("!!!!!!!")
+#dictionary_of_data_pool = cfl.get_data_pool_items
+#print(dictionary_of_data_pool.keys())
+
 # creating lists for type and subtype to get rid of duplicate entries, for TC List
 
 
@@ -325,13 +331,11 @@ class TstAppWindow(Gtk.ApplicationWindow):
         self.label_widget_telemetry.set_text('TM Table')
         self.feature_area.append_page(child=self.telemetry, tab_label=self.label_widget_telemetry)
 
-
-        """
-        self.tcm = TCTableClass()
-        self.label_widget_tcm = Gtk.Label()
-        self.label_widget_tcm.set_text('TC Table')
-        self.feature_area.append_page(child=self.tcm, tab_label=self.label_widget_tcm)
-        """
+        # data pool list tab
+        self.data_pool_tab = dpt.DataPoolTable()
+        self.label_widget_data_pool = Gtk.Label()
+        self.label_widget_data_pool.set_text('Data Pool')
+        self.feature_area.append_page(child=self.data_pool_tab, tab_label=self.label_widget_data_pool)