From b44b95e13f01df5c9669001ecd140ce3c99e08fb Mon Sep 17 00:00:00 2001
From: anna <anna8g5@mail.ru>
Date: Tue, 27 Dec 2022 21:50:41 +0300
Subject: [PATCH] windows changes;

---
 Automation/ChartWindow.py                 |   2 +-
 Automation/Main.py                        |   9 ++++++---
 Automation/{ => Manual}/Manual.aux        |   0
 Automation/{ => Manual}/Manual.dvi        | Bin
 Automation/{ => Manual}/Manual.log        |   0
 Automation/{ => Manual}/Manual.out        |   0
 Automation/{ => Manual}/Manual.pdf        | Bin
 Automation/{ => Manual}/Manual.synctex.gz | Bin
 Automation/{ => Manual}/Manual.tex        |   0
 Automation/{ => Manual}/Teor.png          | Bin
 Automation/{ => Manual}/Мостик.png        | Bin
 Automation/{ => Manual}/Установка.png     | Bin
 Automation/ResistanceWindow.py            |   9 ++++-----
 13 files changed, 11 insertions(+), 9 deletions(-)
 rename Automation/{ => Manual}/Manual.aux (100%)
 rename Automation/{ => Manual}/Manual.dvi (100%)
 rename Automation/{ => Manual}/Manual.log (100%)
 rename Automation/{ => Manual}/Manual.out (100%)
 rename Automation/{ => Manual}/Manual.pdf (100%)
 rename Automation/{ => Manual}/Manual.synctex.gz (100%)
 rename Automation/{ => Manual}/Manual.tex (100%)
 rename Automation/{ => Manual}/Teor.png (100%)
 rename Automation/{ => Manual}/Мостик.png (100%)
 rename Automation/{ => Manual}/Установка.png (100%)

diff --git a/Automation/ChartWindow.py b/Automation/ChartWindow.py
index 61240aa..5deffc1 100644
--- a/Automation/ChartWindow.py
+++ b/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(
diff --git a/Automation/Main.py b/Automation/Main.py
index a1aff36..2db2567 100644
--- a/Automation/Main.py
+++ b/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()
diff --git a/Automation/Manual.aux b/Automation/Manual/Manual.aux
similarity index 100%
rename from Automation/Manual.aux
rename to Automation/Manual/Manual.aux
diff --git a/Automation/Manual.dvi b/Automation/Manual/Manual.dvi
similarity index 100%
rename from Automation/Manual.dvi
rename to Automation/Manual/Manual.dvi
diff --git a/Automation/Manual.log b/Automation/Manual/Manual.log
similarity index 100%
rename from Automation/Manual.log
rename to Automation/Manual/Manual.log
diff --git a/Automation/Manual.out b/Automation/Manual/Manual.out
similarity index 100%
rename from Automation/Manual.out
rename to Automation/Manual/Manual.out
diff --git a/Automation/Manual.pdf b/Automation/Manual/Manual.pdf
similarity index 100%
rename from Automation/Manual.pdf
rename to Automation/Manual/Manual.pdf
diff --git a/Automation/Manual.synctex.gz b/Automation/Manual/Manual.synctex.gz
similarity index 100%
rename from Automation/Manual.synctex.gz
rename to Automation/Manual/Manual.synctex.gz
diff --git a/Automation/Manual.tex b/Automation/Manual/Manual.tex
similarity index 100%
rename from Automation/Manual.tex
rename to Automation/Manual/Manual.tex
diff --git a/Automation/Teor.png b/Automation/Manual/Teor.png
similarity index 100%
rename from Automation/Teor.png
rename to Automation/Manual/Teor.png
diff --git a/Automation/Мостик.png b/Automation/Manual/Мостик.png
similarity index 100%
rename from Automation/Мостик.png
rename to Automation/Manual/Мостик.png
diff --git a/Automation/Установка.png b/Automation/Manual/Установка.png
similarity index 100%
rename from Automation/Установка.png
rename to Automation/Manual/Установка.png
diff --git a/Automation/ResistanceWindow.py b/Automation/ResistanceWindow.py
index 3540bf3..12ff5b0 100644
--- a/Automation/ResistanceWindow.py
+++ b/Automation/ResistanceWindow.py
@@ -71,11 +71,10 @@ class ResistanceWindow(AbstractWindow):
     
     def start_clicked(self):
         self.start.setEnabled(False)
-        current=10
-        voltage=15
-        voltage, current = self.measure()
-        print(voltage*self.parent.l*self.parent.a)
-        print(current*self.parent.L)
+        current=0
+        voltage=1
+        # voltage, current = self.measure())
+        self.parent.sigma = 4469
         
         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)