Map25: VTM0.15 #321

telemaxx · 2021-04-06T17:35:43Z

VTM 0.15 - using commit ef2d2dd197e5395b200c6e68a03c3b0805140914
scaled photos on/off (off is default for reduced resources) (menu item is not localized up to now)

main2master

main2main

…nal thumb but this was not the reason to remove it, this image was NEVER disposed -> SWT was running very fast out of handles when moving the tour chart slider as this would create a new image for every new slider position, discovered this issue with SWT sleak" This reverts commit d3e09e3.

main2main

many changes in Libs... ItemizedLayer Mutable marker

avoid nullpointer when photolist is empty

and avoiding nullpointer again. 1sr try was nor working.

main2main

telemaxx · 2021-04-06T17:38:00Z

seems so there is a tour import bug.

When i have a fresh MT workspace and imported and saved a tour, tourbook stays empty

Edit: problem of nattable.

wolfgang-ch · 2021-04-06T18:44:51Z

seems so there is a tour import bug.

When i have a fresh MT workspace and imported and saved a tour, tourbook stays empty

Edit: problem of nattable.

NatTable 2.0 should solve the problem

telemaxx · 2021-04-06T19:11:58Z

NatTable 2.0 solved the problem

wolfgang-ch · 2021-04-07T07:28:47Z

Is the released version 0.15 c0d5f4a0cabe7cc6e8ea6cfbf30a1e39e0433984 used?

telemaxx · 2021-04-07T07:55:01Z

no, I cloned the master from vtm. state yesterday. So it's a bit newer.

wolfgang-ch

no, I cloned the master from vtm. state yesterday. So it's a bit newer.

You should write the commit ID which is used into the PR comment, that it could be verified. It is the same as when you get a stacktrace and do no know which version it was used because the code lines could be different.

wolfgang-ch · 2021-04-07T07:41:15Z

bundles/net.tourbook/src/net/tourbook/map25/layer/marker/PhotoToolkit.java

+ * Copyright 2019, 2020, 2021 Wolfgang Schramm and Contributors
+ * Copyright 2019, 2020, 2021 Thomas Theussing


Instead of adding all years, just write the first and last year
2019, 2020, 2021 -> 2019, 2021

You can keep the current years until you update the file (and not forget it, which happens also to me)

i saw that already as i got the conflicting error while merging ;-)

vtm commit
ef2d2dd197e5395b200c6e68a03c3b0805140914

wolfgang-ch · 2021-04-07T08:07:12Z

bundles/net.tourbook/src/net/tourbook/map25/ui/SlideoutMap25_MapOptions.java

-import net.tourbook.map25.Map25App;
-import net.tourbook.map25.Map25ConfigManager;
-import net.tourbook.map25.Map25View;
-
 /**


Blue box is OK, I marked it because I thought it is not working but it is.

Red box:

Text key is displayed

Cannot see a difference when checked or unchecked

Wolfgang, did you remember this problem:
d3e09e3#commitcomment-41469693

There you removed the scaling part. but that looks not good on my two W10 laptops and in my VMWare Linux.
Not sure where this depends on.

With scaling on, it looks good everywhere but shows more used resources in "sleak"
with scaling off, it is like in the last version.

Wolfgang, did you remember this problem:
d3e09e3#commitcomment-41469693

There you removed the scaling part. but that looks not good on my two W10 laptops and in my VMWare Linux.
Not sure where this depends on.

With scaling on, it looks good everywhere but shows more used resources in "sleak"
with scaling off, it is like in the last version.

I tried to understand the photo painting, but giving up for now, why it isn't painted with a larger (not scaled) image.

Can you set the missing text, afterwards I will merge it.

yes of coarse.

should i call it :
"scaled photos"
or better
"force scaled photos"

because sometimes, like in you're case its always scaled.

should i add this line only to messages.properties and Messages.java or also in messages_de.properties?

We should not call it scaled, because scaled could be larger OR smaller.

Also, I think we should look over the "Tellerrand" (don't know if there is an english word for it) and the user should be able to set/select the image size.

There may be fixed sizes, e.g. 160, 300, ... and a variable size.

When you are not yet implementing this sizing feature, then the checkbox label could be "Small photo" which you can also translate into german (very difficult task :-)

the easiest for me is to copy youre hillshading code from maps options

checkbox and text is not ready yet

wolfgang-ch · 2021-04-07T08:14:06Z

bundles/net.tourbook/src/net/tourbook/map25/Map25View.java

+ * notSelectedTooltip = MAP_ACTION_SHOW_PHOTO_IN_MAP;
+ * }
+ * @Override
+ * protected ToolbarSlideout createSlideout(final ToolBar toolbar) {


Comments which are outside of a method are moved around by the code formatter, but not always.

wolfgang-ch · 2021-04-07T08:29:54Z

no, I cloned the master from vtm. state yesterday. So it's a bit newer.

You should write the commit ID which is used into the PR comment, that it could be verified. It is the same as when you get a stacktrace and do no know which version it was used because the code lines could be different.

I wanted to comment on your answer but now my prepared review comments are also commited, however I was finished with the review.

* Revert "removed scaled thumb image, it had the same size as the original thumb but this was not the reason to remove it, this image was NEVER disposed -> SWT was running very fast out of handles when moving the tour chart slider as this would create a new image for every new slider position, discovered this issue with SWT sleak" This reverts commit d3e09e3. * reverted 'reverted "removed scaled image"' * Starting with upgrading VTM 0.15 many changes in Libs... ItemizedLayer Mutable marker * before deactivating some red code * ItemizedLayer<> removing <> for vtm 0.15 * reactivating changed mapbookmarklayer and avoid nullpointer when photolist is empty * photolayer modified to work with vtm 0.15 and avoiding nullpointer again. 1sr try was nor working. * Photoscaled On/Off * run save actions for modified files * Debug off * cleanup some codelines * latest vtm 0.15 updates * Map25: VTM0.15 (#321) * Revert "removed scaled thumb image, it had the same size as the original thumb but this was not the reason to remove it, this image was NEVER disposed -> SWT was running very fast out of handles when moving the tour chart slider as this would create a new image for every new slider position, discovered this issue with SWT sleak" This reverts commit d3e09e3. * reverted 'reverted "removed scaled image"' * Starting with upgrading VTM 0.15 many changes in Libs... ItemizedLayer Mutable marker * before deactivating some red code * ItemizedLayer<> removing <> for vtm 0.15 * reactivating changed mapbookmarklayer and avoid nullpointer when photolist is empty * photolayer modified to work with vtm 0.15 and avoiding nullpointer again. 1sr try was nor working. * Photoscaled On/Off * run save actions for modified files * Debug off * cleanup some codelines * latest vtm 0.15 updates Co-authored-by: top <top@MB14> * Map25: PhotoLayer-> Starting with Adjustable PhotoSize and save and restore state * Map25 Photoresize with working save and restore need some cleanup * resolving one confict * resolving conflicts... * solving more conflicts * Delete org.eclipse.jdt.ui.prefs Co-authored-by: top <top@MB14>

telemaxx and others added 23 commits July 28, 2020 17:34

Merge pull request #61 from wolfgang-ch/main

19e6997

main2master

Merge pull request #63 from wolfgang-ch/main

9b31e36

main2main

Merge pull request #64 from wolfgang-ch/main

7860453

main2main

reverted 'reverted "removed scaled image"'

7cef53b

Merge pull request #65 from wolfgang-ch/main

02e59da

main2main

Merge remote-tracking branch 'origin/main' into map25

a939ba1

Merge pull request #66 from wolfgang-ch/main

e4efb71

main2main

Merge pull request #67 from wolfgang-ch/main

6a807df

main2main

Merge pull request #68 from wolfgang-ch/main

30fca6e

main2main

Merge remote-tracking branch 'origin/main' into map25

a3cefa6

Starting with upgrading VTM 0.15

ac58b32

many changes in Libs... ItemizedLayer Mutable marker

before deactivating some red code

1873921

ItemizedLayer<> removing <> for vtm 0.15

900c3da

reactivating changed mapbookmarklayer and

3db044c

avoid nullpointer when photolist is empty

photolayer modified to work with vtm 0.15

2ac3d07

and avoiding nullpointer again. 1sr try was nor working.

Photoscaled On/Off

980a501

run save actions for modified files

1e37acf

Debug off

845cb5a

cleanup some codelines

d536d68

latest vtm 0.15 updates

71bcb6b

Merge pull request #69 from wolfgang-ch/main

9af9a55

main2main

resolving conflicts due new "Images" Structure

7676087

wolfgang-ch force-pushed the map25 branch from 356d6a9 to 6697b4d Compare April 7, 2021 05:51

wolfgang-ch merged commit 76bdbc6 into mytourbook:map25 Apr 7, 2021

wolfgang-ch reviewed Apr 7, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Map25: VTM0.15 #321

Map25: VTM0.15 #321

telemaxx commented Apr 6, 2021 •

edited by wolfgang-ch

telemaxx commented Apr 6, 2021 •

edited

wolfgang-ch commented Apr 6, 2021

telemaxx commented Apr 6, 2021

wolfgang-ch commented Apr 7, 2021

telemaxx commented Apr 7, 2021

wolfgang-ch left a comment

wolfgang-ch Apr 7, 2021

telemaxx Apr 7, 2021

wolfgang-ch Apr 7, 2021

telemaxx Apr 7, 2021

wolfgang-ch Apr 8, 2021

telemaxx Apr 8, 2021

wolfgang-ch Apr 8, 2021

telemaxx Apr 8, 2021 •

edited

telemaxx Apr 8, 2021

telemaxx Apr 8, 2021

wolfgang-ch Apr 9, 2021

wolfgang-ch Apr 7, 2021

wolfgang-ch commented Apr 7, 2021

		* Copyright 2019, 2020, 2021 Wolfgang Schramm and Contributors
		* Copyright 2019, 2020, 2021 Thomas Theussing

Map25: VTM0.15 #321

Map25: VTM0.15 #321

Conversation

telemaxx commented Apr 6, 2021 • edited by wolfgang-ch

telemaxx commented Apr 6, 2021 • edited

wolfgang-ch commented Apr 6, 2021

telemaxx commented Apr 6, 2021

wolfgang-ch commented Apr 7, 2021

telemaxx commented Apr 7, 2021

wolfgang-ch 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

telemaxx Apr 8, 2021 • edited

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

wolfgang-ch commented Apr 7, 2021

telemaxx commented Apr 6, 2021 •

edited by wolfgang-ch

telemaxx commented Apr 6, 2021 •

edited

telemaxx Apr 8, 2021 •

edited