diff --git a/plotter/Plotter.py b/plotter/Plotter.py index 96a2a2128c3ee299f8e562fe28c9627e32b99476..d8effa125be27bb6cc32ee7d7bed427fc3259255 100755 --- a/plotter/Plotter.py +++ b/plotter/Plotter.py @@ -404,7 +404,7 @@ class Plotter: def __dump(self): for variable_name in self.file_column_names: - print(variable_name, end=' ') + print(variable_name, end='; ') print('\n') def __plot_diff(self): diff --git a/plotter/ProcData.py b/plotter/ProcData.py index e67f9fbcd4334dd2cf4d23d8b6d673d7b4c91af3..e3183eb18ab4fe33018696555f872d5c53756724 100755 --- a/plotter/ProcData.py +++ b/plotter/ProcData.py @@ -82,6 +82,21 @@ class ProcData: self.variable_names += varnames self.variable_names = np.array(self.variable_names, dtype=object) + + def __get_variable_names_dsq(self): + STIRNG_TERMINATOR = '\x00' + INT_LEN = 4 + TIME_VAR_NUM = 0 + + f = open(self.filename, 'rb') + + nvars = int.from_bytes(f.read(INT_LEN), byteorder='little') + names_len = int.from_bytes(f.read(INT_LEN), byteorder='little') + len(STIRNG_TERMINATOR) + + self.variable_names = [] + self.variable_names.append('time') + for _ in range(nvars): + self.variable_names.append(str(f.read(names_len), encoding='utf-8').strip(STIRNG_TERMINATOR)) def __read_plt(self, ndim): with open(self.filename, "r") as file: @@ -313,4 +328,6 @@ class ProcData: if filename_extension == '.plt': self.__get_variable_names_plt() elif filename_extension == '.nsx': - self.__get_variable_names_bin() \ No newline at end of file + self.__get_variable_names_bin() + elif filename_extension == '.dsq': + self.__get_variable_names_dsq() \ No newline at end of file