-
Notifications
You must be signed in to change notification settings - Fork 103
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.
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
updated_multiple_flightpath_dockwidget #1544
updated_multiple_flightpath_dockwidget #1544
Conversation
Jatin2020-24
commented
Sep 2, 2022
fine, the one which is activated (highlighted bold) should have a check. So that activation means check it too. And the state of this should only be changeable by activating another one on the msui main window. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @Jatin2020-24 this already looks good
see comments.
from mslib.msui import msui | ||
import xml | ||
import threading |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
have a look on https://www.pythonguis.com/tutorials/multithreading-pyqt-applications-qthreadpool/
QThreadPool()
for QtCore.QThread() we have a worker in https://github.com/Open-MSS/MSS/blob/develop/mslib/utils/qt.py#L370
https://www.youtube.com/watch?v=1FZO4VKANbM
The previous visible selected flightpath for editing has no mark in [a]. This should switch to marked, So that it is on, when one selects [b] for editing. A user has to unselect [a] to get it removed from multiple flightpath docking widget. If I would select [c] for editing and then [d] all are unmarked. |
self.listView = listView | ||
self.ui = parent | ||
self.setupUi(self) | ||
self.view = view # canvas | ||
self.flight_path = None # flightpath object | ||
self.colour = None |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
self.color?
Just seen that we used it different written all over MSS, on other places you use self.color.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed
|
||
def wait(self, parent, start, end): | ||
self.flighttrack_added = True | ||
t1 = threading.Timer(0.5, self.flighttrackAdded, [parent, start, end]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if this is needed when signals are used, is it?
good improvement :) I found another problem, or inconsity ;) We currently define the flight track color in the options (you get this by the options button) This has precedence. We don't have there line thickness. For the color we maybe can solve this by: When the precidence is given any activation of a flight track will toggle the defined color in the widget. Other ideas for solving this are welcome too. |
changing linewidth works, when toggling activation it falls to defaul. Linewidth is currently not so important. I got a traceback on the activated flight track playing wiht line width and color
|
I've written most of the functions to plot operations in dockwidget. Only connections of signals and slots is remaining. |
please remove the "test develop / test-filter-flight-paths" from the test configuration |
Currently I can't change thickness for mscolab lines. |
I set red in options for an activated track. Starting with (d) I activated (b) this keeps the green color, in the options it is red. |
In mscolab one can create a new operation, this is not getting default activated. Also getting access to an operation does not mean this gets activated. This is different in the standalone flight tracks setup, there any new flight track is activated. This makes no sense in mscolab. (We likly change this behaviour also with local flight tracks) I think this mismatch creates the wrong bold names in the docking widget for mscolab operations. |
We decided earlier that any activated gets the check mark. This has a site effect by clicking any available flight track means activates all. This should become documented, e.g. comment or description |
There is now a little delay on activation until it is seen, can the speed improved? |
When a topview is started when some data is loaded, all is shown in the docking widget with flight track color. Changing the color in the options menu does not update the color for the active flight track. This is done on a new activation. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thx
self.color_change = None | ||
self.color_change = False | ||
self.change_linewidth = False | ||
self.dsbx_linewidth.setValue(2.0) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a # ToDo
to use an invented constant from https://github.com/Open-MSS/MSS/blob/develop/mslib/utils/config.py#L227 for initializing this.
@@ -172,7 +174,8 @@ def create_list_item(self, wp_model, listWidget): | |||
# Create new key in dict | |||
self.dict_flighttrack[wp_model] = {} | |||
self.dict_flighttrack[wp_model]["patch"] = None | |||
self.dict_flighttrack[wp_model]["color"] = 'blue' | |||
self.dict_flighttrack[wp_model]["color"] = None | |||
self.dict_flighttrack[wp_model]["linewidth"] = 2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be a float
@@ -478,7 +478,7 @@ def select_file(self, filenames): | |||
return | |||
text = filename | |||
if text not in self.dict_files: # prevents same file being added twice | |||
# initializing the nested dictionary dict_files | |||
# initializing the nested dictionary dict_flighttrack | |||
self.dict_files[text] = {} | |||
self.dict_files[text]["patch"] = None | |||
self.dict_files[text]["color"] = (0, 0, 0, 1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
search for "colour_ft_vertices" this may be the initial color
* 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
* 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>
* 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>
* 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>
* 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>