syncpoint / ODIN

Open Source C2IS (Command and Control Information System)
MIT License
63 stars 20 forks source link

Shortcuts for Map - Filters Contrast and Grayscale inactive #42

Closed harrywipperfuerth closed 5 years ago

harrywipperfuerth commented 5 years ago

The two shortcuts

Alt + Strg + 2 (for Contrast) Alt + Strg + 3 (for Grayscale)

are inactive.

If you want to use it, the only possible way is about the Menue (View - Map - Filter ...).

ODIN Filter menue

dehmer commented 5 years ago

No problem with macOS here. Will try to reproduce this with Windows 10.

JulianKK commented 5 years ago

I can confirm that problem with win 10. Also the reset filter functionality strg + alt + 0 does not work

dehmer commented 5 years ago

For me with Win 10 in VMware Fusion, only Strg+Alt+4 does not work. I think, it's save to say, that for Windows platform, Electron menu shortcuts are a little unreliable.

JulianKK commented 5 years ago

the same behavior can be observed with zoom in (standard menu by electron). It is displayed as a shortcut "cntr + shift + =", but this function is called by means of "cntr + shift + +". There is an issue on the electron git repository. #6731

harrywipperfuerth commented 5 years ago

The shortcuts "CTRL + STRG + 2" (for "Contrast") and "CTRL + STRG + 3" (for Grayscale) have the same "Result" (= "Contrast")!

JulianKK commented 5 years ago

Not in my version ??? New keyboard shortcuts are Ctrl + Shift + 'Number' Did you use that?

JulianKK commented 5 years ago

Sorry, you're right, there was something wrong with the merge of the pullrequests

JulianKK commented 5 years ago

now it should work (see commit 41fb44da5c...)

dehmer commented 5 years ago

Sorry guys! My bad! @JulianKK Thanks for fixing! @harrywipperfuerth Thanks for spotting! And could you please close the issue after you verified the fix?

harrywipperfuerth commented 5 years ago

Sorry guys, it's not working.

If you select Map - Filter - Grayscale, "Contrast" appears on the map again (is the same problem as with shortcuts!).

The problem is unsolved from my point of view.

dehmer commented 5 years ago

@harrywipperfuerth Hmm, maybe your project is not up to date (and cannot be updated). Please run the following commands and attach the complete conversation (command results) from your command line terminal to this issue.

git status
git pull
git checkout develop
npm run webpack
npm start
harrywipperfuerth commented 5 years ago

git status:

$ git status On branch develop Your branch is up to date with 'origin/develop'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: package-lock.json no changes added to commit (use "git add" and/or "git commit -a")

git pull:

$ git pull remote: Enumerating objects: 194, done. remote: Counting objects: 100% (175/175), done. remote: Compressing objects: 100% (56/56), done. Receremote: Total 133 (delta 83), reused 125 (delta 75), pack-reused 0 Receiving objects: 100% (133/133), 20.39 KiB | 254.00 KiB/s, done. Resolving deltas: 100% (83/83), completed with 28 local objects. From https://github.com/syncpoint/ODIN eecb148..f56eb88 develop -> origin/develop f652c2f..2733edc experimental/poi -> origin/experimental/poi error: Your local changes to the following files would be overwritten by merge: package-lock.json Please commit your changes or stash them before you merge. Aborting Updating eecb148..f56eb88

git checkout develop:

$ git checkout develop Already on 'develop' M package-lock.json Your branch is behind 'origin/develop' by 7 commits, and can be fast-forwarded. (use "git pull" to update your local branch)

npm run webpack:

$ npm run webpack > odin-c2is@0.2.2 webpack E:\01_Syncpoint\11_ODIN > webpack

npm start:

$ npm start > odin-c2is@0.2.2 start E:\01_Syncpoint\11_ODIN > electron . --noDevServer

dehmer commented 5 years ago

OK, you cannot pull the latest version, because a local file (package-lock.json) has changed in the meantime. That's not your fault! npm install may update this file when new dependency versions are detected and installed.

To fix this temporarily, type:

git checkout package-lock.json

and try again. This time omitting npm install.

Whenever you so something like

Changes not staged for commit: (...)

when running git status or for git pull

error: Your local changes to the following files would be overwritten by merge: (...)

chances are that an update does not work. I'm very sorry for the inconvenience. We are working on a solution to supply you with the latest snapshot builds.

Thanks for your patience! 👏 👏 👏

harrywipperfuerth commented 5 years ago

After deleting ODIN and starting it via the release version, it runs correctly. I will complete this issue as solved.