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

Multiple Flightpath on Topview #1510

Merged
merged 15 commits into from
Aug 26, 2022
Merged

Multiple Flightpath on Topview #1510

merged 15 commits into from
Aug 26, 2022

Conversation

Jatin2020-24
Copy link
Contributor

No description provided.

@Jatin2020-24 Jatin2020-24 marked this pull request as draft July 29, 2022 06:14
ReimarBauer
ReimarBauer reviewed Aug 1, 2022
View reviewed changes
Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

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

When we work with "loaded" ftml files we have them already in the flight track list. It would be good to show them in the multiple flightpath files list too. And the one which is activated is there also activated.

multiple_flighpath

ReimarBauer
ReimarBauer reviewed Aug 9, 2022
View reviewed changes
Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

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

tried, ftml files can be readed now and they get displayed.
There is a small problem, they are displayed mirrored
Have a look on the transfornation.

mirrored

@Jatin2020-24
Copy link
Contributor Author

Jatin2020-24 commented Aug 10, 2022 •
edited
Loading

Reversing of lon and lat during plotting is causing mirroring flighttracks problem. Now, it working properly.

Jatin2020-24
Jatin2020-24 commented Aug 16, 2022
View reviewed changes
mslib/msui/multiple_flightpath_dockwidget.py Outdated
self.waypoint_list = [] # List of waypoints parsed from FTML file
self.directory_location = None
self.waypoints_modelList = []
self.active_flight_track = activeFlightTrack
Copy link
Contributor Author

@Jatin2020-24 Jatin2020-24 Aug 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

@ReimarBauer How to update active_flight_track instance variable every time when new flighttrack gets activated?

Copy link
Member

Choose a reason for hiding this comment

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

can that be readed from the UI ?
Or do you need it as a global var?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I need global var

Copy link
Member

Choose a reason for hiding this comment

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

Have also a look if you can solve it by emit signals, see

https://itecnote.com/tecnote/python-pyqt-modify-gui-from-another-thread/
https://doc.qt.io/archives/qt-4.8/threads-qobject.html (there may be an update of this)

ReimarBauer
ReimarBauer approved these changes Aug 26, 2022
View reviewed changes
Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

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

first step done

mslib/msui/multiple_flightpath_dockwidget.py Outdated Show resolved Hide resolved
mslib/msui/multiple_flightpath_dockwidget.py Show resolved Hide resolved
@Jatin2020-24 Jatin2020-24 marked this pull request as ready for review August 26, 2022 08:24
@ReimarBauer ReimarBauer merged commit c93597a into Open-MSS:GSOC2022-JatinJain Aug 26, 2022
@Jatin2020-24 Jatin2020-24 deleted the multiple-flight-paths branch September 2, 2022 09:21
ReimarBauer pushed a commit that referenced this pull request Nov 21, 2022
@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
ReimarBauer added a commit that referenced this pull request Nov 21, 2022
@ReimarBauer @Jatin2020-24
Merge gsoc2022 jatin jain to develop (#1599)
466e24e 
* 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 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 ReimarBauer mentioned this pull request Nov 21, 2022
Merged
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ReimarBauer ReimarBauer ReimarBauer approved these changes

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

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