Skip to content

Commit

Permalink
Changed ESPMM in file names and functions to LVESPmm
Browse files Browse the repository at this point in the history
  • Loading branch information
KryptonNerd committed Oct 14, 2022
1 parent 62a399f commit c37a1e2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion LVESPmm_GUI.ui → GUI/LVESPmm_GUI.ui
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff>Logos and Images/Vertical Logo.png</normaloff>Logos and Images/Vertical Logo.png</iconset>
<normaloff>Vertical Logo.png</normaloff>Vertical Logo.png</iconset>
</property>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
Expand Down
Binary file added GUI/Vertical Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions ESPMM_Main.py → LVESPmm_Main.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from PyQt5 import QtWidgets, uic
import sys
from ESPMM import ESPMM_calc
from LVESPmm_calc import LVESPmm_calc

ESPMM_Result = None
steps_options = [400,200,48]
Expand All @@ -11,7 +11,7 @@
class LVESPmm_GUI(QtWidgets.QWidget):
def __init__(self):
super(LVESPmm_GUI, self).__init__()
uic.loadUi('LVESPmm_GUI.ui', self)
uic.loadUi('GUI\LVESPmm_GUI.ui', self)

self.pushButton_calc.clicked.connect(self.Calc)
self.comboBox_steps.addItems(steps_options_txt)
Expand Down Expand Up @@ -39,8 +39,8 @@ def Calc(self):
steps = float(steps_options[self.comboBox_steps.currentIndex()])
usteps = float(usteps_options[self.comboBox_usteps.currentIndex()])

ESPMM_Result = ESPMM_calc(pitch, starts, rs, rb, steps, usteps)
self.lcdNumber_espmm.display(float(ESPMM_Result))
LVESPmm_Result = LVESPmm_calc(pitch, starts, rs, rb, steps, usteps)
self.lcdNumber_espmm.display(float(LVESPmm_Result))



Expand Down
4 changes: 2 additions & 2 deletions ESPMM.py → LVESPmm_calc.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
def ESPMM_calc(pitch,starts,rs,rb,steps,usteps):
def LVESPmm_calc(pitch,starts,rs,rb,steps,usteps):
ls = pitch * starts
espmm = steps * usteps * (rb**2)/(ls * (rs**2))
return espmm


#x = ESPMM_calc(0.8, 1, 9.565, 2, 200, 16)
#x = LVESPmm_calc(0.8, 1, 9.565, 2, 200, 16)
#print(x)

0 comments on commit c37a1e2

Please sign in to comment.