From 8f5a65405d26d1bf189d495743d13054e1e3a857 Mon Sep 17 00:00:00 2001
From: Andrew <navpdb@gmail.com>
Date: Tue, 12 Nov 2024 19:26:38 +0300
Subject: [PATCH] =?UTF-8?q?dev:=20(=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82)=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82?=
 =?UTF-8?q?=D0=B8=D0=B5=20csv=20=D0=B8=D0=B7=20=D0=BF=D0=B0=D0=BF=D0=BA?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/__pycache__/main.cpython-310.pyc          | Bin 407 -> 3460 bytes
 src/gui/__pycache__/app.cpython-310.pyc       | Bin 2862 -> 2867 bytes
 src/gui/app.py                                |   5 +-
 src/main.py                                   |  76 +++++++++++++++++-
 .../diagram_parser.cpython-310.pyc            | Bin 2720 -> 2813 bytes
 src/utils/diagram_parser.py                   |   6 +-
 6 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/src/__pycache__/main.cpython-310.pyc b/src/__pycache__/main.cpython-310.pyc
index 3acb9f68361e67477093a6ae0aca2ee71915bd5b..593906990792be5345123c0d635f9dd9eee73958 100644
GIT binary patch
literal 3460
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
ACjbBd

literal 407
zcmYjNu};G<5cN538lrY);Rmu*DkDM&MCYog1CkZVvSJgW#)<2=5*?VzhtLr|DJv7=
z4_M$_3DlF`yL)%O^V#iqoD#J4*R*^`{}IHoQ54sR?i@)G1vTM-p4QYvJOZL3#a;+!
zdY}d?>P|J=5zNB!fGqyRJ~GdskEFFl5Pt?3M2K5NcZTH2D=63l5KnjHIp}B~hLI)7
z=$t2uy7j(l%8d2YmOM7AyBlj=*s*8&Nf#M#=C!eJ#0@a{J)K?Tvq}o5ZI{bwey?kV
z{Y%^Wg?10EGqNdk-nk+-vT7!F+p`da<}OA`A%+pSVYnd?BGiP)Vt!(`YhOBPA6<9?
tAL58fxv37j{2y<m(Lx+nIifJPPcBWXHnqMAztD}45;CF*P2v>T&o9G+Sa<*c

diff --git a/src/gui/__pycache__/app.cpython-310.pyc b/src/gui/__pycache__/app.cpython-310.pyc
index 6546faabddf825d3b3efa65a56cfd67ac38361cc..0978bc638a5a0ce6cfa363b05933becd775fa739 100644
GIT binary patch
delta 616
zcmZWlJBt)S5bo;fd34WX*LB_V_MVE#c%X=>h;Sko$iZ=#Y_crYtjBP$!_2_JF~<g8
zI#K@scS93F7BMn4GZCYS3{3qAiq+#Iv7xHIufD44>V7j=4Z>L%Dn{p1asS2lx8XL-
z4~Qjf1jt4lA+e?$Ia-%uBv2$a+KH36>uf5}L6@=~dMGd1NTNcYqQU?}iatiiEbcVc
zB+D9+P0Ew!++6hM7;J2xtmu)epkiZIvAYXcGGNG#*=snAd2ZHgg7N8Wg5xYtilmHr
zBZ}m7+DiHZJaq)sIG{uR89Mqae+0YwhP5}ZSn4bRSm_d?`6)+HbGpYXCEDoJZ~>)4
z7d_Jamli1jaeB%>9+nYdqj%76d%NY83NWb6zP*Yqt{Q!5Sf7wsTwBsB#sk80u~=)#
z^;TGK@vy}kE#4&DOSj0k%TY8VOsnZI>JY=)1sa%k({1v9>&!y`*G9GX`{&}$;rT|U
z55$wzJ8=hKM}M;)2=kMx9j6QZfKZ>TcuY=#f`~_}efJ~4L#^b+(5G~4<+mx&SD(zz
w@;#G*Jk+n`8a&hQ<xL25BX8M_Rg}5@DYuAks(T`Wfvu0!7kQ+>fdIshUrv*W#sB~S

delta 616
zcmZWn&ubG=5Pq}!_Sf6pB(*hdQVl4I#9&QQ1qH<)^r%6oc*y0kb~fq~$+EjBl$0Lq
zbx-dPusQZpkR1FE#ItyD!K?p;;_QlEd@wWL_r957nD>^=)22W3eZlB_e!l(U#|OUy
zj~@~X*%*+GH3Za-*jPtB<j6xKG+S)K(LnQvk1e#&Ce=m<1w{v4^e77ScUiYq=s_H-
zk<;#Z)N#&^*@6K>w#!an)P=&6(^-HrPQo<IPN3jvIGw0(@Q7=auX@@SsHtDtedwrr
zdhZbV0)S=aoJByUp^<BICaugy6RjK$AajsLAx*r~NpXn_bpLTL^9fsIHT0_5de)c&
z`Z@KJD>UGlQeTv8l@LE(ThQ3@Y=sY-6<M#yMul4yZdZ7d@Je)!d^H@!vPD^1R+MTB
zYq<r~FseuA$^XqO2l_v^p4)$R)oqOSH{&2t5#PD8e>qEny-=pX>v$Tb*N6S#4LKOd
z{;g|++j6@vZw|Ni(l^Ufz6G?l@5Y^F$E?GeOAB2kOLxc#5Kz;+<pb*zz+GiK2OH%N
z=<3N;3iJ#wXK#}p!NgPVoppGsJ~|h{RfTh@lQhbEv&x&kO0&Y4&?9C^yS#SQ1u@_@
RG`V^vzB*3?nBW2b`5P0&ll1@q

diff --git a/src/gui/app.py b/src/gui/app.py
index 3814c92..221ba8f 100644
--- a/src/gui/app.py
+++ b/src/gui/app.py
@@ -7,7 +7,8 @@ from src.gui import PlotWindow, settingsWindow
 
 
 class app:
-    def __init__(self):
+    def __init__(self, path: str):
+        self.path = path
         self._load_preset()
         
 
@@ -21,7 +22,7 @@ class app:
         self.system_params = read_json("params/system_params.json")
 
         self.parser = DiagramParser(system_config=self.system_params)
-        self.parser.setData("trace_samples/2024_11_08-19_30_52.csv")
+        self.parser.setData(self.path)
         #trace_samples/2024_11_08-19_30_52.csv
         
 
diff --git a/src/main.py b/src/main.py
index fb91190..3dec433 100644
--- a/src/main.py
+++ b/src/main.py
@@ -2,11 +2,79 @@ import pyqtgraph as pg
 
 from src.gui import app
 
-def main():
-    pg.mkQApp("Plotting")
-    temp = app()
-    pg.exec()
+import os
+import time
+from PyQt5.QtCore import QThread, pyqtSignal, QObject
+from watchdog.observers import Observer
+from watchdog.events import FileSystemEventHandler
 
+def main():
+    pg.mkQApp()
+    apps = appHandler
+    directory_path = "D:/downloads/a22"
+
+    file_watcher_thread = FileWatcherThread(directory_path)
+    file_watcher_thread.worker.file_detected.connect(get)
+    file_watcher_thread.start()
+
+    pg.exec()
+    #temp = app()
+    
+def get(path):
+    time.sleep(1)
+    temp = app(path)
+        
+class appHandler:
+    def __init__(self):
+        self.appTemp = []
+    
+    def makeApp(self, result):
+        self.appTemp.append(app(result))
+
+
+class FileWatcherWorker(QObject):
+    file_detected = pyqtSignal(str)  # Сигнал для передачи пути к новому файлу
+
+    def __init__(self, directory_path):
+        super().__init__()
+        self.directory_path = directory_path
+        self.observer = Observer()
+        self._running = True
+
+    def start_watching(self):
+        # Настраиваем наблюдателя и запускаем его
+        event_handler = CSVFileHandler(self.file_detected)
+        self.observer.schedule(event_handler, self.directory_path, recursive=False)
+        self.observer.start()
+
+    def stop_watching(self):
+        self._running = False
+        self.observer.stop()
+        self.observer.join()
+
+class CSVFileHandler(FileSystemEventHandler):
+    def __init__(self, file_detected_signal):
+        super().__init__()
+        self.file_detected_signal = file_detected_signal
+
+    def on_created(self, event):
+        # Проверяем, что это файл и что он имеет расширение .csv
+        if not event.is_directory and event.src_path.endswith(".csv"):
+            abs_path = os.path.abspath(event.src_path)
+            print(f"Найден новый CSV файл: {abs_path}")
+            self.file_detected_signal.emit(abs_path)  # Испускаем сигнал с путем к файлу
+
+class FileWatcherThread(QThread):
+    def __init__(self, directory_path):
+        super().__init__()
+        self.worker = FileWatcherWorker(directory_path)
+
+    def run(self):
+        self.worker.start_watching()  # Запуск наблюдателя
+        self.exec_()  # Запускаем событийный цикл в потоке
+
+    def stop(self):
+        self.worker.stop_watching()  # Остановка наблюдателя
 
 if __name__ == '__main__':
     main()
diff --git a/src/utils/__pycache__/diagram_parser.cpython-310.pyc b/src/utils/__pycache__/diagram_parser.cpython-310.pyc
index cec984cfee101d2b1e3807f38d2a9e9e87e83093..6c56bef95ed415b0d5682697f926653198bf349c 100644
GIT binary patch
delta 521
zcmZ1=`d5@MpO=@50SK;E8>budY~-8H#K#HbasaV25Es`?-pn+Ev1qanb4q<JTZvE&
zOEaSjL#$;CQ!RTfM-4{`izGt|S2k18?i%(QwiFf#hHQqS<uwdh0yV6X3=4#7SZdgT
zDwrf0K&%uNaRvx4ooOK>BST>mE|m~fDcs@=FqMVuUMUR044OQXe=xgnr&o)tbAMRX
zVy`JO*^Z?_k~t?e?-pljUTJP>QDRBzEw;phg4DbeP0q=eSk$?rIDyjfnI);Y#gl)s
zs4<#MR$x^X;$ReD<N-o0MhzyW2BzOEKPCsV7BK2fKE!Hop$+tXkq(g1WGn)OMv*Rv
z;DHmoK-Mju^wbi!oczQRm(1i6Ly(;QWJ@+nA!N;<;4IRe+`^{BW&%;MhRqs91t<c5
zDt@v_vzdccY?fkYVPr2-0CAKit8yqas!aCeP-9e|T)-jDXf?TmW2cNUNRkmqXtEWt
wg4hZm!VE+xO^)SMWAvQd!kH<h2@=o)5e6Uv>_%x2%V;t?mkp!rWEZX&0K?yJ^Z)<=

delta 420
zcmew>x<HgKpO=@50SNwj8K=i{Z{(ZK#K!^Tg0M3X7duSe%rt{Bc(M<3iiZnBtXvFJ
zEn6*n4SNcUBtr^UHdE1@8ip)^8dgb$1wu6}HEcjpCP@YmD}_az0m4gXTFA)AP*_*!
zmBJ9rpvgVijKzgXQ+RSKOM?h!YF=q>YEfcI>Mgd!f`Zh%6itrFa;)l;16b7<^(L3I
zs`3ah@-S*JGBq&$WBECG9cuxj)?|4$dm$~L^NO^AgeGGV$hk#2lOM7P3-hF>mbm5Q
zCziNmCYR`f#PudmW3xn2&Iwbl#AX0d!O3ooq5>2q5Ci$xfd=~Kr=%K#Rc<b4XJKT&
z#hjCxSEM+(i9?xDdGaz2HAc0`XF0?f%_cwP*ePQKQppG;G}($+L2MHcVFn@;C-34^
kV|1PTkTX+C10(=;p+1NOc8N5IWjHy7%Z5>M@<Of{0D)m#Qvd(}

diff --git a/src/utils/diagram_parser.py b/src/utils/diagram_parser.py
index 327be61..5c7451d 100644
--- a/src/utils/diagram_parser.py
+++ b/src/utils/diagram_parser.py
@@ -35,9 +35,13 @@ class DiagramParser:
                 elif key == self.signals[3]: name =  "opening"
 
                 self.timingsDict[name] = []
+                len_items = len(items)
                 for i, item in enumerate(items):
                     if item[1] == 'high':
-                        self.timingsDict[name].append([items[i][0], items[i+1][0]])
+                        if i < len_items-1:
+                            self.timingsDict[name].append([items[i][0], items[i+1][0]])
+                        else:
+                            self.timingsDict[name].append([items[i][0], items[i][0]+0.01])
         
     def getBoolDict (self) -> dict:
         return self.boolDict