diff --git a/docs/usage.rst b/docs/usage.rst index 5c67d981b..76ab51c22 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -204,6 +204,27 @@ Close the software with ease of mind. Next time you open your software, all your you left it! KML Overlay supports **Saving Open files** so that you can jump back in, anytime! +Multiple Flightpath Dockwidget +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + +The topview has a dockwidget allowing to plot multiple flighttracks/operations on top of map. + +New flightpaths can be added or removed without crashing, and a clear visualization on map, with +relevant geometries and styles. + +The multiple flightpath dockwidget interface supports display of multiple flighttracks on map simultaneously, +with a check box to display/hide individual plots on map. + +Activated flighttrack/operation is shown in bold letters and can't be unchecked. + +"Change Linewidth" and "Change Color" button improves the User experience by allowing user to customize +color & linewidth of each of flightpath displayed, realtime. This allows for better understanding of map and +flightpath. + +For Activated Flightpath, use "options" menu on topview interface. + + Test Samples ------------ diff --git a/mslib/msui/kmloverlay_dockwidget.py b/mslib/msui/kmloverlay_dockwidget.py index 1bed38550..c480e8630 100644 --- a/mslib/msui/kmloverlay_dockwidget.py +++ b/mslib/msui/kmloverlay_dockwidget.py @@ -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_flighttrack + # initializing the nested dictionary dict_files self.dict_files[text] = {} self.dict_files[text]["patch"] = None self.dict_files[text]["color"] = (0, 0, 0, 1) diff --git a/mslib/msui/multiple_flightpath_dockwidget.py b/mslib/msui/multiple_flightpath_dockwidget.py index e895141aa..155799de2 100644 --- a/mslib/msui/multiple_flightpath_dockwidget.py +++ b/mslib/msui/multiple_flightpath_dockwidget.py @@ -55,7 +55,7 @@ class MultipleFlightpath(object): Represent a Multiple FLightpath """ - def __init__(self, mapcanvas, wp, linewidth=2, color='blue'): + def __init__(self, mapcanvas, wp, linewidth=2.0, color='blue'): self.map = mapcanvas self.flightlevel = None self.comments = '' @@ -135,6 +135,7 @@ def __init__(self, parent=None, view=None, listFlightTracks=None, self.flighttrack_list = True # Set flags + # ToDo: Use invented constants for initialization. self.flighttrack_added = False self.flighttrack_activated = False self.color_change = False @@ -295,7 +296,7 @@ def create_list_item(self, wp_model): self.dict_flighttrack[wp_model] = {} self.dict_flighttrack[wp_model]["patch"] = None self.dict_flighttrack[wp_model]["color"] = self.color - self.dict_flighttrack[wp_model]["linewidth"] = 2 + self.dict_flighttrack[wp_model]["linewidth"] = 2.0 self.dict_flighttrack[wp_model]["wp_data"] = [] self.dict_flighttrack[wp_model]["checkState"] = False @@ -585,7 +586,7 @@ def create_operation(self, op_id, wp_model): self.dict_operations[op_id] = {} self.dict_operations[op_id]["patch"] = None self.dict_operations[op_id]["wp_data"] = None - self.dict_operations[op_id]["linewidth"] = 2 + self.dict_operations[op_id]["linewidth"] = 2.0 self.dict_operations[op_id]["color"] = self.parent.get_ft_vertices_color() self.save_operation_data(op_id, wp_model) diff --git a/mslib/msui/qt5/ui_multiple_flightpath_dockwidget.py b/mslib/msui/qt5/ui_multiple_flightpath_dockwidget.py index 970c921d1..ec9fda2e4 100644 --- a/mslib/msui/qt5/ui_multiple_flightpath_dockwidget.py +++ b/mslib/msui/qt5/ui_multiple_flightpath_dockwidget.py @@ -113,7 +113,7 @@ def setupUi(self, MultipleViewWidget): def retranslateUi(self, MultipleViewWidget): _translate = QtCore.QCoreApplication.translate MultipleViewWidget.setWindowTitle(_translate("MultipleViewWidget", "Form")) - self.ft_color_label.setText(_translate("MultipleViewWidget", "𝐀𝐜𝐭𝐢𝐯𝐚𝐭𝐞𝐝 𝐓𝐫𝐚𝐜𝐤 𝐕𝐞𝐫𝐭𝐢𝐜𝐞𝐬 𝐂𝐨𝐥𝐨𝐫 : ")) + self.ft_color_label.setText(_translate("MultipleViewWidget", "Activated Flighttrack/Operation Vertices Color: ")) self.list_flighttrack.setToolTip(_translate("MultipleViewWidget", "List of Open Flighttracks.\n" "Check box to activate and display track on topview.")) self.list_operation_track.setToolTip(_translate("MultipleViewWidget", "List of Mscolab Operations.\n" diff --git a/mslib/msui/ui/ui_multiple_flightpath_dockwidget.ui b/mslib/msui/ui/ui_multiple_flightpath_dockwidget.ui index 0eeddd3c9..037a5b136 100644 --- a/mslib/msui/ui/ui_multiple_flightpath_dockwidget.ui +++ b/mslib/msui/ui/ui_multiple_flightpath_dockwidget.ui @@ -44,7 +44,7 @@ - 𝐀𝐜𝐭𝐢𝐯𝐚𝐭𝐞𝐝 𝐓𝐫𝐚𝐜𝐤 𝐕𝐞𝐫𝐭𝐢𝐜𝐞𝐬 𝐂𝐨𝐥𝐨𝐫 : + Activated Flighttrack/Operation Vertices Color: