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

Merge gsoc2022 jatin jain to develop #1599

Merged
merged 7 commits into from
Nov 21, 2022
Merged

Merge gsoc2022 jatin jain to develop #1599

merged 7 commits into from
Nov 21, 2022

Conversation

ReimarBauer
Copy link
Member

No description provided.

Jatin2020-24 and others added 5 commits November 21, 2022 10:14
@Jatin2020-24 @ReimarBauer
Filter flight paths (#1488)
344fc19 
* filter_flight_paths

* fixed_msui

* changed endpoints names and fixed typos

* inactivated_operation_list_updated

* added_tests

* fixed_pytest_error

* added_mscolab_tests

* enable_github_testing

* changed_branch name_in_testing-develop.yml

* initialized_"last_used"_attribute

* refactored_failing_tests

* refactored_failing_tests
@Jatin2020-24 @ReimarBauer
Multiple Flightpath on Topview (#1510)
2dd48df 
* multiple_flightpath_dockwidget

* updated_multiple_flightpath_dockwidget

* connect_slots_and_signals_to_open_ftml_files

* Update ui_multiple_flightpath_dockwidget.py

* updated_author_and_copyright_year

* plot_multiple_flighttracks

* remove_flighttrack_added

* remove_unchecked_flighttracks_from_canvas

* Update mpl_qtwidget.py

* reversed_plotting_of_lat_lon

* plot_flighttracks_from_MSUIMainWindow

* plot_inactive_flighttracks

* fixed_naming

* sync_listViews

* fixed_namespaces
@Jatin2020-24 @ReimarBauer
Mscolab Chat Improvements (#1508)
c3ca596 
* timestamps_below_messages

* added_ToDo
@Jatin2020-24 @ReimarBauer
updated_multiple_flightpath_dockwidget (#1544)
e8001dc 
* updated_multiple_flightpath_dockwidget

* set_activated_track_as_uncheckable

* changed_flags_naming

* improved_list_naming

* flickering_topview_solved

* change_color_of_selected_flightpath

* show_color_icon

* update_previously_activated_flighttrack_wp_model_in_dict

* check_previously_activated_track

* change_linewidth

* plot_operations_topview

* bug_fixes

* checkmark_protection_behaviour_updated

* show_flighttrack_color_icon

* defined_coloring_of_operation_flightpaths

* add_todos

* add_comments

* fixed_coloring_of_flighttracks

* clear_operation_list_after_logout

* signals_disconnected_after_logout

* update_last_used_operation

* fixed_test

* fixed_color

* implemented_operation_permission_revoked

* revoked_mscolab_permission

* change_operations_linewidth

* fixed_uncheck_operations

* remove_filter_flightpaths_test

* color_change_updated

* removed_activation_of_operations_on_addition

* Update msui.py

* fixed_tracks_coloring

* add_todos
@Jatin2020-24 @ReimarBauer
Add Documentation for Multiple Flightpath Dockwidget (#1595)
b24cc43 
* small_code_enhancements

* update_documentation
joernu76
joernu76 reviewed Nov 21, 2022
View reviewed changes
.github/workflows/testing-develop.yml
pull_request:
branches:
- develop
- GSOC2022-JatinJain
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

muss das nicht raus?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, in a further step. There is also some wording in the docs, I don't wanted to change more than flake8 in the merge. There will be follow up PR.

@ReimarBauer ReimarBauer merged commit 466e24e into develop Nov 21, 2022
ReimarBauer pushed a commit that referenced this pull request Nov 21, 2022
@Jatin2020-24 @ReimarBauer
Merge gsoc2022 jatin jain to develop (#1599)
64a6085 
* Filter flight paths (#1488)

* filter_flight_paths

* fixed_msui

* changed endpoints names and fixed typos

* inactivated_operation_list_updated

* added_tests

* fixed_pytest_error

* added_mscolab_tests

* enable_github_testing

* changed_branch name_in_testing-develop.yml

* initialized_"last_used"_attribute

* refactored_failing_tests

* refactored_failing_tests

* Multiple Flightpath on Topview (#1510)

* multiple_flightpath_dockwidget

* updated_multiple_flightpath_dockwidget

* connect_slots_and_signals_to_open_ftml_files

* Update ui_multiple_flightpath_dockwidget.py

* updated_author_and_copyright_year

* plot_multiple_flighttracks

* remove_flighttrack_added

* remove_unchecked_flighttracks_from_canvas

* Update mpl_qtwidget.py

* reversed_plotting_of_lat_lon

* plot_flighttracks_from_MSUIMainWindow

* plot_inactive_flighttracks

* fixed_naming

* sync_listViews

* fixed_namespaces

* Mscolab Chat Improvements (#1508)

* timestamps_below_messages

* added_ToDo

* updated_multiple_flightpath_dockwidget (#1544)

* updated_multiple_flightpath_dockwidget

* set_activated_track_as_uncheckable

* changed_flags_naming

* improved_list_naming

* flickering_topview_solved

* change_color_of_selected_flightpath

* show_color_icon

* update_previously_activated_flighttrack_wp_model_in_dict

* check_previously_activated_track

* change_linewidth

* plot_operations_topview

* bug_fixes

* checkmark_protection_behaviour_updated

* show_flighttrack_color_icon

* defined_coloring_of_operation_flightpaths

* add_todos

* add_comments

* fixed_coloring_of_flighttracks

* clear_operation_list_after_logout

* signals_disconnected_after_logout

* update_last_used_operation

* fixed_test

* fixed_color

* implemented_operation_permission_revoked

* revoked_mscolab_permission

* change_operations_linewidth

* fixed_uncheck_operations

* remove_filter_flightpaths_test

* color_change_updated

* removed_activation_of_operations_on_addition

* Update msui.py

* fixed_tracks_coloring

* add_todos

* Add Documentation for Multiple Flightpath Dockwidget (#1595)

* small_code_enhancements

* update_documentation

* flake8

* Empty-Commit

Co-authored-by: Jatin Jain <72596619+Jatin2020-24@users.noreply.github.com>
Co-authored-by: Jatin Jain <jatinalwar2001@gmail.com>
ReimarBauer added a commit that referenced this pull request Nov 21, 2022
@ReimarBauer @Jatin2020-24
Merge gsoc2022 jatin jain to develop (#1599) (#1600)
a44d1af 
* Filter flight paths (#1488)

* filter_flight_paths

* fixed_msui

* changed endpoints names and fixed typos

* inactivated_operation_list_updated

* added_tests

* fixed_pytest_error

* added_mscolab_tests

* enable_github_testing

* changed_branch name_in_testing-develop.yml

* initialized_"last_used"_attribute

* refactored_failing_tests

* refactored_failing_tests

* Multiple Flightpath on Topview (#1510)

* multiple_flightpath_dockwidget

* updated_multiple_flightpath_dockwidget

* connect_slots_and_signals_to_open_ftml_files

* Update ui_multiple_flightpath_dockwidget.py

* updated_author_and_copyright_year

* plot_multiple_flighttracks

* remove_flighttrack_added

* remove_unchecked_flighttracks_from_canvas

* Update mpl_qtwidget.py

* reversed_plotting_of_lat_lon

* plot_flighttracks_from_MSUIMainWindow

* plot_inactive_flighttracks

* fixed_naming

* sync_listViews

* fixed_namespaces

* Mscolab Chat Improvements (#1508)

* timestamps_below_messages

* added_ToDo

* updated_multiple_flightpath_dockwidget (#1544)

* updated_multiple_flightpath_dockwidget

* set_activated_track_as_uncheckable

* changed_flags_naming

* improved_list_naming

* flickering_topview_solved

* change_color_of_selected_flightpath

* show_color_icon

* update_previously_activated_flighttrack_wp_model_in_dict

* check_previously_activated_track

* change_linewidth

* plot_operations_topview

* bug_fixes

* checkmark_protection_behaviour_updated

* show_flighttrack_color_icon

* defined_coloring_of_operation_flightpaths

* add_todos

* add_comments

* fixed_coloring_of_flighttracks

* clear_operation_list_after_logout

* signals_disconnected_after_logout

* update_last_used_operation

* fixed_test

* fixed_color

* implemented_operation_permission_revoked

* revoked_mscolab_permission

* change_operations_linewidth

* fixed_uncheck_operations

* remove_filter_flightpaths_test

* color_change_updated

* removed_activation_of_operations_on_addition

* Update msui.py

* fixed_tracks_coloring

* add_todos

* Add Documentation for Multiple Flightpath Dockwidget (#1595)

* small_code_enhancements

* update_documentation

* flake8

* Empty-Commit

Co-authored-by: Jatin Jain <72596619+Jatin2020-24@users.noreply.github.com>
Co-authored-by: Jatin Jain <jatinalwar2001@gmail.com>

Co-authored-by: Jatin Jain <jatinalwar2001@gmail.com>
Co-authored-by: Jatin Jain <72596619+Jatin2020-24@users.noreply.github.com>
joernu76 pushed a commit that referenced this pull request Nov 21, 2022
@Jatin2020-24 @ReimarBauer @joernu76
Merge gsoc2022 jatin jain to develop (#1599)
e7a50d8 
* Filter flight paths (#1488)

* filter_flight_paths

* fixed_msui

* changed endpoints names and fixed typos

* inactivated_operation_list_updated

* added_tests

* fixed_pytest_error

* added_mscolab_tests

* enable_github_testing

* changed_branch name_in_testing-develop.yml

* initialized_"last_used"_attribute

* refactored_failing_tests

* refactored_failing_tests

* Multiple Flightpath on Topview (#1510)

* multiple_flightpath_dockwidget

* updated_multiple_flightpath_dockwidget

* connect_slots_and_signals_to_open_ftml_files

* Update ui_multiple_flightpath_dockwidget.py

* updated_author_and_copyright_year

* plot_multiple_flighttracks

* remove_flighttrack_added

* remove_unchecked_flighttracks_from_canvas

* Update mpl_qtwidget.py

* reversed_plotting_of_lat_lon

* plot_flighttracks_from_MSUIMainWindow

* plot_inactive_flighttracks

* fixed_naming

* sync_listViews

* fixed_namespaces

* Mscolab Chat Improvements (#1508)

* timestamps_below_messages

* added_ToDo

* updated_multiple_flightpath_dockwidget (#1544)

* updated_multiple_flightpath_dockwidget

* set_activated_track_as_uncheckable

* changed_flags_naming

* improved_list_naming

* flickering_topview_solved

* change_color_of_selected_flightpath

* show_color_icon

* update_previously_activated_flighttrack_wp_model_in_dict

* check_previously_activated_track

* change_linewidth

* plot_operations_topview

* bug_fixes

* checkmark_protection_behaviour_updated

* show_flighttrack_color_icon

* defined_coloring_of_operation_flightpaths

* add_todos

* add_comments

* fixed_coloring_of_flighttracks

* clear_operation_list_after_logout

* signals_disconnected_after_logout

* update_last_used_operation

* fixed_test

* fixed_color

* implemented_operation_permission_revoked

* revoked_mscolab_permission

* change_operations_linewidth

* fixed_uncheck_operations

* remove_filter_flightpaths_test

* color_change_updated

* removed_activation_of_operations_on_addition

* Update msui.py

* fixed_tracks_coloring

* add_todos

* Add Documentation for Multiple Flightpath Dockwidget (#1595)

* small_code_enhancements

* update_documentation

* flake8

* Empty-Commit

Co-authored-by: Jatin Jain <72596619+Jatin2020-24@users.noreply.github.com>
Co-authored-by: Jatin Jain <jatinalwar2001@gmail.com>
Co-authored-by: ReimarBauer <rb.proj@gmail.com>
@ReimarBauer ReimarBauer deleted the mege_GSOC2022-JatinJain_to_develop branch November 28, 2022 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joernu76 joernu76 joernu76 approved these changes

@Jatin2020-24 Jatin2020-24 Awaiting requested review from Jatin2020-24

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ReimarBauer @joernu76 @Jatin2020-24