Skip to content

Commit 22145d9

Browse files
fix: LinearView and SideView plot to display operation name (#2592)
The model name is shown on TopView, SideView, LinearView on top right corner of the plot.
1 parent 885c403 commit 22145d9

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

mslib/msui/mpl_map.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ def __init__(self, identifier=None, CRS=None, BBOX_UNITS=None, OPERATION_NAME=No
151151
# Print project name and CRS identifier into figure.
152152
if not hasattr(self, "_info_text"):
153153
self._info_text = self.ax.figure.text(0, 0, "")
154-
self._infos = [None] * 4
155-
self.update_info_text(name=self.operation_name, crs=self.crs)
154+
self._infos = [None] * 3
155+
self.update_info_text(crs=self.crs)
156156

157157
if self.appearance["draw_graticule"]:
158158
pass
@@ -170,15 +170,13 @@ def __init__(self, identifier=None, CRS=None, BBOX_UNITS=None, OPERATION_NAME=No
170170
self.airspaces = None
171171
self.airspacetext = None
172172

173-
def update_info_text(self, openaip=None, ourairports=None, name=None, crs=None):
173+
def update_info_text(self, openaip=None, ourairports=None, crs=None):
174174
if openaip is not None:
175175
self._infos[0] = openaip
176176
if ourairports is not None:
177177
self._infos[1] = ourairports
178-
if name is not None:
179-
self._infos[2] = name
180178
if crs is not None:
181-
self._infos[3] = crs
179+
self._infos[2] = crs
182180
self._info_text.set_text(
183181
"\n".join([_i for _i in self._infos if _i])) # both None and ""
184182

mslib/msui/mpl_qtwidget.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ def __init__(self, fig=None, ax=None, settings_tag=None, settings=None):
113113

114114
def draw_metadata(self, title="", init_time=None, valid_time=None,
115115
level=None, style=None):
116+
116117
if style:
117118
title += f" ({style})"
118119
if level:
@@ -733,7 +734,9 @@ def draw_legend(self, img):
733734
raise NotImplementedError
734735

735736
def draw_image(self, xmls, colors=None, scales=None):
737+
title = self.fig._suptitle.get_text()
736738
self.clear_figure()
739+
self.fig.suptitle(title, x=0.95, ha='right')
737740
offset = 40
738741
self.ax.patch.set_visible(False)
739742

mslib/msui/viewwindows.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,13 @@ def setFlightTrackModel(self, model):
274274

275275
# Update Top View flighttrack name
276276
if hasattr(self.mpl.canvas, "map"):
277-
self.mpl.canvas.map.operation_name = model.name
278-
self.mpl.canvas.map.update_info_text(name=model.name)
277+
self.mpl.canvas.map.ax.figure.suptitle(f"{model.name}", x=0.95, ha='right')
279278
self.mpl.canvas.map.ax.figure.canvas.draw()
280279

280+
elif hasattr(self.mpl.canvas, 'plotter'):
281+
self.mpl.canvas.plotter.fig.suptitle(f"{model.name}", x=0.95, ha='right')
282+
self.mpl.canvas.plotter.fig.canvas.draw()
283+
281284
def getView(self):
282285
"""
283286
Return the MplCanvas instance of the window.

0 commit comments

Comments
 (0)