mwxlib 0.99.0__py3-none-any.whl → 1.7.13__py3-none-any.whl

mwx/mgplt.py

@@ -16,16 +16,16 @@ class Gnuplot:
     """Gnuplot backend - gnuplot pipe wrapper.
     """
     debug = 0
-    
-    PGNUPLOT = "gnuplot" # Note: gnuplot/pgnuplot is integrated
-    
+
+    PGNUPLOT = "gnuplot"  # Note: gnuplot/pgnuplot is integrated
+
     @staticmethod
     def init_path(path):
         if not os.path.isdir(path):
             print("- {!r} is not a directory.".format(path))
             return False
         os.environ['PATH'] = "{};{}".format(path, os.environ['PATH'])
-    
+
     def __init__(self, startup="__init__.plt", debug=0):
         print("Launching new gnuplot...")
         self.__gnuplot = Popen([self.PGNUPLOT],
@@ -36,13 +36,13 @@ class Gnuplot:
         self.tempfile = tempfile.mktemp()
         self.debug = debug
         self.reset()
-    
+
     def __del__(self):
         print("bye gnuplot...")
         self.terminate()
         if os.path.isfile(self.tempfile):
             os.remove(self.tempfile)
-    
+
     def __call__(self, text):
         for cmd in filter(None, (t.strip() for t in text.splitlines())):
             self.__gnuplot.stdin.write((cmd + '\n').encode())
@@ -50,9 +50,9 @@ class Gnuplot:
                 print("pgnupot>", cmd)
         self.__gnuplot.stdin.flush()
         return self
-    
+
     def plot(self, *args):
-        if isinstance(args[0], str): # text command
+        if isinstance(args[0], str):  # text command
             pcmd = [v.strip() for v in args]
             if pcmd[-1].endswith(','):
                 pcmd[-1] = pcmd[-1][:-1]
@@ -76,22 +76,22 @@ class Gnuplot:
             for v in args:
                 if not isinstance(v, str):
                     data.append(v)
-                    if len(data) - len(opts) > 1: # opts 指定が省略されたのでデフォルト指定
+                    if len(data) - len(opts) > 1:  # opts 指定が省略されたのでデフォルト指定
                         opts.append("w l")
                 else:
                     opts.append(v)
             
-            while len(data) > len(opts): # opts 指定の数が足りない場合 (maybe+1)
+            while len(data) > len(opts):  # opts 指定の数が足りない場合 (maybe+1)
                 opts.append("w l")
             
-            pcmd = ["tempfile using 1:{} {}".format(j+2,opt) for j,opt in enumerate(opts)]
+            pcmd = ["tempfile using 1:{} {}".format(j+2, opt) for j, opt in enumerate(opts)]
             data = np.vstack((axis, data))
             with open(self.tempfile, 'w') as o:
                 for v in data.T:
                     o.write('\t'.join(self.data_format(x) for x in v) + '\n')
         
         self("plot " + ', '.join(pcmd))
-    
+
     def terminate(self):
         if self.__gnuplot is not None:
             try:
@@ -101,21 +101,21 @@ class Gnuplot:
             except Exception:
                 pass
             self.__gnuplot = None
-    
+
     def restart(self):
         self.terminate()
         self.__init__(self.startupfile)
-    
+
     def reset(self, startup=None):
         if startup:
             self.startupfile = startup
         if self.startupfile:
             self("load '{}'".format(self.startupfile))
         self("tempfile = '{}'".format(self.tempfile))
-    
+
     def wait(self, msg=""):
         input(msg + " (Press ENTER to continue)")
-    
+
     def edit(self):
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", ResourceWarning)
@@ -129,7 +129,7 @@ class GnuplotFrame(mwx.Frame):
         mwx.Frame.__init__(self, *args, **kwargs)
         
         self.gnuplot = Gnuplot()
-        self.panel = GnuplotPanel(self)
+        self.panel = ControlPanel(self)
         
         self.menubar["Edit"] = [
             (wx.ID_COPY, "&Copy params\tCtrl-c", "Copy params to clipboard",
@@ -139,7 +139,7 @@ class GnuplotFrame(mwx.Frame):
                 lambda v: self.panel.paste_from_clipboard()),
             (),
             (wx.ID_RESET, "&Reset params\tCtrl-n", "Reset params to ini-value",
-                lambda v: self.panel.set_params()),
+                lambda v: self.panel.reset_params()),
         ]
         self.menubar["Gnuplot"] = [
             (mwx.ID_(80), "&Gnuplot setting\tCtrl-g", "Edit settings",
@@ -152,9 +152,7 @@ class GnuplotFrame(mwx.Frame):
                 lambda v: self.gnuplot.restart()),
         ]
         self.menubar.reset()
-    
+
     def Destroy(self):
-        try:
-            del self.gnuplot
-        finally:
-            return mwx.Frame.Destroy(self)
+        del self.gnuplot
+        return mwx.Frame.Destroy(self)