Merge pull request #72 from taunoe/arendus

Arendus

Author: taunoe

Arduino_examples/Labels/Labels.ino

@@ -0,0 +1,51 @@
+/*
+ * Copyright 20.02.2021 Tauno Erik
+ */
+
+
+void setup() {
+  Serial.begin(115200);
+
+  randomSeed(analogRead(0));
+}
+
+void loop() {
+  // print a random numbers
+  long r1 = random(10);
+  long r2 = random(10, 20);
+  long r3 = random(20, 30);
+  long r4 = random(30, 40);
+  long r5 = random(40, 50);
+
+  Serial.print("First");
+  Serial.print(r1);
+
+  Serial.print("Second");
+  Serial.print(r2*1.2);
+  
+  Serial.print("Third");
+  Serial.print(r3);
+
+  Serial.print("Fourth");
+  Serial.print(r4);
+  
+  Serial.print("Fifth");
+  Serial.print(r5);
+/*
+  long r6 = random(50, 60);
+  Serial.print("Sight");
+  Serial.print(r6);
+
+  long r7 = random(60, 70);
+  Serial.print("Seventh");
+  Serial.print(r7);
+
+  long r8 = random(70, 80);
+  Serial.print("Label 8");
+  Serial.print(r8/1.5);
+  */
+  Serial.println("Min:0, Max:100");
+
+  delay(100);
+}
+

arduino-random-number-generator/arduino-random-number-generator.ino renamed to Arduino_examples/Nolabels/Nolabels.ino

@@ -1,5 +1,5 @@
 /*
- * Copyright 20.02.2021 Tauno Erik
+ * Copyright 19.10.2023 Tauno Erik
  */
 
 
@@ -12,37 +12,40 @@ void setup() {
 void loop() {
   // print a random numbers
   long r1 = random(10);
+  long r2 = random(10, 20);
+  long r3 = random(20, 30);
+  long r4 = random(30, 40);
+  long r5 = random(40, 50);
+
+  Serial.print("First");
   Serial.print(r1);
-  Serial.print("_");
 
-  long r2 = random(10, 20);
+  Serial.print("-");
   Serial.print(r2*1.2);
-  Serial.print(",");
-
-  long r3 = random(20, 30);
-  Serial.print(r3);
+  
   Serial.print(".");
+  Serial.print(r3);
 
-  long r4 = random(30, 40);
+  Serial.print("_");
   Serial.print(r4);
-  Serial.print("a");
-
-  long r5 = random(40, 50);
+  
+  Serial.print(" ");
   Serial.print(r5);
-  Serial.print(":");
-
+/*
   long r6 = random(50, 60);
+  Serial.print("Sight");
   Serial.print(r6);
-  Serial.print(";");
 
   long r7 = random(60, 70);
+  Serial.print("Seventh");
   Serial.print(r7);
-  Serial.print("!");
 
   long r8 = random(70, 80);
+  Serial.print("Label 8");
   Serial.print(r8/1.5);
-  
+  */
   Serial.println("Min:0, Max:100");
 
   delay(100);
 }
+

README.md

@@ -1,4 +1,5 @@
 # Tauno Serial Plotter
+
 [![tauno-serial-plotter](https://snapcraft.io/tauno-serial-plotter/badge.svg)](https://snapcraft.io/tauno-serial-plotter)
 
 Serial Plotter for Arduino and other embedded devices.
@@ -17,10 +18,14 @@ Serial Plotter for Arduino and other embedded devices.
 
 Do not add new line between multiple data items. Only in the end.
 
+Label names cannot contain numbers.
+
+If all data is not labelled. Then the labels will not be displayed.
+
 ```C++
-Serial.print("Label1");
+Serial.print("Label");
 Serial.print(data1);
-Serial.print("Label2");
+Serial.print("Label");
 Serial.print(data2);
 Serial.println();
 ```

art.taunoerik.tauno-serial-plotter.appdata.xml

@@ -50,6 +50,6 @@
   <content_rating type="oars-1.1" />
 
   <releases>
-    <release version="1.19.0" date="2023-10-01"/>
+    <release version="1.19.10" date="2023-10-19"/>
   </releases>
 </component>

inno-setup-script.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Tauno Serial Plotter"
-#define MyAppVersion "1.19.0"
+#define MyAppVersion "1.19.1"
 #define MyAppPublisher "taunoerik.art"
 #define MyAppURL "https://github.com/taunoe/tauno-serial-plotter"
 #define SourcePath "C:\Users\tauno\Downloads\tauno-serial-plotter\dist\tauno-serial-plotter"

setup.py

@@ -9,7 +9,7 @@
 
 setuptools.setup(
     name="tauno-serial-plotter",
-    version="1.18.9",
+    version="1.19.1",
     author="Tauno Erik",
     author_email="[email protected]",
     description="Tauno-Serial-Plotter is simple serial plotter for Arduino and others.",

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: tauno-serial-plotter
 base: core18 
-version: '1.19.0'
+version: '1.19.1'
 summary: Simple serial plotter
 description: |
   Tauno Serial Plotter is simple serial plotter for Arduino and others.

src/tauno-serial-plotter.py

@@ -3,7 +3,7 @@
     File:   Tauno-Serial-Plotter.py
     Author: Tauno Erik
     Started:07.03.2020
-    Edited: 01.10.2023
+    Edited: 19.10.2023
 
     TODO:
     - Add labels/legends
@@ -23,7 +23,7 @@
 import pyqtgraph as pg
 import platform
 
-VERSION = '1.19.0'
+VERSION = '1.19.1'
 TIMESCALESIZE = 400  # = self.plot_timescale and self.plot_data_size
 
 stop_port_scan = False # To kill port scan thread when sys.exit
@@ -335,8 +335,13 @@ def __init__(self, nr_plot_lines='1', labels=["sensor1"]):
             pen = pg.mkPen(color=(plot_colors[color_i]), width=3)
 
             brush = pg.mkBrush(color=(plot_colors[color_i]))
-            #
-            line = self.serialplot.plot(x=self.x_axis, y=self.y_axis[i], name=self.data_labels[i],
+            # Quick fix:
+            # https://github.com/taunoe/tauno-serial-plotter/issues/71#issuecomment-1769499968
+            if len(self.data_labels) == len(self.y_axis):
+                line = self.serialplot.plot(x=self.x_axis, y=self.y_axis[i], name=self.data_labels[i],
+                                       pen=pen, symbol='o', symbolBrush=brush, symbolSize=3)
+            else:
+                line = self.serialplot.plot(x=self.x_axis, y=self.y_axis[i],
                                        pen=pen, symbol='o', symbolBrush=brush, symbolSize=3)
             self.data_lines.append(line)
 # END of class Plot ------------------------------------------------------
@@ -457,7 +462,7 @@ def __init__(self, app, parent=None):
         self.plot_exist = False
         self.is_fullscreen = False
 
-        self.labels = ["sensor"]
+        self.labels = ["label"]
         self.ports = [''] # list of avablie devices
         self.selected_port = self.ports[0] # '/dev/ttyACM0'
         self.baudrates = [