windows changes;

Automation/ChartWindow.py

@@ -116,7 +116,7 @@ class ChartWindow(AbstractWindow):
         self.parent.data_main.x = np.array(
             self.parent.data_main.data['I_0,mA']*b)
         self.parent.data_main.y = e
-        self.parent.data_main.ylabel = eds+'$_x$, mV'
+        self.parent.data_main.ylabel = eds+'$_x$, V'
         self.parent.data_main.xlabel = 'I$_{обр} \cdot B$, мА$\cdot $ Tл'
         self.parent.data_main.make_grafic()
         self.parent.data_main.xerr = abs(

Automation/Main.py

@@ -1,6 +1,6 @@
 import os
 import sys
-import serial
+# import serial
 import csv
 import time
 # from PyQt import KeepAspectRatioByExpanding
@@ -36,7 +36,7 @@ class Start:
         
         l = 'usbtmc'+str(1)
         self.I_M_name =  os.path.join('/dev', l)
-        self.add_equip()
+        # self.add_equip()
         
         
         self.draw()
@@ -119,7 +119,10 @@ class StartWindow(AbstractWindow):
         
         self.setWindowTitle('Эффект Холла в полупроводниках')
         self.parent = parent
-        self.parent.a = 0.05/10**3
+        self.parent.a = 2/10**3
+        self.parent.l = 4/10**3
+        self.parent.L = 5/10**3
+        self.parent.sigma = 4469
         self.parent.dataname = 'data.csv'
 
         self.centralwidget = QWidget()

Automation/ResistanceWindow.py

@@ -71,11 +71,10 @@ class ResistanceWindow(AbstractWindow):
     
     def start_clicked(self):
         self.start.setEnabled(False)
-        current=10
+        current=0
-        voltage=15
+        voltage=1
-        voltage, current = self.measure()
+        # voltage, current = self.measure())
-        print(voltage*self.parent.l*self.parent.a)
+        self.parent.sigma = 4469
-        print(current*self.parent.L)
         
         self.parent.sigma = abs(current*self.parent.L/(voltage*self.parent.l*self.parent.a))
         self.parent.sigma_sigma = abs(self.parent.sigma*((5*10**-5)**2+(0.0035/100)**2)**0.5)