From 8a1676f318075bf25edfde8fd707a9a285e1e440 Mon Sep 17 00:00:00 2001
From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:50:10 +0200
Subject: [PATCH] update readme

---
 README.md        |  28 +++-
 requirements.txt | Bin 0 -> 3510 bytes
 src/ui/graph.py  | 370 +----------------------------------------------
 3 files changed, 29 insertions(+), 369 deletions(-)
 create mode 100644 requirements.txt

diff --git a/README.md b/README.md
index 117bff6..1d92070 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,29 @@
 # ZSDiagram
 
-a small application to display graphs of Sensor data collected by Homassistant and formatted in a certain way
\ No newline at end of file
+ZSDiagram ist eine kleine Grafische Anwendung, welche eine JSON-Datei in einem bestimmten Format einliest und daraus ein Diagram erstellt. 
+
+Das Diagramm kann entweder für einen, mehrere, oder alle Sensoren auf einmal erstellt werden. 
+
+## Filtermethoden:
+- Sensoren
+- Zeitraum
+
+## Zusatz:
+- Fehlende Tage einfügen
+  - Standardmäßig werden nur die Tage angezeigt, an denen auch Daten vorhanden sind. Dies ist problematisch, wenn mehrere Sensoren in einem Diagram angezeigt werden, da die Daten nicht immer an den gleichen Tagen vorhanden sind.
+
+# Installation
+1. Repository klonen
+2. In das Verzeichnis wechseln
+3. venv erstellen
+    - `python -m venv venv`
+    - `source venv/bin/activate`
+  - Windows: `venv\Scripts\activate`
+   - `pip install --upgrade pip`
+   - `pip install -r requirements.txt`
+4. Programm ausführen
+    - `python application.py`
+
+## Daten einlesen
+1. JSON-Datei mit Drag&Drop auf das Fenster ziehen, der Pfad wird automatisch eingetragen
+2. ...
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6419526a7da72d7bca370f17a449dccadb15bfbd
GIT binary patch
literal 3510
zcmbW4OK%fP5QTe<#7`NNv4eA2+yx8vAQmhmKNEvvPi%)I{_(*1`gFO+B)ME6Yb<A~
zx*n%aRds&;7^hX*r>nG0<J6_=^shc==}l_Wg}%?z>-0*JopknTlfI>STI(;g23d}#
zb<o%zW#^KjaaN>v`FtZEkEtoY=jlQAs;#O&kuU76irf(mWzXLF@+RF&Ya-8^G|dt2
zvrW!m@m-E!DxIw?F4IDfeV$29od4(<mPn_PheoUSZ5rv@Sxkk`SXO4TWgl-Pt5Ju1
zm*tI++DQ9GXIAog$PwU~Ja`5rGNeR~j9Bn{QDhsP#mYF_L4&-AdUVvdkt`%cV~mJ$
zlI~PnFh`DE?E570X|YXhw^@gboHtedAf46Gb{`AZZYuj=x|SC_*n8l$$kIDmc9pS9
z^hWbaZ@=qV7c5<i8h>B@Uo~#CP3H`c=h-IAag9J4ufvSjwX$n_8G)qZS*osU;Y=Q8
zTD%88n7@@g@PHKqaVzXDGs=50WFswXfb^gs0+wHOc2>AYJZ(PhxW5W1yzH}=OVtHV
zRBT+ei1ev8)icJ_kIuDSxVM*OI7Bxs#fT=?i{E5Jq>d(d!CU&h(b=71S}U5R&Z9{M
zYd@?N_05r8QG0vd<l4ipo8pDDQHxIR@nM8Jd4m6Av8c}_YGZ3?tc4yC5eL31Q;;%w
z93$C)muFWe@APv_l7W2It{;?M=%mppV^I9A-*e5B$k#DbL2v}mg*?&MR5K<Xv7+hT
zvgV_#Y^8H0R+x)maNa|(lN^LP$uIS6^jQgsWzi43&XtiP*kxSFhxlBJ;6*1H8C>Qp
zm^$cy2UwZ^uxu)SMhs3@JUx%lpog44C$Zp4eU$7fSCp=;wP-WqQO!ri&z9KB%SxZ{
zLbSEt@bgr!$sNR|*{L4z2T!0lDUn9~f*Fs;Y$|ua%~*pPQGb$^x7mUxoWE_O%A05P
zj7!zJRBZ62BGk%uA0xbtvYecGPCbp3+o=vc>k5S*biN3?iKZ~~mF!#<?4e(4Vq4GY
z|E-_T;?hL?y_QdA-v6<4iVHQM4=XEfh01d`4K%&)BKPO>u9f?f_MhtbS!lBVM(UOK
z`ZdcuGoPbkwd#HC52`);9ab(gzh6G(`-tVRvCidAjEr5;$U9SIe$v_W9ovQ8`+Zt+
z_V8Ob)ZV?%Oc|=@;V1W+m`ThdScHt;+A9j?qa%DeCl2cL+u{dQJPYV3DhWTiGcxPA
zzmNlaBJPKra98x_Pn?WdSJ4Yy?+Lsx%Wj2=_mMR{$^4BDwP3=m<(q9p&divBvW%|t
zeT)rz>h&VWhd*<4C$=+Z;+}ij!A6+Qf5=`q*S`_%atyvb)@|93f~`TFXUDlVmNmLM
zwg`FE3F!&SW(<z_c0#2<*Ym=6H*PMlnEa7p#WRQLi67slV`{sX&<ZQe*t$X4jGzd{
zp1&JK@$yZZTUGT4uRM*}MGrY^c+uyFBP8SSawwhPEbFGWoZZGYp+du)r_V+P_d*qZ
z&*ZKCAA?R?a(o&+U4X@U(;|yHwU~c!`&thuE@T^oqXI_wUYU85Qw!u+!LxaF&|CWK
cjh_CE*Ng|@ssU=g1uo=||5~u;X&;&X0zIeu@&Et;

literal 0
HcmV?d00001

diff --git a/src/ui/graph.py b/src/ui/graph.py
index 9beb983..5b70275 100644
--- a/src/ui/graph.py
+++ b/src/ui/graph.py
@@ -3,7 +3,7 @@ from PyQt6 import QtWidgets
 
 
 class Graph:
-    def __init__(self, data: dict | list):
+    def __init__(self, data: list):
         self.xlist = []
         if isinstance(data, dict):
             self.xlist += data[list(data.keys())[0]]["x"]
@@ -21,7 +21,7 @@ class Graph:
         stringaxis_x.setTicks([xdict.items()])
         self.graph = pg.PlotWidget(axisItems={"bottom": stringaxis_x})
         # self.graph.("Zeitschriftennutzung")
-        self.graph.setLabel("left", "Anzahl der potentiellen Nutzungen")
+        self.graph.setLabel("left", "Anzahl der Aktivierungen")
         self.graph.setLabel("bottom", "Datum")
 
         self.graph.addLegend()
@@ -30,12 +30,8 @@ class Graph:
             self.plot_lines(data)
         else:
             self.plot_line(data)
-        # remove duplicate x values
 
         self.graph.showGrid(x=True, y=True)
-        # set max and min values for x and y axis
-
-        # self.graph.resize(800, 600)
 
     def plot_line(self, data, color="r"):
         line_label = list(data.keys())[0]
@@ -43,9 +39,6 @@ class Graph:
         self.xlist += x_data
         x_data = [date.split("2024-")[1] for date in x_data]
         xdict = dict(enumerate(x_data))
-        # stringaxis_x = pg.AxisItem(orientation="bottom")
-        # stringaxis_x.setTicks([xdict.items()])
-        # self.graph.getAxis("bottom").setTicks([xdict.items()])
         global_xdict = self.xdict
 
         # remove all x values that are not in the xdict
@@ -75,362 +68,3 @@ def launch(data):
     graph.graph.show()
     app.exec()
 
-
-if __name__ == "__main__":
-    data = [
-        {
-            "t^1": {
-                "x": [
-                    "2024-04-04",
-                    "2024-04-05",
-                    "2024-04-06",
-                    "2024-04-07",
-                    "2024-04-08",
-                    "2024-04-09",
-                    "2024-04-10",
-                    "2024-04-11",
-                    "2024-04-12",
-                    "2024-04-13",
-                    "2024-04-14",
-                    "2024-04-15",
-                    "2024-04-16",
-                    "2024-04-17",
-                    "2024-04-18",
-                    "2024-04-19",
-                    "2024-04-20",
-                    "2024-04-21",
-                    "2024-04-22",
-                    "2024-04-23",
-                    "2024-04-24",
-                    "2024-04-25",
-                    "2024-04-26",
-                    "2024-04-27",
-                    "2024-04-28",
-                    "2024-04-29",
-                    "2024-04-30",
-                    "2024-05-01",
-                    "2024-05-02",
-                    "2024-05-03",
-                    "2024-05-04",
-                    "2024-05-05",
-                    "2024-05-06",
-                    "2024-05-07",
-                    "2024-05-08",
-                    "2024-05-09",
-                    "2024-05-10",
-                    "2024-05-11",
-                    "2024-05-12",
-                    "2024-05-13",
-                    "2024-05-14",
-                    "2024-05-15",
-                    "2024-05-16",
-                    "2024-05-17",
-                    "2024-05-18",
-                    "2024-05-19",
-                    "2024-05-20",
-                    "2024-05-21",
-                    "2024-05-22",
-                    "2024-05-23",
-                    "2024-05-24",
-                    "2024-05-25",
-                    "2024-05-26",
-                    "2024-05-27",
-                    "2024-05-28",
-                ],
-                "y": [
-                    0,
-                    9.0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    2.0,
-                    0,
-                    0,
-                    2.0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    2.0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    3.0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                ],
-            }
-        },
-        {
-            "t^2": {
-                "x": [
-                    "2024-04-04",
-                    "2024-04-05",
-                    "2024-04-06",
-                    "2024-04-07",
-                    "2024-04-08",
-                    "2024-04-09",
-                    "2024-04-10",
-                    "2024-04-11",
-                    "2024-04-12",
-                    "2024-04-13",
-                    "2024-04-14",
-                    "2024-04-15",
-                    "2024-04-16",
-                    "2024-04-17",
-                    "2024-04-18",
-                    "2024-04-19",
-                    "2024-04-20",
-                    "2024-04-21",
-                    "2024-04-22",
-                    "2024-04-23",
-                    "2024-04-24",
-                    "2024-04-25",
-                    "2024-04-26",
-                    "2024-04-27",
-                    "2024-04-28",
-                    "2024-04-29",
-                    "2024-04-30",
-                    "2024-05-01",
-                    "2024-05-02",
-                    "2024-05-03",
-                    "2024-05-04",
-                    "2024-05-05",
-                    "2024-05-06",
-                    "2024-05-07",
-                    "2024-05-08",
-                    "2024-05-09",
-                    "2024-05-10",
-                    "2024-05-11",
-                    "2024-05-12",
-                    "2024-05-13",
-                    "2024-05-14",
-                    "2024-05-15",
-                    "2024-05-16",
-                    "2024-05-17",
-                    "2024-05-18",
-                    "2024-05-19",
-                    "2024-05-20",
-                    "2024-05-21",
-                    "2024-05-22",
-                    "2024-05-23",
-                    "2024-05-24",
-                    "2024-05-25",
-                    "2024-05-26",
-                    "2024-05-27",
-                    "2024-05-28",
-                ],
-                "y": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    4.0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    4.0,
-                    0,
-                    0,
-                    6.0,
-                    0,
-                    2.0,
-                    2.0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    2.0,
-                    2.0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                ],
-            }
-        },
-        {
-            "t^3": {
-                "x": [
-                    "2024-04-04",
-                    "2024-04-05",
-                    "2024-04-06",
-                    "2024-04-07",
-                    "2024-04-08",
-                    "2024-04-09",
-                    "2024-04-10",
-                    "2024-04-11",
-                    "2024-04-12",
-                    "2024-04-13",
-                    "2024-04-14",
-                    "2024-04-15",
-                    "2024-04-16",
-                    "2024-04-17",
-                    "2024-04-18",
-                    "2024-04-19",
-                    "2024-04-20",
-                    "2024-04-21",
-                    "2024-04-22",
-                    "2024-04-23",
-                    "2024-04-24",
-                    "2024-04-25",
-                    "2024-04-26",
-                    "2024-04-27",
-                    "2024-04-28",
-                    "2024-04-29",
-                    "2024-04-30",
-                    "2024-05-01",
-                    "2024-05-02",
-                    "2024-05-03",
-                    "2024-05-04",
-                    "2024-05-05",
-                    "2024-05-06",
-                    "2024-05-07",
-                    "2024-05-08",
-                    "2024-05-09",
-                    "2024-05-10",
-                    "2024-05-11",
-                    "2024-05-12",
-                    "2024-05-13",
-                    "2024-05-14",
-                    "2024-05-15",
-                    "2024-05-16",
-                    "2024-05-17",
-                    "2024-05-18",
-                    "2024-05-19",
-                    "2024-05-20",
-                    "2024-05-21",
-                    "2024-05-22",
-                    "2024-05-23",
-                    "2024-05-24",
-                    "2024-05-25",
-                    "2024-05-26",
-                    "2024-05-27",
-                    "2024-05-28",
-                ],
-                "y": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                ],
-            }
-        },
-    ]
-    launch(data)