MWP Icon Pack

[ValkyrieDomi]

Hello, could you please provide a file all of the icons MWP uses? I only got pixmaps folder with very few defaults and ADSB planes.
I am missing icons like WP, Home, etc.. I would like to see entire icon asset and think what could be refreshed.

Thank You.

[stronnag]

The icons other than those in pixmaps are generated in code. For example, the WP icons are coloured (and have inner icon / text) according to type and number.

It would less practical to do otherwise.

[ValkyrieDomi]

Absolutely it would, that´s why they are always empty icons and having variable values in.

However, since they are generated by the code, not much work for me. Just about 4 icons to "update" or so.

[stronnag]

You should also be aware that

• At the moment all icons are drawn centred at their geometric centre due to restrictions in libshumate (the mapping and map symbol component). In particular this useful merge request https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/160 ; which has sadly been ignored for almost two years.
• I'm not going to ship a bespoke version of libshumate (including the above MR) with mwp (no matter now desirable from "aesthetics" ), due to the maintenance burden that would impose.
• Of course you can "fake it" by adding an extra transparent area to centralise the "pin"; however this may have undesirable UX implications as the user may select the extended (transparent) area when they expected something else.

[ValkyrieDomi]

Understood, thank you.

[stronnag]

As there has been some movement on https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/160, there is now
https://github.com/stronnag/mwptools/wiki/Pointy-map-symbols--mwp-gtk4

and we can do more nice things like (gcs icon (with home icon to show positioning)) .

There are other changes, not dependent on a newer libshumate:

Changes to icon and symbol rendering:

• For the GCS (gcs.svg) icon and the inav-radar icons (inav-radar.svg, inav-telem.svg)
  • mwp no longer imposes an image size (the misc-icon-size setting is removed). Instead, the size from the SVG header is used. Where user defined override icons are employed, you may need to resize the icon to your preferred size.
• For the GCS (gcs.svg) icon, no predefined opacity is used. The user can override the opacity in a user defined override icon if required.
• For "mission / home symbols", the opacity is defined by the setting mission-icon-alpha.

[b14ckyy]

looks super clean here on my end as well. Great work! :)

[stronnag]

Thanks. We end up generating larger than necessary pixbufs, I'll workout if it's worth cropping them in slow time.
Time for some Snapshot builds.

[b14ckyy]

and time to test on windows and find new bugs :P

[ValkyrieDomi]

Great improvements! I will test the new stuff probably tomorrow.

[stronnag]

More to come. a few bits missed due to the remote debugging of Marc's ADSBee and side effects.

[stronnag]

Apropos the issue of @ValkyrieDomi 's SVG that fails to show.
mwp has a simple loader, using librsvg.

	public Gdk.Pixbuf? scale(uint8[] s, double sf) {
		double w=0;
		double h=0;
		int iw = 0;
		int ih = 0;
		try {
			var svg = new Rsvg.Handle.from_data(s);
			svg.get_intrinsic_size_in_pixels(out w, out h);
			iw = (int)(w*sf+0.5);
			ih = (int)(h*sf+0.5);
			var cst = new Cairo.ImageSurface (Cairo.Format.ARGB32, iw, ih);
			var cr = new Cairo.Context (cst);
			if(sf != 1.0) {
				cr.scale(sf,sf);
			}
			Rsvg.Rectangle r = {0, 0,w, h};
			svg.render_document (cr, r);
			return Gdk.pixbuf_get_from_surface(cr.get_target(), 0, 0, iw, ih);
		} catch (Error e) {
			MWPLog.message("SVGScale: %f %f (%d %d) %s\n", w, h, iw, ih, s);
			return null;
		}
     }

We read a bunch of bytes from a file, create a librsvg handle from the bunch of bytes, and ask librsvg for its size in pixels, so a puxbuf can be generated. Then it's scaled if necessary.

The particular "tower" icon return a pixel size of 0,0. mwp should (will in future) just give rather than blundering on after this "cannot happen" case.
I have seen NO other SVG where this happens. It doesn't generate an exception.

[stronnag]

Adding width="94" height="111" to the <svg \> element makes the original visible.

[ValkyrieDomi]

Great, thanks for clarification.

[stronnag]

In future it will also be visually obvious:

[ValkyrieDomi]

Very good!

After some testing, I have questions.
In the future, would it be possible to have scaling options and opacity for all the different icons categories?

@b14ckyy could have few words on this too.

With the new symbol-scale, the ratio between the icons looks slightly off. Thus, one might like bigger or smaller ADSB, as well as WPs, Home, GCS.

I already rescaled all of my icons for new snapshot to my liking tho, but it is a pity the need to edit W/H in SVG rather than having the scale separately in dconf.

[b14ckyy]

Yeah I talked about the baseline scaling with Jonathan yesterday shortly. Overall the unified scaling for map icons and SVG elements is fine to me, its just the size of the default icons that feels off and a bit too small.

Jonathan told me about a script thats in the project folder src/samples/adsb-extra/resize-icons.sh to resize all svg elements in one go (needs librsvg2-bin and imagemagick installed) with one command <path>/resize-icons.sh <scale>

Downside is that this wipes the id that allows MWP to color code them and it has to be added again.

But overall my suggestion is to make the default svg elements (ADSB) 2x the size of what they are now. If people want them even bigger or smaller, they can do that manually by adding them to .config/mwp/pixmaps/

[stronnag]

As I can't make everyone happy, instead there will be a flexible workflow to allow customisation of SVG icons without having to use a text editor to edit SVG attributes, for example:

Work flow for ADSB icons:

# Tools area
$  cd src/samples/adsb-extra/
#
# Make the fixup tool
$ make fixup-svg
#
# create a work space
$ mkdir /tmp/icons
#
# copy and resize the ADSB icons
$ cp ../../../data/pixmaps/adsb/*.svg  /tmp/icons/
# Now resize ....
$ ./resize-icons.sh -f 2.0 /tmp/icons/*.svg
rsvg-convert -w 44.0 -h 44.0 -a -f svg -o /tmp/icons/A0.svg /tmp/icons/_A0.svg
...
rsvg-convert -w 30.0 -h 30.0 -a -f svg -o /tmp/icons/C3.svg /tmp/icons/_C3.svg
For ADSB symbols, you may have to (re)apply  'id="mwpfg"' and 'id="mwpbg"' attributes to the resized icons : see gradient/README.md
For other symbols, you may have to (re)apply 'mwp:xalign' or 'mwp:yalign' attributes to the resized icons
#
# Add the gradient 'id's back ...
$ ./fixup-svg --gradients /tmp/icons/*.svg
# 
# copy the files over ....
$ cp /tmp/icons/*.svg ~/.config/mwp/pixmaps/adsb/

run mwp, gasp in awe at the size of the ADSB icons.
Not that I want such large icons, but there you are, a work flow.

Work flow for GCS or other icon

$ ./fixup-svg --yalign 1  /tmp/valk1.svg
/home/jrh/.config/mwp/pixmaps/valk1.svg does not have the 'width' and/or 'height' attribute

... need to make the svg "screen" friendly ...

$ rsvg-convert -f svg -a -w 44 -o /tmp/valk1.svg /tmp/valk1.svg
# Now set the aligmnet to the bottom, centred
$ ./fixup-svg --yalign 1  /tmp/valk1.svg
$ cp /tmp/valk1.svg ~/.config/mwp/pixmaps
$ cd ~/.config/mwp/pixmaps
$ ln -sf valk1.svg gcs.svg

With pointy labels ... because everyone likes pointy labels.