From a672ab3dc2a29945a70d14256bb902467df4122f Mon Sep 17 00:00:00 2001
From: "matthias@arch" <matthiasqui@protonmail.com>
Date: Thu, 17 Aug 2023 01:19:03 +0200
Subject: [PATCH] merge

---
 m_teng/m_teng_interactive.py |  6 +++--
 m_teng/utility/data.py       | 45 ++++++++++++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/m_teng/m_teng_interactive.py b/m_teng/m_teng_interactive.py
index 863c4e0..aa40b3d 100644
--- a/m_teng/m_teng_interactive.py
+++ b/m_teng/m_teng_interactive.py
@@ -66,7 +66,9 @@ from m_teng.utility.data import load_dataframe
 from m_teng.utility import file_io
 from m_teng.update_funcs import _Monitor, _ModelPredict, _update_print
 
-config_path = path.expanduser("~/.config/k-teng.json")
+from m_teng.backends import keithley as _keithley
+
+config_path = path.expanduser("~/.config/m-teng.json")
 
 _runtime_vars = {
     "last-measurement": ""
@@ -75,7 +77,7 @@ _runtime_vars = {
 settings = {
     "datadir":      path.expanduser("~/data"),
     "name":         "measurement",
-    "interval":     0.05,
+    "interval":     0.02,
     "beep":         True,
 }
 
diff --git a/m_teng/utility/data.py b/m_teng/utility/data.py
index 1980429..1b82ae2 100644
--- a/m_teng/utility/data.py
+++ b/m_teng/utility/data.py
@@ -1,11 +1,13 @@
 import pandas as pd
 import numpy as np
 from os import path
+import matplotlib.pyplot as plt
 
-def buffer2dataframe(buffer):
-    df = pd.DataFrame(buffer)
-    df.colums = ["Time [s]", "Voltage [V]"]
-    return df
+# deprecated
+# def buffer2dataframe(buffer):
+#     df = pd.DataFrame(buffer)
+#     df.colums = ["Time [s]", "Voltage [V]"]
+#     return df
 
 def buffers2dataframe(ibuffer, vbuffer):
     """
@@ -30,3 +32,38 @@ def load_dataframe(p:str):
     else:
         df = pd.read_pickle(p)
     return df
+
+def plot(data: str or pd.DataFrame or np.ndarray, title="", U=True, I=False):
+    """
+    Plot recorded data
+    @param data: filepath, dataframe or numpy array
+    """
+    if type(data) == str:
+        _data = load_dataframe(data).to_numpy()
+    elif type(data) == pd.DataFrame:
+        _data = data.to_numpy()
+    else:
+        _data = data
+    print(_data[0])
+    plt.ion()
+    fig, ax = plt.subplots()
+    ax.set_xlabel("t [s]")
+    vax = ax
+    iax = ax
+    if U and I:
+        iax = ax.twinx()
+    if U:
+        vax = ax
+        vax.set_ylabel("U [V]")
+        vax.plot(_data[:,0], _data[:,2], color="blue", label="voltage")
+    if I:
+        iax.set_ylabel("I [A]")
+        iax.plot(_data[:,0], _data[:,1], color="orange", label="current")
+    if U and I:
+        plt.legend()
+    return fig
+
+
+
+
+