fix get LogEntry

Author: z3rone

native_fisher_py/python/native_fisher_py/data/classes.py

@@ -702,6 +702,22 @@ def length(self): return len(self._values)
     @property
     def values(self): return self._values
 
+    def keys(self):
+        return [l.strip().rstrip(':') for l in self._labels]
+
+    def __getitem__(self, key):
+        clean_key = key.strip().rstrip(':')
+        for i, label in enumerate(self._labels):
+            if label.strip().rstrip(':') == clean_key:
+                return self._values[i]
+        raise KeyError(key)
+
+    def get(self, key, default=None):
+        try:
+            return self[key]
+        except KeyError:
+            return default
+
 class HeaderItem(CommonCoreDataObject):
     def __init__(self, data):
         if "###TYPE###" in data:

native_fisher_py/python/native_fisher_py/raw_file.py

@@ -246,23 +246,32 @@ def get_instrument_count_of_type(self, device_type):
 
     def get_trailer_extra_information(self, scan_number): 
         from .data.classes import LogEntry
-        return LogEntry(get_trailer_extra_values(scan_number))
+        labels = [h.label for h in self.get_trailer_extra_header_information()]
+        return LogEntry(get_trailer_extra_values(scan_number), labels)
+
     def get_trailer_extra_header_information(self): 
         from .data.classes import HeaderItem
         return [HeaderItem(h) for h in get_trailer_extra_header()]
-    def get_trailer_extra_values(self, scan_number, formatted): 
+
+    def get_trailer_extra_values(self, scan_number, formatted=False): 
         return get_trailer_extra_values(scan_number)
+
     def get_status_log_header_information(self): 
         from .data.classes import HeaderItem
         return [HeaderItem(h) for h in get_status_log_header()]
-    def get_status_log_values(self, scan_number, formatted):
+
+    def get_status_log_values(self, scan_number, formatted=False):
         from .data.classes import LogEntry
-        return LogEntry(get_status_log_values(scan_number))
+        labels = [h.label for h in self.get_status_log_header_information()]
+        return LogEntry(get_status_log_values(scan_number), labels)
+
     def get_status_log_entries_count(self): 
         return get_status_log_count()
+
     def get_status_log_for_retention_time(self, rt):
         from .data.classes import LogEntry
-        return LogEntry(get_status_log_values_for_rt(rt))
+        labels = [h.label for h in self.get_status_log_header_information()]
+        return LogEntry(get_status_log_values_for_rt(rt), labels)
     def get_tune_data_count(self): 
         return get_tune_data_count()
     def get_tune_data(self, index): return None