use the surface speed overide value in calculations

dubstar-04 · Jul 11, 2021 · bfcc8a2 · bfcc8a2
1 parent b0ba9d7
commit bfcc8a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/PathFeedsAndSpeeds.py b/PathFeedsAndSpeeds.py
@@ -229,10 +229,10 @@ def get_surface_speed(self):
     def set_material(self, material):
         self.material = material
 
-    def calculate(self, tool):
+    def calculate(self, tool, surfaceSpeed):
 
         materials = load_materials()
-        surfaceSpeed = self.get_surface_speed()
+        # surfaceSpeed = self.get_surface_speed()
         Kp = next(item for item in materials if item["material"] == self.material).get("kp")
         # C = Power Constant
         C = getInterpolatedValue(load_powerConstant(), self.feedPerTooth)

diff --git a/PathFeedsAndSpeedsGui.py b/PathFeedsAndSpeedsGui.py
@@ -25,14 +25,15 @@ def __init__(self):
         self.calculate()
 
         # connect
-        self.form.material_CB.currentIndexChanged.connect(self.set_surface_speed)
+        self.form.material_CB.currentIndexChanged.connect(self.set_material)
         self.form.hss_RB.toggled.connect(self.calculate)
         self.form.cbd_RB.toggled.connect(self.calculate)
         self.form.toolDia_LE.textChanged.connect(self.calculate)
         self.form.flutes_SB.valueChanged.connect(self.calculate)
         self.form.FPT_SB.valueChanged.connect(self.calculate)
         self.form.WOC_SP.textChanged.connect(self.calculate)
         self.form.DOC_SP.textChanged.connect(self.calculate)
+        self.form.ss_LE.textChanged.connect(self.calculate)
         self.form.rpm_LE.textChanged.connect(self.calculate)
         self.form.toolController_CB.currentIndexChanged.connect(self.load_tool_properties)
         self.form.update_PB.clicked.connect(self.update_tool_controller)
@@ -55,7 +56,7 @@ def setup_ui(self):
         self.load_tools()
         self.load_tool_properties()
         self.set_tool_material()
-        self.set_surface_speed()
+        self.set_material()
 
     def set_tool_properties(self, dia, flutes, chipload, material):
         self.form.toolDia_LE.setText(str(dia))
@@ -70,14 +71,10 @@ def set_tool_properties(self, dia, flutes, chipload, material):
         elif material == "Carbide":
             self.form.cbd_RB.setChecked(True)
 
-    def set_surface_speed(self):
+    def set_material(self):
         material = self.form.material_CB.currentText()
-
         self.calculation.set_material(material)
-
         ss = self.calculation.get_surface_speed()
-        print("Surface Speed:", ss, material)
-
         self.form.ss_LE.setText(str(ss))
         self.calculate
 
@@ -133,6 +130,7 @@ def calculate(self):
         tool = PathFeedsAndSpeeds.Tool()
 
         self.calculation.rpm_overide = self.form.rpm_LE.text()
+        surfaceSpeed = float(self.form.ss_LE.text())
 
         if not self.form.rpm_LE.text() == "":
             self.form.rpm_result.setEnabled(False)
@@ -150,7 +148,7 @@ def calculate(self):
         if not self.calculation.feedPerTooth:
             return
 
-        rpm, hfeed, vfeed, Hp = self.calculation.calculate(tool)
+        rpm, hfeed, vfeed, Hp = self.calculation.calculate(tool, surfaceSpeed)
         watts = Hp * 745.69
 
         self.form.rpm_result.setText(str(rpm))