Sfoglia il codice sorgente

Очистка от лишних файлов и исправления по типизации

5 ha cambiato i file con 52 aggiunte e 46 eliminazioni
  1. 3 0
      .gitignore
  2. 0 0
      1111tttt.py
  3. 49 46
      InterfaceL.py
  4. 0 0
      Test.py
  5. 0 0
      generatorT.py

+ 3 - 0
.gitignore

@@ -0,0 +1,3 @@
+*/__pycache__
+.vscode/
+

+ 0 - 0
1111tttt.py


+ 49 - 46
InterfaceL.py

@@ -1,12 +1,13 @@
 from idlelib.colorizer import color_config
 from logging import disable
-from tkinter import *
+from tkinter import Tk, Label, Entry, Button, Spinbox, StringVar, BOTTOM, LEFT, SOLID, EW, END
 import tkinter as tk
 from tkinter import ttk
 from tkinter import filedialog
 from tkinter.ttk import Combobox
 from matplotlib.figure import Figure
-from matplotlib.backends.backend_tkagg import (FigureCanvasTkAgg, NavigationToolbar2Tk)
+from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg
+from matplotlib.backends._backend_tk import NavigationToolbar2Tk
 from random import choice
 import matplotlib.pyplot as plt
 import matplotlib
@@ -28,19 +29,19 @@ class Interface():
         Interface.window.geometry('500x250+100+100')
         photo = tk.PhotoImage(file='iconka.png')
         Interface.window.iconphoto(False, photo)
-        self.f_top = ttk.LabelFrame(Interface.window, text="Виртуальный COM порт", relief=SOLID, padding=[8, 10])
+        self.f_top = ttk.LabelFrame(Interface.window, text="Виртуальный COM порт", relief=SOLID, padding=(8, 10))
         self.combo = Combobox(self.f_top)
         self.combo['values'] = (1, 2, 3, 4, 5)
         self.combo.current(4)
         self.f_top.grid(column=0, row=0)
         self.combo.pack(side=BOTTOM)
-        self.f_file = ttk.LabelFrame(Interface.window, text="Выбрать файл txt для записи", relief=SOLID, padding=[8, 10])
+        self.f_file = ttk.LabelFrame(Interface.window, text="Выбрать файл txt для записи", relief=SOLID, padding=(8, 10))
         self.f_file.grid(column=1, row=0)
         self.txt = Entry(self.f_file, width=40)
         self.txt.pack(side=LEFT)
         self.btn = Button(self.f_file, height=1, text='Файл', bg="gray", fg="red", command=self.clicked_file)
         self.btn.pack(side=LEFT)
-        self.f_start = ttk.Frame(Interface.window, relief=SOLID, padding=[8, 10])
+        self.f_start = ttk.Frame(Interface.window, relief=SOLID, padding=(8, 10))
         self.t1 = Label(self.f_start, text="Состояние работы", fg="black")
         self.t2 = Label(self.f_start, text="Начать сбор данных", fg="black")
         self.t3 = Label(self.f_start, text="Остановить сбор данных", fg="black")
@@ -48,8 +49,8 @@ class Interface():
         self.button_start = Button(self.f_start, text="Пуск", bg="lightgray", fg="black", command=self.clicked_start1)
         self.button_startoff = Button(self.f_start, text="Стоп", bg="lightgray", fg="red",
                                       command=self.clicked_start2,
-                                      state=['disabled'])
-        self.f_start1= ttk.LabelFrame(Interface.window, text='Принятые символы', relief=SOLID, padding=[8, 10])
+                                      state='disabled')
+        self.f_start1= ttk.LabelFrame(Interface.window, text='Принятые символы', relief=SOLID, padding=(8, 10))
         self.t_entry = Entry(self.f_start1, width=40)
         self.f_start.grid(column=2, row=0)
         self.f_start1.grid(column=3, row=0)
@@ -62,27 +63,27 @@ class Interface():
         self.button_startoff.grid(column=2, row=1)
 
     def create_widgets_W(self):
-        self.f_W = ttk.Frame(Interface.window, relief=SOLID, padding=[8, 10])
+        self.f_W = ttk.Frame(Interface.window, relief=SOLID, padding=(8, 10))
         self.f_W.grid(column=0, row=1)
         self.tspin1 = Label(self.f_W, text="Время экспозиции, с", fg="black")
         self.tspin2 = Label(self.f_W, text="Макс. время сбора данных, с", fg="black")
         self.tspin3 = Label(self.f_W, text="Прошло времени, с", fg="black")
         self.spin1 = Spinbox(self.f_W, from_=0, to=100, width=7)
         self.spin2 = Spinbox(self.f_W, from_=0, to=10000000, increment=500, width=11)
-        self.t_entry = Entry(self.f_W, width=20, state=['disabled'])
+        self.t_entry = Entry(self.f_W, width=20, state='disabled')
         self.tspin1.grid(column=0, row=0, ipadx=10)
         self.spin1.grid(column=0, row=1, pady=10)
         self.tspin2.grid(column=0, row=2, ipadx=10)
         self.spin2.grid(column=0, row=3, pady=10)
         self.tspin3.grid(column=0, row=4, pady=10)
         self.t_entry.grid(column=0, row=5)
-        self.f_W1 = ttk.Frame(Interface.window, relief=SOLID, padding=[8, 10])
+        self.f_W1 = ttk.Frame(Interface.window, relief=SOLID, padding=(8, 10))
         self.f_W1.grid(column=0, row=2)
         self.tspin_0 = Label(self.f_W1, text="Коэффициент делителя", fg="black")
         self.spin_0 = Spinbox(self.f_W1, from_=0, to=100, width=7)
         self.tspin_0.grid(column=0, row=0, ipadx=10)
         self.spin_0.grid(column=0, row=1, pady=10)
-        self.f_W2 = ttk.Frame(Interface.window, relief=SOLID, padding=[8, 10])
+        self.f_W2 = ttk.Frame(Interface.window, relief=SOLID, padding=(8, 10))
         self.f_W2.grid(column=0, row=3)
         self.spin1_zap = Spinbox(self.f_W2, from_=0.0, to=50.0, increment=0.1, width=6)
         self.spin2_zap = Spinbox(self.f_W2, from_=0, to=100, increment=1, width=6)
@@ -110,7 +111,7 @@ class Interface():
         self.button1_zap.grid(column=0, row=9)
         self.tbut2_zap.grid(column=0, row=10)
         self.button2_zap.grid(column=0, row=11)
-        self.f_W3 = ttk.Frame(Interface.window, relief=SOLID, padding=[8, 10])
+        self.f_W3 = ttk.Frame(Interface.window, relief=SOLID, padding=(8, 10))
         self.txt0_fw3 = Label(self.f_W3, text="Порт В1 напряжения", fg="black")
         self.txt1_fw3 = Label(self.f_W3, text="      0 B      ", fg="black", bg="pink")
         self.m = '      0 B      '
@@ -158,8 +159,8 @@ class Interface():
                             init_func=init, blit=True, interval=5, repeat=False)
 
 
-        Interface.window.after(100, None)
-        self.f_grafbtn = ttk.LabelFrame(self.f_graf, text='Время отоброжения', padding=[8, 10])
+        Interface.window.after(100, lambda: None)
+        self.f_grafbtn = ttk.LabelFrame(self.f_graf, text='Время отоброжения', padding=(8, 10))
         self.f_grafbtn.grid(column=1, row=0)
         self.tgrafsp = Label(self.f_grafbtn, text="Начало времени, с", fg="black")
         self.tgrafsp.grid(column=0, row=0)
@@ -173,11 +174,11 @@ class Interface():
         self.tgrafsp1 = Label(self.f_grafbtn, text="Конец времени, с", fg="black")
         self.tgrafsp1.grid(column=0, row=4)
         self.Time_flag = 'disabled'
-        self.spinbox_varTime = StringVar(value=100)
+        self.spinbox_varTime = StringVar(value=str(100))
         self.grafspin1 = Spinbox(self.f_grafbtn, from_=100, to=50000, increment=100, width=7,
-                                 textvariable=self.spinbox_varTime, state=[self.Time_flag])
+                                 textvariable=self.spinbox_varTime, state=self.Time_flag)
         self.grafspin1.grid(column=0, row=5)
-        self.spinbox_var1 = StringVar(value=0)
+        self.spinbox_var1 = StringVar(value=str(0))
         self.tgrafspTmin = Label(self.f_grafbtn, text="Нижняя граница, имп/с", fg="black")
         self.tgrafspTmin.grid(column=0, row=6)
         self.grafspinTmin = Spinbox(self.f_grafbtn, from_=0, to=5000,
@@ -185,7 +186,7 @@ class Interface():
         self.grafspinTmin.grid(column=0, row=7)
         self.tgrafspTmax = Label(self.f_grafbtn, text="Верхняя граница, имп/с", fg="black")
         self.tgrafspTmax.grid(column=0, row=8)
-        self.spinbox_var2 = StringVar(value=10000)
+        self.spinbox_var2 = StringVar(value=str(10000))
         self.grafspinTmax = Spinbox(self.f_grafbtn, from_=5000, to=10000, increment=500,
                                     textvariable=self.spinbox_var2, width=7)
         self.grafspinTmax.grid(column=0, row=9)
@@ -223,8 +224,8 @@ class Interface():
                             init_func=init, blit=True, interval=5, repeat=False)
 
 
-        Interface.window.after(100, None)
-        self.f_grafbtnADC = ttk.LabelFrame(self.f_graf_ADC, text='Время отоброжения', padding=[8, 10])
+        Interface.window.after(100, lambda: None)
+        self.f_grafbtnADC = ttk.LabelFrame(self.f_graf_ADC, text='Время отоброжения', padding=(8, 10))
         self.f_grafbtnADC.grid(column=1, row=0)
         self.tgrafspADC = Label(self.f_grafbtnADC, text="Начало времени, с", fg="black")
         self.tgrafspADC.grid(column=0, row=0)
@@ -238,11 +239,11 @@ class Interface():
         self.tgrafsp1ADC = Label(self.f_grafbtnADC, text="Конец времени, с", fg="black")
         self.tgrafsp1ADC.grid(column=0, row=4)
         self.Time_flagADC = 'disabled'
-        self.spinbox_varTimeADC = StringVar(value=100)
+        self.spinbox_varTimeADC = StringVar(value=str(100))
         self.grafspin1ADC = Spinbox(self.f_grafbtnADC, from_=100, to=50000, increment=100, width=7,
-                                 textvariable=self.spinbox_varTimeADC, state=[self.Time_flagADC])
+                                 textvariable=self.spinbox_varTimeADC, state=self.Time_flagADC)
         self.grafspin1ADC.grid(column=0, row=5)
-        self.spinbox_var1ADC = StringVar(value=0)
+        self.spinbox_var1ADC = StringVar(value=str(0))
         self.tgrafspTminADC = Label(self.f_grafbtnADC, text="Нижняя граница, В", fg="black")
         self.tgrafspTminADC.grid(column=0, row=6)
         self.grafspinTminADC = Spinbox(self.f_grafbtnADC, from_=0, to=5000,
@@ -250,7 +251,7 @@ class Interface():
         self.grafspinTminADC.grid(column=0, row=7)
         self.tgrafspTmaxADC = Label(self.f_grafbtnADC, text="Верхняя граница, В", fg="black")
         self.tgrafspTmaxADC.grid(column=0, row=8)
-        self.spinbox_var2ADC = StringVar(value=10000)
+        self.spinbox_var2ADC = StringVar(value=str(10000))
         self.grafspinTmaxADC = Spinbox(self.f_grafbtnADC, from_=5000, to=10000, increment=500,
                                     textvariable=self.spinbox_var2ADC, width=7)
         self.grafspinTmaxADC.grid(column=0, row=9)
@@ -288,8 +289,8 @@ class Interface():
                             init_func=init, blit=True, interval=5, repeat=False)
 
 
-        Interface.window.after(100, None)
-        self.f_grafbtnTEM = ttk.LabelFrame(self.f_graf_TEM, text='Время отоброжения', padding=[8, 10])
+        Interface.window.after(100, lambda: None)
+        self.f_grafbtnTEM = ttk.LabelFrame(self.f_graf_TEM, text='Время отоброжения', padding=(8, 10))
         self.f_grafbtnTEM.grid(column=1, row=0)
         self.tgrafspTEM = Label(self.f_grafbtnTEM, text="Начало времени, с", fg="black")
         self.tgrafspTEM.grid(column=0, row=0)
@@ -303,11 +304,11 @@ class Interface():
         self.tgrafsp1TEM = Label(self.f_grafbtnTEM, text="Конец времени, с", fg="black")
         self.tgrafsp1TEM.grid(column=0, row=4)
         self.Time_flagTEM = 'disabled'
-        self.spinbox_varTimeTEM = StringVar(value=100)
+        self.spinbox_varTimeTEM = StringVar(value=str(100))
         self.grafspin1TEM = Spinbox(self.f_grafbtnTEM, from_=100, to=50000, increment=100, width=7,
-                                 textvariable=self.spinbox_varTimeTEM, state=[self.Time_flagTEM])
+                                 textvariable=self.spinbox_varTimeTEM, state=self.Time_flagTEM)
         self.grafspin1TEM.grid(column=0, row=5)
-        self.spinbox_var1TEM = StringVar(value=0)
+        self.spinbox_var1TEM = StringVar(value=str(0))
         self.tgrafspTminTEM = Label(self.f_grafbtnTEM, text="Нижняя граница, С", fg="black")
         self.tgrafspTminTEM.grid(column=0, row=6)
         self.grafspinTminTEM = Spinbox(self.f_grafbtnTEM, from_=0, to=5000,
@@ -315,7 +316,7 @@ class Interface():
         self.grafspinTminTEM.grid(column=0, row=7)
         self.tgrafspTmaxTEM = Label(self.f_grafbtnTEM, text="Верхняя граница, С", fg="black")
         self.tgrafspTmaxTEM.grid(column=0, row=8)
-        self.spinbox_var2TEM = StringVar(value=10000)
+        self.spinbox_var2TEM = StringVar(value=str(10000))
         self.grafspinTmaxTEM = Spinbox(self.f_grafbtnTEM, from_=5000, to=10000, increment=500,
                                     textvariable=self.spinbox_var2TEM, width=7)
         self.grafspinTmaxTEM.grid(column=0, row=9)
@@ -332,19 +333,21 @@ class Interface():
 
     def clicked_file(self):
         self.file1 = filedialog.askopenfile(filetypes=(("Text files","*.txt"),("all files","*.*")))
+        assert self.file1 is not None
+
         self.file = os.path.abspath(self.file1.name)
         self.txt.delete(0, END)
         self.txt.insert(0, self.file)
 
     def clicked_start1(self):
-        self.button_start.configure(state=["disabled"])
+        self.button_start.configure(state="disabled")
         self.t4.configure(text="Включено", bg="black", fg="green")
-        self.button_startoff.configure(state=["active"])
+        self.button_startoff.configure(state="active")
 
     def clicked_start2(self):
-        self.button_start.configure(state=["active"])
+        self.button_start.configure(state="active")
         self.t4.configure(text="Выключено", bg="black", fg="white")
-        self.button_startoff.configure(state=['disabled'])
+        self.button_startoff.configure(state='disabled')
 
     def clicked_V(self):
         if  self.m == "      0 B      ":
@@ -362,11 +365,11 @@ class Interface():
             self.ani = None
         if self.Time_flag == 'disabled':
             self.Time_flag = 'normal'
-            self.grafspin1.configure(state=[self.Time_flag])
+            self.grafspin1.configure(state=self.Time_flag)
         else:
             self.file1 = open(self.file, 'r')
             self.Time_flag = 'disabled'
-            self.grafspin1.configure(state=[self.Time_flag])
+            self.grafspin1.configure(state=self.Time_flag)
             with self.file1 as f:
                 self.lines = f.readlines()
 
@@ -397,7 +400,7 @@ class Interface():
                                      init_func=init1, blit=True, interval=5, repeat=False)
 
             self.canvas.draw()
-            Interface.window.after(10, None)
+            Interface.window.after(10, lambda: None)
 
     def clicked_timeADC(self):
         if self.ADC_ani is not None:
@@ -405,11 +408,11 @@ class Interface():
             self.ADC_ani = None
         if self.Time_flagADC == 'disabled':
             self.Time_flagADC = 'normal'
-            self.grafspin1ADC.configure(state=[self.Time_flagADC])
+            self.grafspin1ADC.configure(state=self.Time_flagADC)
         else:
             self.ADC_file1 = open(self.file, 'r')
             self.Time_flagADC = 'disabled'
-            self.grafspin1.configure(state=[self.Time_flagADC])
+            self.grafspin1.configure(state=self.Time_flagADC)
             with self.ADC_file1 as f:
                 self.ADC_lines = f.readlines()
 
@@ -440,7 +443,7 @@ class Interface():
                                      init_func=init1, blit=True, interval=5, repeat=False)
 
             self.canvas_ADC.draw()
-            Interface.window.after(10, None)
+            Interface.window.after(10, lambda: None)
 
     def clicked_timeTEM(self):
         if self.TEM_ani is not None:
@@ -448,11 +451,11 @@ class Interface():
             self.TEM_ani = None
         if self.Time_flagTEM == 'disabled':
             self.Time_flagTEM = 'normal'
-            self.grafspin1TEM.configure(state=[self.Time_flagTEM])
+            self.grafspin1TEM.configure(state=self.Time_flagTEM)
         else:
             self.TEM_file1 = open(self.file, 'r')
             self.Time_flagTEM = 'disabled'
-            self.grafspin1TEM.configure(state=[self.Time_flagTEM])
+            self.grafspin1TEM.configure(state=self.Time_flagTEM)
             with self.TEM_file1 as f:
                 self.TEM_lines = f.readlines()
 
@@ -483,7 +486,7 @@ class Interface():
                                      init_func=init1, blit=True, interval=5, repeat=False)
 
             self.canvas_TEM.draw()
-            Interface.window.after(10, None)
+            Interface.window.after(10, lambda: None)
 
     def block_control(self):
         self.f_BC = ttk.LabelFrame(Interface.window, text='Текущее значение данных:', relief=SOLID)
@@ -497,11 +500,11 @@ class Interface():
         self.impSV = StringVar(value=round(self.ydata[-1]))
         self.adcSV = StringVar(value=round(self.ADC_ydata[-1]))
         self.temSV = StringVar(value=round(self.TEM_ydata[-1]))
-        self.IMP_entry = Entry(self.f_BC, width=15, state=['disable'], textvariable=self.impSV)
+        self.IMP_entry = Entry(self.f_BC, width=15, state='disabled', textvariable=self.impSV)
         self.IMP_entry.grid(column=0, row=1)
-        self.ADC_entry = Entry(self.f_BC, width=15, state=['disable'], textvariable=self.adcSV)
+        self.ADC_entry = Entry(self.f_BC, width=15, state='disabled', textvariable=self.adcSV)
         self.ADC_entry.grid(column=1, row=1, ipadx=15)
-        self.TEM_entry = Entry(self.f_BC, width=15, state=['disable'], textvariable=self.temSV)
+        self.TEM_entry = Entry(self.f_BC, width=15, state='disabled', textvariable=self.temSV)
         self.TEM_entry.grid(column=2, row=1)
 
     def mennuB(self):

+ 0 - 0
Test.py


+ 0 - 0
generatorT.py