Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Local adjustments tools used globally - Laspotmain #6928

Merged
merged 49 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
532757d
First step LA globally
Desmis Jan 13, 2024
f03c7f2
fixed several GUI bad behavior
Desmis Jan 13, 2024
b0d0c38
better behavior shows additional settings
Desmis Jan 13, 2024
8c2e623
Improve transition in main
Desmis Jan 14, 2024
0ba71c6
First step hide-show invers and scope
Desmis Jan 14, 2024
d0b55fc
Hide show invers and scope step2
Desmis Jan 14, 2024
42c2eb4
hide show others inverse and scope
Desmis Jan 14, 2024
245d4aa
Try to improve
Desmis Jan 14, 2024
4cd3170
Change windows.yml and appimage.yml
Desmis Jan 15, 2024
143e4de
In Preference set choice for default Spot Method
Desmis Jan 15, 2024
63ec6cb
Optimization call idle_register
Desmis Jan 15, 2024
a5de124
forgotten delete mainfp
Desmis Jan 15, 2024
045ecc4
Re-enable sliders scope in colorlight - shadows - vibrance - move set…
Desmis Jan 16, 2024
775fcf0
Fixed bad behavior hide - show
Desmis Jan 16, 2024
5fa3905
Optimize behavior
Desmis Jan 17, 2024
9c085c4
Bad behavior scope when changing method
Desmis Jan 17, 2024
41cfcf8
Clean and comment code
Desmis Jan 18, 2024
3f772ea
disable preview mask and modif for cbdl and retinex
Desmis Jan 18, 2024
b136832
Fixed preview deltaE mask and modif log encode - exposure - new butto…
Desmis Jan 19, 2024
0eea922
Button preview deltaE - exposure
Desmis Jan 19, 2024
e0bc730
Button preview SH
Desmis Jan 19, 2024
2fe2621
Button preview Vibrance
Desmis Jan 19, 2024
e0b499b
Improce code using mask
Desmis Jan 20, 2024
286ff70
Fixed several bad behavior - preview TM and Contrast
Desmis Jan 20, 2024
0a0be0b
Preview log button
Desmis Jan 20, 2024
48e6553
Preview Ciecam button
Desmis Jan 20, 2024
45cbe72
Preview common mask button
Desmis Jan 20, 2024
f569e63
Disable Preview button in settings when not used in tools
Desmis Jan 20, 2024
7563abe
Change call to controspotpanel in improcoordinator
Desmis Jan 20, 2024
c02d0e5
Change Local adjustments title to Selective Editing
Desmis Jan 25, 2024
670e45b
merge with dev
Desmis Jan 30, 2024
dba9909
Merge with dev
Desmis Feb 2, 2024
c79e02d
Change default value spotmethod in option
Desmis Feb 3, 2024
46cfd01
Merge with dev
Desmis Feb 16, 2024
d693fa9
Missing cddl in preview settings
Desmis Feb 26, 2024
7fad46c
merge with dev
Desmis Feb 28, 2024
b568127
Merge with dev
Desmis Mar 7, 2024
6cf89ae
merge with dev
Desmis Mar 29, 2024
efc2d55
Merge with dev
Desmis Apr 15, 2024
cd85a4f
Change parameter setting spot type
Desmis Apr 15, 2024
489a826
put selective editing tab just after exposure tab
Desmis Apr 15, 2024
74d52ab
Merge with dev
Desmis Apr 20, 2024
3d9994c
Merge with dev
Desmis May 12, 2024
21fae78
Disable preview ΔE button when another is enabled
Lawrence37 May 12, 2024
04136d2
Deactivate preview ΔE buttons when switching spots
Lawrence37 May 13, 2024
3ecb08d
Change tooltip Spot method
Desmis May 13, 2024
71ea596
Change selective editing position
Desmis May 13, 2024
b6e6e8a
Remove duplicate line in language default
Desmis May 14, 2024
beb5d07
Remove appimage.yml windows.yml
Desmis May 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion rtdata/languages/default
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#00 default translation file
#00 default translation file
Lawrence37 marked this conversation as resolved.
Show resolved Hide resolved
#01 Developers should add translations to this file and then run the 'generateTranslationDiffs' Bash script to update other locales.
#02 Translators please append a comment here with the current date and your name(s) as used in the RawTherapee forum or GitHub page, e.g.:
#03 2525-12-24 Zager and Evans
Expand Down Expand Up @@ -3049,7 +3050,7 @@ TP_LOCALLAB_EV_VIS_ALL;Show all
TP_LOCALLAB_EXCLUF;Excluding
TP_LOCALLAB_EXCLUF_TOOLTIP;'Excluding' mode prevents adjacent spots from influencing certain parts of the image. Adjusting 'Scope' will extend the range of colors.\n You can also add tools to an Excluding spot and use them in the same way as for a normal spot.
TP_LOCALLAB_EXCLUTYPE;Spot method
TP_LOCALLAB_EXCLUTYPE_TOOLTIP;Normal spot uses recursive data.\n\nExcluding spot reinitializes all local adjustment data.\nCan be used to totally or partially cancel a previous action or to carry out operations in Inverse mode.\n\n'Full image' allows you to use the local adjustment tools on the whole image.\n The RT Spot delimiters are set beyond the image preview boundaries.\n The transition is set to 100.\nNote, you may have to reposition the RT Spot slightly and adjust the Spot size to get the desired effect.\nPlease note: using Denoise or Wavelet or FFTW in full-image mode uses large amounts of memory and may cause the application to crash on lower capacity systems.
TP_LOCALLAB_EXCLUTYPE_TOOLTIP;Normal spot uses recursive data.\n\nExcluding spot reinitializes all local adjustment data.\nCan be used to totally or partially cancel a previous action or to carry out operations in Inverse mode.\nUse 'Scope' (Excluding) to set the exclusion intensity.\n\n'Full image' allows you to use the local adjustment tools on the whole image.\n The RT Spot delimiters are set beyond the image preview boundaries.\n The transition is set to 100.\nNote, you may have to reposition the RT Spot slightly and adjust the Spot size to get the desired effect.\nPlease note: using Denoise or Wavelet or FFTW in full-image mode uses large amounts of memory and may cause the application to crash on lower capacity systems.\n\n'Global' allows you to use the local adjustment tools on the whole image, without using deltaE or transitions.
TP_LOCALLAB_EXECLU;Excluding spot
TP_LOCALLAB_EXFULL;Full image
TP_LOCALLAB_EXMAIN;Global
Expand Down
9 changes: 5 additions & 4 deletions rtgui/toolpanelcoord.cc
Original file line number Diff line number Diff line change
Expand Up @@ -475,18 +475,19 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favorit
toolPanelNotebook->append_page(*favoritePanelSW, *toiF);
}
toolPanelNotebook->append_page (*exposurePanelSW, *toiE);
/*
if (!batch) {
toolPanelNotebook->append_page(*locallabPanelSW, *toiL);
}

*/
toolPanelNotebook->append_page (*detailsPanelSW, *toiD);
toolPanelNotebook->append_page (*colorPanelSW, *toiC);
toolPanelNotebook->append_page (*advancedPanelSW, *toiW);

// Locallab notebook is hidden in batch mode
// if (!batch) {
// toolPanelNotebook->append_page(*locallabPanelSW, *toiL);
// }
if (!batch) {
toolPanelNotebook->append_page(*locallabPanelSW, *toiL);
}

toolPanelNotebook->append_page (*transformPanelSW, *toiT);
toolPanelNotebook->append_page (*rawPanelSW, *toiR);
Expand Down