graphic plot add clear btn and update help

Author: Neutree

COMTool/plugins/graph.py

@@ -50,11 +50,15 @@ class Plugin(Plugin_Base):
     enabled = False          # user enabled this plugin
     active  = False          # using this plugin
 
-    help = '{}<br><br>{}<br>Python:<br><pre>{}</pre><br>C/C++:<br><pre>{}</pre>'.format(_("Double click graph item to add a graph widget"), _("line chart plot protocol:"),
+    help = '{}<br><br>{}<br><h2>Python</h2><br><pre>{}</pre><p><p>{}<br>{}</p><p>{}</p></p><br><h2>C/C++</h2><br><pre>{}</pre>'.format(
+        _("Double click graph item to add a graph widget"), _("line chart plot protocol:"),
 '''
-from COMTool.plugin import graph_protocol
+from COMTool.plugins import graph_protocol
 frame = graph_protocol.plot_pack(name, x, y, header= b'\\xAA\\xCC\\xEE\\xBB')
 ''',
+        _("Full demo see:"),
+        '<a href="https://github.com/Neutree/COMTool/tree/master/tool/send_curve_demo.py">https://github.com/Neutree/COMTool/tree/master/tool/send_curve_demo.py</a>',
+        _("Install comtool by <code>pip install comtool</code> first"),
 '''
 void plot_pack(uint8_t *buff, int buff_len,
                uint8_t *header, int header_len,

COMTool/plugins/graph_widgets.py

@@ -47,6 +47,7 @@ def __init__(self, parent=None, hintSignal=lambda type, title, msg: None, rmCall
         self.plotWin.setMinimumHeight(200)
         pg.setConfigOptions(antialias=True)
         rmBtn = QPushButton(_("Remove"))
+        clearBtn = QPushButton(_("Clear"))
         rangeLabel = QLabel(_("Range:"))
         rangeConf = QLineEdit(str(self.config["xRange"]))
         rangeEnable = QCheckBox(_("Enable"))
@@ -63,6 +64,7 @@ def __init__(self, parent=None, hintSignal=lambda type, title, msg: None, rmCall
         rangeConf.setValidator(validator)
         self.layout.addWidget(self.plotWin, 0, 0, 1, 3)
         self.layout.addWidget(rmBtn, 1, 0, 1, 1)
+        self.layout.addWidget(clearBtn, 1, 2, 1, 1)
         self.layout.addWidget(rangeLabel, 2, 0, 1, 1)
         self.layout.addWidget(rangeConf, 2, 1, 1, 1)
         self.layout.addWidget(rangeEnable, 2, 2, 1, 1)
@@ -111,10 +113,18 @@ def __init__(self, parent=None, hintSignal=lambda type, title, msg: None, rmCall
             lambda: self.setHeader(headerConf.text()))
         rmBtn.clicked.connect(self.remove)
         headerConf.textChanged.connect(self.headerChanged)
+        clearBtn.clicked.connect(self.clear)
 
     def remove(self):
         self.rmCallback(self)
 
+    def clear(self):
+        self.data = {}
+        self.curves = {}
+        self.notUsedColors = self.builtinColors.copy()
+        self.colors = {}
+        self.p.clear()
+
     def setRange(self, text):
         if text:
             self.config["xRange"] = float(text)

COMTool/version.py

@@ -1,7 +1,7 @@
 
 major = 3
-minor = 1
-dev   = 4
+minor = 2
+dev   = 0
 
 __version__ = "{}.{}.{}".format(major, minor, dev)
 

tool/send_curve_demo.py

@@ -0,0 +1,37 @@
+'''
+    execute `pip install comtool --upgrade` first
+    Then run a TCP server on COMTool
+    Finally run this script to connect the server and send data
+'''
+from COMTool.plugins import graph_protocol
+import math
+import socket
+import time
+
+class Conn:
+    def __init__(self, addr, port):
+        self.addr = addr
+        self.port = port
+        self.sock = None
+        # connect tcp server
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.sock.connect((self.addr, self.port))
+
+    def send(self, data):
+        self.sock.send(data)
+
+if __name__ == "__main__":
+    conn = Conn("127.0.0.1", 2345)
+
+    count = 0
+    while 1:
+        # x belong to [0, 2pi]
+        x = count * 2 * math.pi / 100
+        y = math.sin(x)
+        frame1 = graph_protocol.plot_pack("data1", x, y, header= b'\xAA\xCC\xEE\xBB')
+        y = math.pow(math.cos(x), 2)
+        frame2 = graph_protocol.plot_pack("data2", x, y, header= b'\xAA\xCC\xEE\xBB')
+        conn.send(frame1)
+        conn.send(frame2)
+        count += 1
+        time.sleep(0.1)