Merge pull request #304 from EOMYS-Public/Slot

[NF] New Slot schematics and GUI improvements

Author: BonneelP

Tests/GUI/DMachineSetup/test_DMachineSetup.py

@@ -37,10 +37,10 @@
     {"type": "DFIM", "index": 1, "name": "DFIM_001", "p": 2, "count": 13}
 )
 load_test.append(  # 3
-    {"type": "SyRM", "index": 2, "name": "SynRM_001", "p": 2, "count": 10}
+    {"type": "SynRM", "index": 2, "name": "SynRM_001", "p": 2, "count": 10}
 )
 load_test.append(  # 4
-    {"type": "SIPMSM", "index": 3, "name": "SIPMSM_008", "p": 4, "count": 10}
+    {"type": "SPMSM", "index": 3, "name": "SIPMSM_008", "p": 4, "count": 10}
 )
 load_test.append(  # 5
     {"type": "IPMSM", "index": 4, "name": "machine_IPMSM_A", "p": 5, "count": 10}
@@ -120,14 +120,14 @@ def test_set_save_machine_type(self, setup):
         assert setup["widget"].w_step.c_type.currentText() == "DFIM"
         assert type(setup["widget"].machine) == MachineDFIM
         save_function(setup["widget"], "test_dfim_save")
-        # SyRM
+        # SynRM
         setup["widget"].w_step.c_type.setCurrentIndex(2)
-        assert setup["widget"].w_step.c_type.currentText() == "SyRM"
+        assert setup["widget"].w_step.c_type.currentText() == "SynRM"
         assert type(setup["widget"].machine) == MachineSyRM
-        save_function(setup["widget"], "test_syrm_save")
+        save_function(setup["widget"], "test_synrm_save")
         # SIPMSM
         setup["widget"].w_step.c_type.setCurrentIndex(3)
-        assert setup["widget"].w_step.c_type.currentText() == "SIPMSM"
+        assert setup["widget"].w_step.c_type.currentText() == "SPMSM"
         assert type(setup["widget"].machine) == MachineSIPMSM
         save_function(setup["widget"], "test_sipmsm_save")
         # IPMSM

Tests/GUI/DMachineSetup/test_PHoleM50.py

@@ -249,7 +249,7 @@ def test_comp_output(self, setup):
 
         # Nan are there because the value are not correct for the sin, cos and tan methods. But with true values, it works.
 
-        assert setup["widget"].out_slot_surface.text() == "Slot suface (2 part): nan m²"
-        assert setup["widget"].out_magnet_surface.text() == "Magnet surface: 0.0608 m²"
-        assert setup["widget"].out_alpha.text() == "alpha: nan rad (nan°)"
-        assert setup["widget"].out_W5.text() == "W5: nan m"
+        assert setup["widget"].out_slot_surface.text() == "Slot surface: nan [m²]"
+        assert setup["widget"].out_magnet_surface.text() == "Magnet surf.: 0.0608 [m²]"
+        assert setup["widget"].out_alpha.text() == "alpha: nan [rad] (nan°)"
+        assert setup["widget"].out_W5.text() == "W5: nan [m]"

Tests/GUI/DMachineSetup/test_PWSlot10.py

@@ -138,7 +138,9 @@ def test_output_txt(self, setup):
             H0=0.005, H1=0.005, H2=0.02, W0=0.01, W1=0.02, W2=0.01, H1_is_rad=False
         )
         setup["widget"] = PWSlot10(setup["test_obj"])
-        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.03006 m"
+        assert (
+            setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.03006 [m]"
+        )
 
     def test_check(self, setup):
         """Check that the check is working correctly"""

Tests/GUI/DMachineSetup/test_PWSlot11.py

@@ -170,7 +170,9 @@ def test_output_txt(self, setup):
             H1_is_rad=False,
         )
         setup["widget"] = PWSlot11(setup["test_obj"])
-        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.03006 m"
+        assert (
+            setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.03006 [m]"
+        )
 
     def test_check(self, setup):
         """Check that the check is working correctly"""

Tests/GUI/DMachineSetup/test_PWSlot12.py

@@ -83,7 +83,9 @@ def test_output_txt(self, setup):
         """Check that the Output text is computed and correct"""
         setup["test_obj"].slot = SlotW12(H0=0.01, H1=0.02, R1=0.005, R2=0.005)
         setup["widget"] = PWSlot12(setup["test_obj"])
-        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.04506 m"
+        assert (
+            setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.04506 [m]"
+        )
 
     def test_check(self, setup):
         """Check that the check is working correctly"""

Tests/GUI/DMachineSetup/test_PWSlot13.py

@@ -171,7 +171,9 @@ def test_output_txt(self, setup):
             H1_is_rad=False,
         )
         setup["widget"] = PWSlot13(setup["test_obj"])
-        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.03502 m"
+        assert (
+            setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.03502 [m]"
+        )
 
     def test_check(self, setup):
         """Check that the check is working correctly"""

Tests/GUI/DMachineSetup/test_PWSlot14.py

@@ -93,7 +93,9 @@ def test_output_txt(self, setup):
         """Check that the Output text is computed and correct"""
         setup["test_obj"].slot = SlotW14(H0=0.005, H1=0.01, H3=0.025, W0=0.005, W3=0.02)
         setup["widget"] = PWSlot14(setup["test_obj"])
-        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.03987 m"
+        assert (
+            setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.03987 [m]"
+        )
 
     def test_check(self, setup):
         """Check that the check is working correctly"""

Tests/GUI/DMachineSetup/test_PWSlot15.py

@@ -117,7 +117,7 @@ def test_output_txt(self, setup):
             Zs=6, W0=10e-3, W3=30e-3, H0=5e-3, H1=20e-3, H2=50e-3, R1=15e-3, R2=10e-3
         )
         setup["widget"] = PWSlot15(setup["test_obj"])
-        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.075 m"
+        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.075 [m]"
 
     def test_check(self, setup):
         """Check that the check is working correctly"""

Tests/GUI/DMachineSetup/test_PWSlot16.py

@@ -106,7 +106,7 @@ def test_output_txt(self, setup):
             Zs=6, W0=2 * pi / 60, W3=30e-3, H0=10e-3, H2=70e-3, R1=15e-3
         )
         setup["widget"] = PWSlot16(setup["test_obj"])
-        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.08 m"
+        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.08 [m]"
 
     def test_check(self, setup):
         """Check that the check is working correctly"""

Tests/GUI/DMachineSetup/test_PWSlot21.py

@@ -156,7 +156,7 @@ def test_output_txt(self, setup):
             H1_is_rad=False,
         )
         setup["widget"] = PWSlot21(setup["test_obj"])
-        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.1504 m"
+        assert setup["widget"].w_out.out_slot_height.text() == "Slot height: 0.1504 [m]"
 
     def test_check(self, setup):
         """Check that the check is working correctly"""