Eomys · BonneelP · Feb 27, 2024 · Nov 21, 2023 · Nov 21, 2023 · Nov 22, 2023
diff --git a/Doc/Converter/Converter.ipynb b/Doc/Converter/Converter.ipynb
diff --git a/Doc/Converter/Images/Architecture_Converter.png b/Doc/Converter/Images/Architecture_Converter.png
diff --git a/Doc/Converter/Images/Machine_dimension.png b/Doc/Converter/Images/Machine_dimension.png
diff --git a/Doc/Converter/Images/Selection_machine.png b/Doc/Converter/Images/Selection_machine.png
diff --git a/Doc/Converter/Images/UML_convert.png b/Doc/Converter/Images/UML_convert.png
diff --git a/Doc/Converter/Images/UML_rules.png b/Doc/Converter/Images/UML_rules.png
diff --git a/Doc/Converter/Images/convert_mot_to_dict.png b/Doc/Converter/Images/convert_mot_to_dict.png
diff --git a/Doc/Converter/Images/schematics_architecture_converter.png b/Doc/Converter/Images/schematics_architecture_converter.png
diff --git a/Doc/Converter/Images/structure_converter.png b/Doc/Converter/Images/structure_converter.png
diff --git a/Tests/Data/test_Loss_Import.xlsx b/Tests/Data/test_Loss_Import.xlsx
diff --git a/Tests/Data/test_Loss_Import_csv.csv b/Tests/Data/test_Loss_Import_csv.csv
@@ -0,0 +1,25 @@
+1.00E+01,1.00E+00,1.00E-01
+2.00E+01,2.00E+00,2.00E-01
+3.00E+01,3.00E+00,3.00E-01
+4.00E+01,4.00E+00,4.00E-01
+5.00E+01,5.00E+00,5.00E-01
+6.00E+01,6.00E+00,6.00E-01
+7.00E+01,7.00E+00,7.00E-01
+8.00E+01,8.00E+00,8.00E-01
+9.00E+01,9.00E+00,9.00E-01
+1.00E+02,1.00E+01,1.00E+00
+1.10E+02,1.10E+01,1.10E+00
+1.20E+02,1.20E+01,1.20E+00
+1.30E+02,1.30E+01,1.30E+00
+1.40E+02,1.40E+01,1.40E+00
+1.50E+02,1.50E+01,1.50E+00
+1.60E+02,1.60E+01,1.60E+00
+1.70E+02,1.70E+01,1.70E+00
+1.80E+02,1.80E+01,1.80E+00
+1.90E+02,1.90E+01,1.90E+00
+2.00E+02,2.00E+01,2.00E+00
+2.10E+02,2.10E+01,2.10E+00
+2.20E+02,2.20E+01,2.20E+00
+2.30E+02,2.30E+01,2.30E+00
+2.40E+02,2.40E+01,2.40E+00
+2.50E+02,2.50E+01,2.50E+00
diff --git a/Tests/GUI/Dialog/DMachineSetup/NewMachine/test_new_machine_Zoe.py b/Tests/GUI/Dialog/DMachineSetup/NewMachine/test_new_machine_Zoe.py
@@ -457,7 +457,8 @@ def test_Zoe(self):
             == "Slot pitch: 360 / Zs = 90 [°] (1.571 [rad])"
         )
 
-        assert self.widget.w_step.c_slot_type.count() == 2
+        assert self.widget.w_step.c_slot_type.count() == 5
+
         assert self.widget.w_step.c_slot_type.currentText() == "Pole Type 60"
 
         assert self.widget.w_step.test_err_msg is None

diff --git a/Tests/GUI/Dialog/DMachineSetup/PMSlot/test_PMSlot15.py b/Tests/GUI/Dialog/DMachineSetup/PMSlot/test_PMSlot15.py
@@ -122,7 +122,7 @@ def test_set_Rtopm(self):
 
     def test_output_txt(self):
         """Check that the Output text is computed and correct"""
-        self.test_obj.slot = SlotM15(H0=0.005, H1=0.005, W0=0.01, W1=0.01, Rtopm=0.02)
+        self.test_obj.slot = SlotM15(H0=0.005, H1=0.005, W0=0.1, W1=0.01, Rtopm=0.02)
         self.widget = PMSlot15(self.test_obj, self.material_dict)
         assert self.widget.w_out.out_slot_height.text() == "Slot height: 0.005 [m]"
 
@@ -145,6 +145,12 @@ def test_check(self):
         # Rtopm
         self.test_obj.slot = SlotM15(H0=0.10, H1=0.10, W0=0.10, W1=0.1, Rtopm=None)
         assert self.widget.check(self.test_obj) == "You must set Rtopm !"
+        # W1 <= W0
+        self.test_obj.slot = SlotM15(H0=0.10, H1=0.10, W0=0.10, W1=0.8, Rtopm=0.1)
+        assert self.widget.check(self.test_obj) == "You must have W1 <= W0"
+        # W1 <= 2*Rtopm
+        self.test_obj.slot = SlotM15(H0=0.005, H1=0.005, W0=0.1, W1=0.01, Rtopm=0.004)
+        assert self.widget.check(self.test_obj) == "You must have W1 <= 2*Rtopm"
 
     def test_set_material(self):
         """Check that you can change the material"""
@@ -170,4 +176,5 @@ def test_set_type_magnetization(self):
     a.setup_method()
     a.test_init()
     a.teardown_class()
+    a.test_check()
     print("Done")
diff --git a/Tests/GUI/Dialog/DMachineSetup/PWSlot/test_PWSlot11_2.py b/Tests/GUI/Dialog/DMachineSetup/PWSlot/test_PWSlot11_2.py
@@ -0,0 +1,143 @@
+# -*- coding: utf-8 -*-
+
+import sys
+
+from PySide2 import QtWidgets
+from PySide2.QtTest import QTest
+from numpy import pi
+from Tests.GUI import gui_option  # Set unit as [m]
+from pyleecan.Classes.LamSlotMag import LamSlotMag
+from pyleecan.Classes.SlotW11_2 import SlotW11_2
+from pyleecan.Classes.LamSlotWind import LamSlotWind
+from pyleecan.GUI.Dialog.DMachineSetup.SWSlot.PWSlot11.PWSlot11 import PWSlot11
+from pyleecan.Classes.Notch import Notch
+from pyleecan.Classes.Material import Material
+from pyleecan.GUI.Dialog.DMatLib.DMatLib import MACH_KEY, LIB_KEY
+
+import pytest
+
+
+class TestPWSlot11_2:
+    """Test that the widget PWSlot11 behave like it should when using SlotW11_2"""
+
+    @classmethod
+    def setup_class(cls):
+        """Start the app for the test"""
+        print("\nStart Test TestPMSlot11")
+        if not QtWidgets.QApplication.instance():
+            cls.app = QtWidgets.QApplication(sys.argv)
+        else:
+            cls.app = QtWidgets.QApplication.instance()
+
+    @classmethod
+    def teardown_class(cls):
+        """Exit the app after the test"""
+        cls.app.quit()
+
+    def setup_method(self):
+        self.material_dict = {LIB_KEY: list(), MACH_KEY: list()}
+        self.mat1 = Material(name="Mat1")
+        self.mat2 = Material(name="Mat2")
+        self.mat3 = Material(name="M400-50A")
+        self.mat4 = Material(name="Mat4")
+        self.material_dict[LIB_KEY] = [
+            self.mat1,
+            self.mat2,
+            self.mat3,
+        ]
+        self.material_dict[MACH_KEY] = [
+            self.mat4,
+        ]
+
+        self.test_obj = LamSlotWind(Rint=0.1, Rext=0.2, mat_type=self.mat3)
+        self.test_obj.slot = SlotW11_2(
+            H0=0.10,
+            H1=0.11,
+            H2=0.12,
+            W0=0.13,
+            W1=0.14,
+            W2=0.15,
+            R1=0.16,
+            H1_is_rad=False,
+        )
+        self.widget = PWSlot11(self.test_obj, self.material_dict)
+
+    def test_slot_type_unchanged(self):
+        # Set Wedge
+        self.widget.g_wedge.setChecked(True)
+        self.widget.w_wedge_mat.c_mat_type.setCurrentIndex(0)
+
+        # Remove wedge
+        self.widget.g_wedge.setChecked(False)
+        self.assert_slot_type()
+
+        # Set W0
+        self.widget.lf_W0.clear()
+        QTest.keyClicks(self.widget.lf_W0, "0.31")
+        self.widget.lf_W0.editingFinished.emit()  # To trigger the slot
+        self.assert_slot_type()
+
+        # Set W1
+        self.widget.lf_W1.clear()
+        QTest.keyClicks(self.widget.lf_W1, "0.32")
+        self.widget.lf_W1.editingFinished.emit()  # To trigger the slot
+        self.assert_slot_type()
+
+        # Set W2
+        self.widget.lf_W2.clear()
+        QTest.keyClicks(self.widget.lf_W2, "0.33")
+        self.widget.lf_W2.editingFinished.emit()  # To trigger the slot
+        self.assert_slot_type()
+
+        # Set W3
+        self.widget.lf_W3.setEnabled(True)
+        self.widget.lf_W3.clear()
+        QTest.keyClicks(self.widget.lf_W3, "0.99")
+        self.widget.lf_W3.editingFinished.emit()  # To trigger the slot
+        self.assert_slot_type()
+
+        # Set H0
+        self.widget.lf_H0.clear()
+        QTest.keyClicks(self.widget.lf_H0, "0.34")
+        self.widget.lf_H0.editingFinished.emit()  # To trigger the slot
+        self.assert_slot_type()
+
+        # Set H1 in mm
+        self.widget.lf_H1.clear()
+        QTest.keyClicks(self.widget.lf_H1, "0.35")
+        self.widget.lf_H1.editingFinished.emit()  # To trigger the slot
+        self.assert_slot_type()
+
+        # Set H1 in deg
+        self.widget.c_H1_unit.setCurrentIndex(2)
+
+        self.widget.lf_H1.clear()  # Clear the field before writing
+        QTest.keyClicks(self.widget.lf_H1, str(1.4))
+        self.widget.lf_H1.editingFinished.emit()  # To trigger the slot
+        self.assert_slot_type()
+
+        # Set H1 in rad
+        self.widget.c_H1_unit.setCurrentIndex(1)
+        self.assert_slot_type()
+
+        # Set H2
+        self.widget.lf_H2.clear()
+        QTest.keyClicks(self.widget.lf_H2, "0.36")
+        self.widget.lf_H2.editingFinished.emit()  # To trigger the slot
+        self.assert_slot_type()
+
+        # Set R1
+        self.widget.lf_R1.clear()
+        QTest.keyClicks(self.widget.lf_R1, "0.37")
+        self.widget.lf_R1.editingFinished.emit()  # To trigger the slot
+        self.assert_slot_type()
+
+        # Set constant tooth
+        self.widget.is_cst_tooth.setChecked(True)
+        self.assert_slot_type()
+        self.widget.is_cst_tooth.setChecked(False)
+        self.assert_slot_type()
+
+    def assert_slot_type(self):
+        assert isinstance(self.test_obj.slot, SlotW11_2)
+        assert isinstance(self.widget.lamination.slot, SlotW11_2)