add utils.py

plotter/Plotter.py

@@ -9,6 +9,7 @@ from .ProcData import ProcData
 import copy
 from matplotlib.cm import ScalarMappable
 
+
 class Plotter:
     ani_pngs_dir = "plotter_lib_pngs/"
 
@@ -43,7 +44,6 @@ class Plotter:
             names = d.variable_names
             var_names.append(np.array(names, dtype=object))
 
-            
         if (len(var_names) > 1):
             for i in range(1, len(var_names)):
                 if np.equal(var_names[0], var_names[i]).any() != True:
@@ -55,7 +55,6 @@ class Plotter:
 
         self.file_column_names = var_names[0]
 
-
     def set(self, args, **kwargs):
         self.__check_arg_dim_equiv(args)
         self.filename = args.filename
@@ -113,12 +112,13 @@ class Plotter:
             else:
                 plt.plot(self.file_data[0].data[x_name], self.file_data[0].data[y_name], linewidth=4)
 
-
         plt.legend(self.var)
         plt.xlabel(x_name, fontsize=10, fontweight='bold')
 
-        if self.if_manual_plot: plt.show()
-        else: plt.close(fig)
+        if self.if_manual_plot:
+            plt.show()
+        else:
+            plt.close(fig)
         if self.if_save_result: fig.savefig(self.out + self.oname[0])
 
     def __get_min_max_ax(self):
@@ -147,7 +147,6 @@ class Plotter:
 
         self.min_max_var_vals = np.array([min_val, max_val])
 
-
     def __ani_plot(self):
         if self.if_save_result:
             png_names = []
@@ -234,7 +233,8 @@ class Plotter:
             Y = self.file_data[0].data[y_name]
             Z = self.file_data[0].data[self.var[i]]
 
-            vmin = min_val[self.var[i]]; vmax = max_val[self.var[i]];
+            vmin = min_val[self.var[i]];
+            vmax = max_val[self.var[i]];
 
             levels = np.linspace(vmin, vmax, 25)
             if self.function == self.plot_diff:
@@ -253,8 +253,10 @@ class Plotter:
             ax.set_xlabel(x_name)
             ax.set_ylabel(y_name)
 
-            if self.if_manual_plot: plt.show()
-            else: plt.close(fig)
+            if self.if_manual_plot:
+                plt.show()
+            else:
+                plt.close(fig)
             if self.if_save_result: fig.savefig(self.out + fig_names[i] + fig_end)
 
     def __get_min_max_bar(self):
@@ -366,7 +368,6 @@ class Plotter:
         avg_data = np.average(matrix_data, axis=(1, 0))
         return avg_data
 
-
     def __avg_plot(self):
         os.system("mkdir -p " + self.out)
         fig = plt.figure()
@@ -384,8 +385,10 @@ class Plotter:
         plt.legend(self.var)
         plt.xlabel(x_name, fontsize=10, fontweight='bold')
 
-        if self.if_manual_plot: plt.show()
-        else: plt.close(fig)
+        if self.if_manual_plot:
+            plt.show()
+        else:
+            plt.close(fig)
         if self.if_save_result: fig.savefig(self.out + self.oname[0])
 
     def __dump(self):
@@ -452,6 +455,6 @@ class Plotter:
     def plot_diff(self):
         self.__plot_diff()
 
-    def get_data(self):
+    def get_data(self) -> list:
         return_data = [copy.deepcopy(data.data) for data in self.file_data]
         return return_data

plotter/__init__.py

@@ -8,4 +8,5 @@ from .main import ani_plot_contour
 from .main import avg_plot
 from .main import plot_diff
 from .main import get_data
+from .utils import utils
 

plotter/main.py

@@ -7,6 +7,7 @@ import os
 manual_plot=False
 save_result=True
 
+
 def dump(filename, var=[None], mval=[None]):
     Plot = Plotter()
     args = Args([filename], Plot.dump, var, mval, oname=[None], out=[None])
@@ -72,3 +73,4 @@ def get_data(filename, ndim):
     Plot.set(args, if_manual_plot=manual_plot, if_save_result=save_result)
     data = Plot.get_data()
     return data
+

plotter/utils.py

+from .Plotter import Plotter
+
+class utils:
+    pole = 'russkoe'
+
+    def __init__(self):
+        self.pl = Plotter()
+
+    def plot_diff(self):
+        print('hello world')