Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NF] Notch GUI #546

Merged
merged 51 commits into from Jun 10, 2022
Merged

[NF] Notch GUI #546

merged 51 commits into from Jun 10, 2022

Commits on Jun 1, 2022

  1. [WIP] Adding widgets for Notches

    @BonneelP
    BonneelP committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    6420ffc View commit details
    Browse the repository at this point in the history

  2. [WP] activating notch setup on lamination with SloM10 shape for the b… 

    …eginning
    @IrakozeFD
    IrakozeFD committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    5ca81c5 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2022

  1. [NF] Adding empty schematics for SlotM10 and SlotM11

    @BonneelP
    BonneelP committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    bd1f6eb View commit details
    Browse the repository at this point in the history

  2. [CO] is_notch parameter

    @BonneelP
    BonneelP committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    9891c3f View commit details
    Browse the repository at this point in the history

  3. [WIP] Adding plot_schematics.py for SlotCirc

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    1a20f49 View commit details
    Browse the repository at this point in the history

  4. [WIp] Working on SlotCirc/plot_schematics.py + adding it in test_plot… 

    …_schematics.py
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    9a46a2a View commit details
    Browse the repository at this point in the history

  5. [NF] Adding schematic for SlotCirc : adding method plot_schematics, a… 

    …dding point in _comp_point_coordinate for the schematics, adding it in test_plot_schematics.py
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    f225d57 View commit details
    Browse the repository at this point in the history

  6. [NF] Notches definition

    @BonneelP
    BonneelP committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    844e6f5 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'Branch_Dev_B' of https://github.com/EOMYS-Public/pyleecan… 

    … into Branch_Dev_B
    @BonneelP
    BonneelP committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    8dc7ffb View commit details
    Browse the repository at this point in the history

  8. [CC] Renaming folder

    @BonneelP
    BonneelP committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    0c82d59 View commit details
    Browse the repository at this point in the history

  9. [WIP] Notches setup

    @BonneelP
    BonneelP committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    5245c69 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2022

  1. [NF] Adding SlotCirc definition interface in the GUI

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    82e21aa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Branch_Dev_B' of https://github.com/EOMYS-Public/pyleecan… 

    … into Branch_Dev_B

# Conflicts:
#	pyleecan/GUI/Dialog/DMachineSetup/DNotchTab/WNotch/WNotch.py
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    79ff182 View commit details
    Browse the repository at this point in the history

  3. [NF] Adding SlotCirc interface inside WNotch

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    5ca8d6f View commit details
    Browse the repository at this point in the history

  4. [NF] Changing name of widget used to define SlotCirc

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    3b6e2de View commit details
    Browse the repository at this point in the history

  5. [NF] Adding test on WSlotCirc

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    5b0a1aa View commit details
    Browse the repository at this point in the history

  6. [CO] Plot and check notches

    @BonneelP
    BonneelP committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    c054c84 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'Branch_Dev_B' of https://github.com/EOMYS-Public/pyleecan… 

    … into Branch_Dev_B

# Conflicts:
#	pyleecan/GUI/Dialog/DMachineSetup/DNotchTab/WNotch/WNotch.py
    @BonneelP
    BonneelP committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    3078e90 View commit details
    Browse the repository at this point in the history

  8. [CO] Check

    @BonneelP
    BonneelP committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    9a8bd15 View commit details
    Browse the repository at this point in the history

  9. [WIP] Adding test to check that we can add notches to the rotor and t… 

    …he stator of a machine
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    4fd5f1b View commit details
    Browse the repository at this point in the history

  10. [WIP] Continuing test_notche_addition.py

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    665d8a7 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'Branch_Dev_B' of https://github.com/EOMYS-Public/pyleecan… 

    … into Branch_Dev_B
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    0840800 View commit details
    Browse the repository at this point in the history

  12. [WIP] Working on test_notche_addition.py

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    0e878ec View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2022

  1. [NF] Finishing test_notch_addition by simulating the addition of a no… 

    …tch on the rotor + checking that the machine is correctly saved. Fixing bug where we would load Test\Data\Material, instead loading pyleecan\Data\Material
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    a390ee4 View commit details
    Browse the repository at this point in the history

  2. [BC] modifying TEST_DATA_DIR to DATA_DIR

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    09be418 View commit details
    Browse the repository at this point in the history

  3. (CO] Modifying test_notch_addition : adding comments + checking updat… 

    …e of UI according to its machine (nb of notches)
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    b109064 View commit details
    Browse the repository at this point in the history

  4. [CO] Adding test on cancel button of DNotchTab

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    7db3752 View commit details
    Browse the repository at this point in the history

  5. [NF] Adding method called after click on ok button of DNotchTab to ma… 

    …ke sure that the UI is filled out and that the notches aren't colliding with the rest of the machine (including changing the error message)
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    a5617b7 View commit details
    Browse the repository at this point in the history

  6. [CO] Adding check on notch added to the machine of the GUI

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    dc99fb1 View commit details
    Browse the repository at this point in the history

  7. [NF] Adding test when the input of GUI are not filled out (error mess… 

    …age should appear)
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    3dd4f28 View commit details
    Browse the repository at this point in the history

  8. [NF] Adding case where preview of WNotch can not be generated (displa… 

    …ying a QMessageBox)
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    df22af4 View commit details
    Browse the repository at this point in the history

  9. [CO] adding test in test_notch_addition where wrong input are given (… 

    …notch colliding with slot)
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    d10b276 View commit details
    Browse the repository at this point in the history

  10. [CO] Creating new argument err_msg for DNotchTab and WNotch to detect… 

    … the right error in test
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    d8a41a8 View commit details
    Browse the repository at this point in the history

  11. [CO] adding new test in test_notche_addition.py to detect that the ri… 

    …ght error is raised
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    c0c35ed View commit details
    Browse the repository at this point in the history

  12. [CC]

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    211c44b View commit details
    Browse the repository at this point in the history

  13. [BC] Solving error where the value inside a FloatEdit was kept after … 

    …deleting the text inside (case where test was "")
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    2a3bde0 View commit details
    Browse the repository at this point in the history

  14. [CO] adding test on floatedit to solve error where value given was ""… 

    … + closing each widget before teardown
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    9fdf58c View commit details
    Browse the repository at this point in the history

  15. [CO] Making sure that before each check err_msg of DNotchTab/WNotch i… 

    …s set back to None to prevent from qmessagebox
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    5614453 View commit details
    Browse the repository at this point in the history

  16. [WIP] regen gui

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    b521f7d View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. [WIP] Changing tooltip to comply with notch

    @BaptisteMadery14
    BaptisteMadery14 committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    eaa25ea View commit details
    Browse the repository at this point in the history

  2. [CO] Adding tootip definition inside WNotch instead of having it gene… 

    …rated each time with a json
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    a8f8e32 View commit details
    Browse the repository at this point in the history

  3. [NF] New ext/int schematics

    @BonneelP
    BonneelP committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    867e5e4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Branch_Dev_B' of https://github.com/EOMYS-Public/pyleecan… 

    … into Branch_Dev_B
    @BonneelP
    BonneelP committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    4a7ffea View commit details
    Browse the repository at this point in the history

  5. [BC] fixing test error (changing si_Zs to si_Zn and Zs to Zn) just li… 

    …ke in the ui
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    7b1ed2f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'Branch_Dev_B' of https://github.com/EOMYS-Public/pyleecan… 

    … into Branch_Dev_B
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    54e0dea View commit details
    Browse the repository at this point in the history

  7. [NF] Changing the schematics of the notch inside PMSlot10, PMSlot11 a… 

    …nd WSlotCirc according to the lamination (stator ext or rotor int)
    @BaptisteMadery14
    BaptisteMadery14 committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    4142ca2 View commit details
    Browse the repository at this point in the history

  8. [NF] notch SlotUD in GUI

    @BonneelP
    BonneelP committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    faeb897 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'Branch_Dev_B' of https://github.com/EOMYS-Public/pyleecan… 

    … into Branch_Dev_B
    @BonneelP
    BonneelP committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    903fa6e View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2022

  1. [CO] Update Zs for SlotUD

    @BonneelP
    BonneelP committed Jun 9, 2022
    Configuration menu
    Copy the full SHA
    15d6458 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/Eomys/pyleecan into Branc… 

    …h_Dev_B
    @BonneelP
    BonneelP committed Jun 9, 2022
    Configuration menu
    Copy the full SHA
    74aa327 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2022

  1. Merge branch 'master' of https://github.com/Eomys/pyleecan into Branc… 

    …h_Dev_B

# Conflicts:
#	pyleecan/Classes/Class_Dict.json
#	pyleecan/Classes/Lamination.py
#	pyleecan/Classes/SlotCirc.py
    @BonneelP
    BonneelP committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    eaf4fac View commit details
    Browse the repository at this point in the history