Solved issue #573 (Configuration of label sizes for x,y axes and plot title) #994

risehr · 2021-05-24T13:02:17Z

Added Fontsize changing options in Sideview options for labels, ticklabels, and title of the sideview plot.

One option for changing size of ticklabels of x and both y axes.
Another option for changing x,y axes labels and plot title.

…dth of individual kml files

…or and linewidth to this dockwidget (.py extension) file

…and respective linewidth of individual kml files in the listwwidget( added changes to kmloverlay_dockwidget.py)

…dded functionality for not showing color or linewidth when there are no kml files present in the listwidget

…n the color and linewidth is changed. And also previous code's optimization

…h is direct in the main kmloverlay gui, display selected color of kml file right next to the file and the height of the colour block is in correspondence with the linewidth of that specific kml file

… were made to appear directly upon startup of kmloverlaywidget. On clicking kml files it shows linewidth and you can edit from there directly.

… twice because select_linewidth is called when item is clicked and also when valueChanged of spin box. Therefore, a flag is set to call select linewidth only when the value really changes.

pull from open mss

… tried the tests again

makes conftest useable for windows devs , fixes Open-MSS#714 (Open-MSS#715)

… from if() in kmloverlay_dockwidget.py

…s selected. Made linewidth editor box faster which was slowing down significantly. Made color change much faster. Modified the tests also.

…loverlay_dockwidget.ui and removed the attribute setSteptype

…KML file to the QColorDialog selected color. Shortened range of linewidth from 0.1 to 10

Solved issue Open-MSS#644 (Open-MSS#709)

…xes ticklabels and labels along with the plot title.

ReimarBauer

the amount of lines in the ui sideview_options.py looks a bit strange

ReimarBauer · 2021-05-24T14:06:18Z

risehr · 2021-05-24T14:17:12Z

I have not altered the ui_sideview_options.py manually. Infact, I have converted it from pyuic5 -x ui_sideview_options.ui -o ui_sideview_options.py. Also, I have designed the ui_sideview_options.ui file from the qt designer.

ReimarBauer

needs to be done for topview too

ReimarBauer · 2021-05-24T14:17:17Z

mslib/msui/mpl_qtwidget.py

@@ -488,6 +488,8 @@ def __init__(self, model=None, settings=None, numlabels=None):
        self.settings_dict = {"vertical_extent": (1050, 180),
                              "vertical_axis": "pressure",
                              "secondary_axis": "no secondary axis",
+                              "plot_title_size": "default",


we maybe should use here the config_loader and add the default value to the configuration. By this anyone can use his sizes from the mss_settings.json

https://github.com/Open-MSS/MSS/blob/develop/mslib/msui/__init__.py

We could add a dictionary here and start with

topview = {"plot_title_size": 10, "axes_label_size": 10} sideview = {"plot_title_size": 10, "axes_label_size": 10}

the config_loader can access this by

topview_settings=config_loader(dataset="topview")

we maybe should use here the config_loader and add the default value to the configuration. By this anyone can use his sizes from the mss_settings.json

https://github.com/Open-MSS/MSS/blob/develop/mslib/msui/__init__.py

We could add a dictionary here and start with

topview = {"plot_title_size": 10, "axes_label_size": 10} sideview = {"plot_title_size": 10, "axes_label_size": 10}

the config_loader can access this by

topview_settings=config_loader(dataset="topview")

Yes. I will look into it if I can do it.

ReimarBauer · 2021-05-24T14:18:30Z

mslib/msui/qt5/ui_sideview_options.py

+        self.label_7.setText(_translate("SideViewOptionsDialog", "         Axes Label Size  "))
+
+
+if __name__ == "__main__":


on a converted ui file we don't have this usually. This may get added because of an option used?

pyuic5 ui_sideview_options.ui > ../qt5/ui_sideview_options.py

on a converted ui file we don't have this usually. This may get added because of an option used?

pyuic5 ui_sideview_options.ui > ../qt5/ui_sideview_options.py

may be...i don't know exactly how that came.

these __main__ lines are never get into a test coverage but likly are counted as lines of the project.

these __main__ lines are never get into a test coverage but likly are counted as lines of the project.

Can/should we delete the __main__ lines manually?

eventually the command has different options on windows. maybe there is a supress option?

Have to study about it.

ReimarBauer · 2021-05-24T14:21:29Z

I have not altered the ui_sideview_options.py manually. Infact, I have converted it from pyuic5 -x ui_sideview_options.ui -o ui_sideview_options.py. Also, I have designed the ui_sideview_options.ui file from the qt designer.

sorry for my mistake, corrected already my comment

risehr · 2021-05-24T14:27:44Z

Okay, I will do for the topview also. And will also try to implement "the config loader part" that you said.

ReimarBauer

the pyuic5 converter surprised me with that kind of output. But it is doing this.

Please can you look on setting up a default value in the MissionSupportSystemDefaultConfig and use this by the config_loader.

It works pretty well for sideview. We also need it for topview options.

The ui elements should be seperated from the Performance section into an own section.
Performance is used for aircraft specifications. e.g. weight, fuel.

A new section may be Font sizes?

risehr · 2021-05-24T14:45:23Z

the pyuic5 converter surprised me with that kind of output. But is is doing this.

Please can you look on setting up a default value in the MissionSupportSystemDefaultConfig and use this by the config_loader.

It works pretty well for sideview. We also need it for topview options.

The ui elements should be seperated from the Performance section into an own section.
Performance is used for aircraft specifications. e.g. weight, fuel.

A new section may be Font sizes?

Yes, I have thought about it to put it in a new section. But I wondered, changing fontsize is increasing the performance of the viewing of flighttrack by the user. That's why! Alright, I will put it in a new section named "Font sizes"

risehr · 2021-05-28T14:33:33Z

Hello @ReimarBauer I am still on this. Topview also got covered for size configuration. Right now, I am setting the MSSDefaultconfig. Just thought to update you on the work.

…or default size in MSSdefaultConfig so that user can put his default value.

risehr · 2021-05-29T12:23:23Z

Added fontsize configurable options for topview also.
User can now put his default value for fontsize from mss_settings
Gave a separate space for fontsizes in topview and sideview options UI.

ReimarBauer

recently there was a linearview module added. Please add this feature with an Option button there too.

see other comments

ReimarBauer · 2021-05-31T06:38:00Z

mslib/msui/mpl_qtwidget.py

@@ -1269,13 +1319,17 @@ def draw_legend(self, img):
                                               xticks=[], yticks=[],
                                               label="ax2", zorder=0)
                self.legax.patch.set_facecolor("None")
+                # self.legax.set_yticklabels("ax2", fontsize=32, minor=False)


if comments are not needed for explainations, remove them

on all places.
if it is something you want to log ;) use logging.debug()

if comments are not needed for explainations, remove them

on all places.
if it is something you want to log ;) use logging.debug()

Okay Noted.

ReimarBauer · 2021-05-31T06:55:24Z

mslib/msui/qt5/ui_sideview_options.py

@@ -287,3 +340,48 @@ def retranslateUi(self, SideViewOptionsDialog):
        self.groupBox_4.setTitle(_translate("SideViewOptionsDialog", "Performance"))
        self.cbDrawCeiling.setText(_translate("SideViewOptionsDialog", "draw ceiling altitude"))
        self.btCeilingColour.setText(_translate("SideViewOptionsDialog", "colour"))
+        self.groupBox_5.setTitle(_translate("SideViewOptionsDialog", "Font Sizes"))


May be name this box title: "Plot Options". Hmm, somehow in topview these are all "Plot Options"

This will be also valid when we add there more features in the future.

May be name this box title: "Plot Options". Hmm, somehow in topview these are all "Plot Options"

This will be also valid when we add there more features in the future.

Okay. I will change this to "Plot Options."

risehr · 2021-05-31T10:12:53Z

recently there was a linearview module added. Please add this feature with an Option button there too.

see other comments

Yeah, I have noticed that before but was not sure to add because there were no previous customizations about anything. But not to worry, I will add the options for this Linearview also.

…t settings for users for those plot options.

ReimarBauer

a few small questions added.

used it with the 3 views and it is a good improvement :)

ReimarBauer · 2021-06-02T11:15:04Z

mslib/msui/_tests/test_mpl_map.py

@@ -41,6 +41,7 @@ def test_no_coastsegs(self):
        # On land
        self.map.ax.set_xlim([2, 3])
        self.map.ax.set_ylim([48, 49])
+        self.map._draw_auto_graticule()


@risehr is this change needed for the test? If so you likly found a bug.

ReimarBauer · 2021-06-02T11:17:14Z

mslib/msui/mpl_map.py

@@ -145,10 +144,8 @@ def __init__(self, identifier=None, CRS=None, BBOX_UNITS=None, PROJECT_NAME=None
                    self.crs_text = self.ax.figure.text(0, 0, self.crs)

        if self.appearance["draw_graticule"]:
-            try:


@joernu76 please look on this change

@ReimarBauer Yes, the test was failing. Hence, it was needed. Both are related. Since, I removed _draw_auto_graticule() from def init() of mpl_map because this is already being called in init() of MPLTopview Class of mpl_qtwidget(since it is necessary to draw graticule with the already changed fontsizes). And hence, since I removed this _draw_auto_graticule() from mpl_map.py, the test also needed to be changed otherwise the test would continue to fail.

ok, the test is likly now on the"wrong" place, but we can move it later.
We do avoid this when the test is using MPLTopview

…and plot title) (Open-MSS#994) * ui_kmloverlay_dockwidget.ui file changed for showing color and linewidth of individual kml files * Changed the ui_kmloverlay_dockwidget.py added features of showing color and linewidth to this dockwidget (.py extension) file * Added functionality and connected slots to show the respective color and respective linewidth of individual kml files in the listwwidget( added changes to kmloverlay_dockwidget.py) * Modified 'remove_file(self)' function in kmloverlay_dockwidget.py ; added functionality for not showing color or linewidth when there are no kml files present in the listwidget * Instant changes/reflection to the color label and linewidth label when the color and linewidth is changed. And also previous code's optimization * Change color option added to main kmloverlay gui, editing of linewidth is direct in the main kmloverlay gui, display selected color of kml file right next to the file and the height of the colour block is in correspondence with the linewidth of that specific kml file * Discarded obsolete color label display and linewidth label. The icons were made to appear directly upon startup of kmloverlaywidget. On clicking kml files it shows linewidth and you can edit from there directly. * Optimized the code by setting flag to prevent the same icon being set twice because select_linewidth is called when item is clicked and also when valueChanged of spin box. Therefore, a flag is set to call select linewidth only when the value really changes. * flake8 test run successfuly without any errors * Improved functionality for setting color icons while adding files and tried the tests again * Modified test_kmloverlay_dockwidget.py test file and removed brackets from if() in kmloverlay_dockwidget.py * changes in test_wms_control/py for flake8 test to pass * Added features for hiding of linewidth & color options until a file is selected. Made linewidth editor box faster which was slowing down significantly. Made color change much faster. Modified the tests also. * Installed qt==5.9.7 and changed ui_kmloverlay_dockwidget.py and ui_kmloverlay_dockwidget.ui and removed the attribute setSteptype * Made Change Color button transparent. Added the current color of the KML file to the QColorDialog selected color. Shortened range of linewidth from 0.1 to 10 * Added .coverage to gitignore * Solved the issue Open-MSS#736 [Dock-widgets in TableView prevent TableView from closing upon application exit] - closing of tableview window when main MSS window is closed. Previously it used to stick around. But now it closes with MSS main window. * Made the code more understandable for solved issue Open-MSS#736 * Updating Merge Conflict * Synced with OpenMSS:develop * Added options in sideview to change the fontsize of x and y(both y) axes ticklabels and labels along with the plot title. * Rectified previous mistakes in gitignore file * Added fontsize configuration options for topview and added datasets for default size in MSSdefaultConfig so that user can put his default value. * Added plot options for LinearView, SideView, Topview and added default settings for users for those plot options. * Modified code to pass the tests. Co-authored-by: ReimarBauer <rb.proj@gmail.com>

risehr and others added 30 commits February 18, 2021 11:53

ui_kmloverlay_dockwidget.ui file changed for showing color and linewi…

3075053

…dth of individual kml files

Changed the ui_kmloverlay_dockwidget.py added features of showing col…

ce119a6

…or and linewidth to this dockwidget (.py extension) file

Added functionality and connected slots to show the respective color …

5c26437

…and respective linewidth of individual kml files in the listwwidget( added changes to kmloverlay_dockwidget.py)

Modified 'remove_file(self)' function in kmloverlay_dockwidget.py ; a…

d980e8e

…dded functionality for not showing color or linewidth when there are no kml files present in the listwidget

Instant changes/reflection to the color label and linewidth label whe…

f04ac59

…n the color and linewidth is changed. And also previous code's optimization

Change color option added to main kmloverlay gui, editing of linewidt…

228a0b0

…h is direct in the main kmloverlay gui, display selected color of kml file right next to the file and the height of the colour block is in correspondence with the linewidth of that specific kml file

Discarded obsolete color label display and linewidth label. The icons…

b5fe9ad

… were made to appear directly upon startup of kmloverlaywidget. On clicking kml files it shows linewidth and you can edit from there directly.

Optimized the code by setting flag to prevent the same icon being set…

fbeddb2

… twice because select_linewidth is called when item is clicked and also when valueChanged of spin box. Therefore, a flag is set to call select linewidth only when the value really changes.

Merge pull request #1 from Open-MSS/develop

b83211a

pull from open mss

[update] merge conflict

d451161

flake8 test run successfuly without any errors

d7ab855

Improved functionality for setting color icons while adding files and…

27754f6

… tried the tests again

Merge branch 'develop' into develop

cae990b

Merge branch 'develop' into develop

c33b226

Merge branch 'develop' into develop

f845735

Merge pull request #3 from Open-MSS/develop

51381b5

makes conftest useable for windows devs , fixes Open-MSS#714 (Open-MSS#715)

Modified test_kmloverlay_dockwidget.py test file and removed brackets…

c1bc50f

… from if() in kmloverlay_dockwidget.py

Merge branch 'develop' into develop

311ab99

Merge branch 'develop' into develop

7ccadff

changes in test_wms_control/py for flake8 test to pass

dabd080

Merge branch 'develop' into develop

fd0b89a

Added features for hiding of linewidth & color options until a file i…

fedf346

…s selected. Made linewidth editor box faster which was slowing down significantly. Made color change much faster. Modified the tests also.

Concluding merge commit for changes in mscolab.py

0989183

Merge branch 'develop' into develop

7735b62

Installed qt==5.9.7 and changed ui_kmloverlay_dockwidget.py and ui_km…

f9ae212

…loverlay_dockwidget.ui and removed the attribute setSteptype

Concluding merge commit

153fd98

Merge branch 'develop' into develop

0ca99ce

Made Change Color button transparent. Added the current color of the …

c1b543f

…KML file to the QColorDialog selected color. Shortened range of linewidth from 0.1 to 10

Added .coverage to gitignore

3890a31

Merge pull request #4 from Open-MSS/develop

c477856

Solved issue Open-MSS#644 (Open-MSS#709)

risehr added 2 commits May 24, 2021 17:20

Added options in sideview to change the fontsize of x and y(both y) a…

ba17d9d

…xes ticklabels and labels along with the plot title.

Rectified previous mistakes in gitignore file

d8429b1

ReimarBauer requested changes May 24, 2021

View reviewed changes

Merge branch 'develop' into develop

0bf537a

joernu76 linked an issue May 27, 2021 that may be closed by this pull request

Plot x-axis, y-axis, title, and color bar label sizes should be configurable. #573

Closed

Merge branch 'develop' into develop

3ef9e3c

risehr added 2 commits May 29, 2021 17:11

Added fontsize configuration options for topview and added datasets f…

0cdf037

…or default size in MSSdefaultConfig so that user can put his default value.

Resolved and updated automatic merge conflicts

0e7fa23

ReimarBauer requested changes May 31, 2021

View reviewed changes

ReimarBauer and others added 5 commits May 31, 2021 12:58

Merge branch 'develop' into develop

aebac07

Added plot options for LinearView, SideView, Topview and added defaul…

ed226e8

…t settings for users for those plot options.

Completing merge error

435a2b0

Modified code to pass the tests.

f7de67f

Merge branch 'develop' into develop

089f0f5

ReimarBauer requested changes Jun 2, 2021

View reviewed changes

ReimarBauer requested a review from joernu76 June 2, 2021 11:20

Merge branch 'develop' into develop

d4a3a15

ReimarBauer approved these changes Jun 2, 2021

View reviewed changes

ReimarBauer merged commit e516945 into Open-MSS:develop Jun 2, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Solved issue #573 (Configuration of label sizes for x,y axes and plot title) #994

Solved issue #573 (Configuration of label sizes for x,y axes and plot title) #994

risehr commented May 24, 2021

ReimarBauer left a comment •

edited

Loading

ReimarBauer commented May 24, 2021

risehr commented May 24, 2021

ReimarBauer left a comment

ReimarBauer May 24, 2021

risehr May 24, 2021

ReimarBauer May 24, 2021 •

edited

Loading

risehr May 24, 2021

ReimarBauer May 24, 2021

risehr May 24, 2021

ReimarBauer May 24, 2021

risehr May 24, 2021

ReimarBauer commented May 24, 2021

risehr commented May 24, 2021

ReimarBauer left a comment •

edited

Loading

risehr commented May 24, 2021

risehr commented May 28, 2021

risehr commented May 29, 2021

ReimarBauer left a comment

ReimarBauer May 31, 2021

risehr May 31, 2021

ReimarBauer May 31, 2021

risehr May 31, 2021

risehr commented May 31, 2021

ReimarBauer left a comment

ReimarBauer Jun 2, 2021

ReimarBauer Jun 2, 2021

risehr Jun 2, 2021

ReimarBauer Jun 2, 2021

		self.label_7.setText(_translate("SideViewOptionsDialog", " Axes Label Size "))


		if __name__ == "__main__":

Solved issue #573 (Configuration of label sizes for x,y axes and plot title) #994

Solved issue #573 (Configuration of label sizes for x,y axes and plot title) #994

Conversation

risehr commented May 24, 2021

ReimarBauer left a comment • edited Loading

Choose a reason for hiding this comment

ReimarBauer commented May 24, 2021

risehr commented May 24, 2021

ReimarBauer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReimarBauer May 24, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReimarBauer commented May 24, 2021

risehr commented May 24, 2021

ReimarBauer left a comment • edited Loading

Choose a reason for hiding this comment

risehr commented May 24, 2021

risehr commented May 28, 2021

risehr commented May 29, 2021

ReimarBauer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

risehr commented May 31, 2021

ReimarBauer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReimarBauer left a comment •

edited

Loading

ReimarBauer May 24, 2021 •

edited

Loading

ReimarBauer left a comment •

edited

Loading