398 Commits

Author SHA1 Message Date
Lawrence37
ed7f2d0690
Merge pull request #7255 from digitalcarp/cleanup-includes
Get rid of relative include paths
2024-12-26 22:25:58 -08:00
Daniel Gao
55480f40ea Fix framing tool batch mode behavior
* Add adjuster add/set options to preferences
* Update width/height limits
* Trim adjuster values
* Batch mode fixes
  * Display all settings with sensitivity
  * Add "(Unchanged)" option to combo boxes
  * Fix checked button toggle modes
2024-11-18 15:33:55 -05:00
Daniel Gao
711f274403 Get rid of relative include paths
* Use target_include_directories to specify include paths
* Specify project root (parent of rtgui and rtengine) as include path
* Replace relative includes with normal includes
2024-11-16 17:20:02 -05:00
Alexander Brock
f6010c13c6 Add ADDSET functionality for scale parameter 2024-09-08 15:00:49 +02:00
Alexander Brock
23fd9903df Implement requested changes 2024-09-04 00:59:26 +02:00
Alexander Brock
159ebd45e8 Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-07-27 12:41:48 +02:00
Alexander Brock
6d96bfe5cc Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-07-20 00:15:43 +02:00
Lawrence Lee
bb44729490
Merge branch 'dev' into libraw-copylib 2024-07-18 21:57:57 -07:00
xiota
7168870d69 Improve empty string check 2024-06-30 03:30:41 +00:00
xiota
6eb191c5e5 Disable addExt/delExt buttons based on context 2024-06-17 02:59:34 +00:00
xiota
cffba6c3b0 Move add-extension panel to top of frame 2024-06-17 02:59:34 +00:00
xiota
7f7e808b9c Don't allow deleting known extensions 2024-06-10 22:51:33 +00:00
xiota
8503d5323e Fix whitespace/formatting 2024-06-10 22:51:33 +00:00
Lawrence Lee
2c1c124d8f
Merge branch 'dev' into libraw-copylib 2024-06-02 18:15:43 -07:00
Alexander Brock
397c699271 Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-06-01 14:22:58 +02:00
Desmis
5571c3a4c6
Local adjustments tools used globally - Laspotmain (#6928)
* First step LA globally

* fixed several GUI bad behavior

* better behavior shows additional settings

* Improve transition in main

* First step hide-show invers and scope

* Hide show invers and scope step2

* hide show others inverse and scope

* Try to improve

* Change windows.yml and appimage.yml

* In Preference set choice for default Spot Method

* Optimization call idle_register

* forgotten delete mainfp

* Re-enable sliders scope in colorlight - shadows - vibrance - move setting checkbox others settings

* Fixed bad behavior hide - show

* Optimize behavior

* Bad behavior scope when changing method

* Clean and comment code

* disable preview mask and modif for cbdl and retinex

* Fixed preview deltaE mask and modif log encode - exposure - new button preview color and light

* Button preview deltaE - exposure

* Button preview SH

* Button preview Vibrance

* Improce code using mask

* Fixed several bad behavior - preview TM and Contrast

* Preview log button

* Preview Ciecam button

* Preview common mask button

* Disable Preview button in settings when not used in tools

* Change call to controspotpanel in improcoordinator

* Change Local adjustments title to Selective Editing

* Change default value spotmethod in option

* Missing cddl in preview settings

* Change parameter setting spot type

* put selective editing tab just after exposure tab

* Disable preview ΔE button when another is enabled

Only one button should be active at any given time.

* Deactivate preview ΔE buttons when switching spots

* Change tooltip Spot method

* Change selective editing position

* Remove duplicate line in language default

* Remove appimage.yml windows.yml

---------

Co-authored-by: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
2024-05-16 08:21:16 +02:00
Simone Gotti
1098966a8b Add optional image rank/color load/save from/to xmp sidecar
Add optional ability to load/save image rank property from/to xmp
sidecar "xmp.Rating" and color property from xmp "xmp.Label" ignoring
the ones provided in the processing params file.

This behavior is disabled by default and an option under settings ->
file browser has been added to enable it.

When enabled:

* On load:
  * rank and color are not read from processing params.
  * rank is mapped from xmp sidecar file rating entry.
  * color is mapped from xmp sidecar file label entry.

* On save:
  * rank and color are saved to the xmp sidecar
  * rank and color are also saved to the processing param (pp3) files to
    keep them in sync

Rating mapping:

Since rating can be also -1 but rank only goes from 0 to 5, the -1 value
is ignored like already done when importing from embedded xmp data.

Color mapping:

XMP has no color concept, usually programs like digikam uses the label
field to write a color name ("Red", "Orange"). The problem is that this
isn't standardized and label can be any string. Additionally Rawtherapee
has 5 specific colors while other programs can have different colors
with different name so they won't be shown if they don't map to the 5
color names supported by rawtherapee. On save only the 5 color supported
by rawtherapee wil be saved.

Trash is kept only in the profile files for multiple reasons:

* There's no trash concept in xmp, there's the rejected concept assigned
  to a rating == -1.
* We could map rejected to trash but in rawtherapee rank and trash are two different values and
  an image can have both rank >= 0 and trashed set to true.
  Using an unique value like rating for rank and trash (when -1) will
  require changing the current rawtherapee logic.
* Also digikam only handles ratings from 0 to 5 (no -1) and handles
  trash in its own internal way without reflecting it in the xmp
  sidecar.
2024-04-03 20:06:14 +02:00
Alexander Brock
ebb0f8ebdd Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-03-30 17:07:31 +01:00
Alexander Brock
28a5d36e9a Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-03-10 17:22:19 +01:00
Lawrence Lee
3e8ebfef2c
Merge branch 'dev' into browse-subfolder 2024-03-09 12:19:30 -08:00
Pandagrapher
7e63892628 Merge with 'Beep6581/dev' 2024-03-06 19:10:49 +01:00
Alexander Brock
041472e39b Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-03-03 20:06:08 +01:00
Lawrence Lee
51e52d9aba
Merge branch 'dev' into libraw-copylib 2024-03-02 21:01:34 -08:00
Lawrence Lee
2b7889b645
Add option to disable LibRaw in preferences 2023-12-17 16:00:30 -08:00
Alexander Gruzintsev
4291c33fe4 Add zoom limit feature 2023-10-30 09:55:14 +01:00
Lawrence Lee
b6f3ea421e
Remove recursive symlink browsing for Windows
Windows doesn't have symbolic links, so the preference should not be
shown.
2023-10-17 21:20:18 -07:00
Pandagrapher
990e9c70a5 Merge with 'Beep6581/dev' 2023-09-05 09:48:43 +02:00
Alexander Brock
2361f3c15b Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2023-08-30 21:32:04 +02:00
Pandagrapher
b57d1026a3 Merge with 'Beep6581/dev' 2023-08-24 13:48:07 +02:00
Pandagrapher
ce5f77ffc2 Removes debug printf 2023-08-23 13:48:39 +02:00
Pandagrapher
bf988ad274 Updates font management for hidpi
Improvements:
- Cleanup of default options files to use OS font by default
- Comments updates
- Simplify font size management as Pango/Gtk directly manage pt/px conversions

Bug fix:
- If Preference panel is closed by "cancel", font size was not reinitialized to previously saved one
- Font size was specified in "RawTherapee.css" theme and so user choice could be ignored
2023-08-23 13:43:07 +02:00
Alexander Brock
bc1851f43c Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2023-08-19 13:29:51 +02:00
Pandagrapher
58b7d41694 Cleanup of theme selection
For hidpi support, Gtk min version has been increased to 3.24.3. Theme logics based on Gtk version is so now useless
2023-08-16 19:07:39 +02:00
Stephen Shkardoon
23f2a2fc9f Use _WIN32 instead of WIN32 to detect Windows
`WIN32` is not defined when building a 64-bit executable on Windows with Clang. `_WIN32` is the more appropriate option here.
http://web.archive.org/web/20191012035921/http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system contains a handy table/matrix of the options and why this is best.
2023-08-13 17:09:49 +12:00
Lawrence37
9ae8c79c3a
Merge pull request #6755 from Lawrence37/lensfun-db-preferences
Edit Lensfun database directory from preferences
2023-08-12 17:43:50 -07:00
Lawrence Lee
db4bfd8695
Add tooltips for LCP & Lensfun dir in preferences 2023-08-12 15:39:59 -07:00
Lawrence Lee
7eb7fb210f
Merge branch 'dev' into metadata-exiv2 2023-08-12 15:08:42 -07:00
Pandagrapher
bb258e4024 Delete now obsolete "pseudo-hidpi" preference 2023-08-12 18:30:03 +02:00
Pandagrapher
d0743ef359 Merge with 'Beep6581/dev' 2023-08-12 18:03:41 +02:00
Alexander Brock
0355d874e5 Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2023-08-09 01:08:59 +02:00
Lawrence37
a596de2f44
Merge pull request #6789 from Lawrence37/lang-names
Language names
2023-08-06 14:47:37 -07:00
Lawrence37
b7816ff882
Merge pull request #6809 from Lawrence37/external-editor-macos-fix
Fix external editor on macOS
2023-08-06 11:54:52 -07:00
Lawrence Lee
c5a0067eee
Merge branch 'dev' into metadata-exiv2 2023-08-06 10:25:49 -07:00
Desmis
8d0333120e
Research and development - WB auto -temperature correlation - tests - finding the optimum settings (#6643)
* Change estimchrom estim hue final

* Itcw observer checkbox

* 8 spectral colors

* 11 spectral colors

* 6 spectral colors

* Small change to correction green

* Fixed various bad behavior - settings itcwb_deltaspec

* 4 spectral colors green

* 3 green spectral colors

* 3 spectral colors green

* 5 spectral colors red green

* 3 spectral colors red green

* 3 spectral colrs green red

* Chnage slider choice deltaE - to size color patch

* display more info in console

* Display more info in console - comment code

* Clean - comment code

* 8 spectral colors green red

* 8 spectral colors blue

* 8 spectral colors blue

* 3 spectral colors

* 6 spectral colors

* 4 spectal colors

* 2 spectral colors

* Eliminate high Y - increse temp iteration - recenter selection inside patch

* compatibility 5.9

* Modify dislay and place selected dats in patch

* Dispaly in console hue chroma image selection

* First optimization

* optimization code - clean unused variables

* Remove sorted in chroma order - some others changes

* 5.9 compatibility

* Clean and optimize code

* Clean code - more display info in console

* More info in console - set itcwb_minsize in option

* Display patch chroma in GUI

* Change some default settings

* Minsize patch GUI

* Display GUI patch size

* Chroma patch variations

* Display in GUI min and max dats found in patch

* Some adjustments

* Remove too low datas in patch

* Various improvment - ponderate

* Clean code colortemp comment spectral datas

* Comment code - correc gren

* Comment and refine code

* Fixed bug in improcoordinator

* fixes a malfunction of AWB bias in improcoordinator

* Various improvments - clean code

* 2 improvments green and find patch

* Allows parametrind ponder and Ypurple in options

* Update autowb - filter on magenta purple

* Clean and optimize code

* Read colors in GUI

* Denoise median 5x5 image datas before Itcwb

* Change to GUI

* Replace median5x5 by 2 median3x3 - clean GUI code

* Work around to recalculate wbauto

* Remove work around - change params->wb related change

* Disabled low_sampling 5.9

* First try for compatibility Low sampling 5.9

* Re-enable WB autogrey

* Change reference image to autogrey if camera settings probably out

* Clean code aand adjust settings camera out

* Format astylert rawimagesource.cc - various small adjustments

* Small correction

* Small green correction

* Change default settings - correction to autowb bias in improccoordinator

* Save provisory work

* Save provisory work 2

* Try to find good tempitc with iterate when temptitc very different 5000K

* Change 2 default settings

* Work around awb temp bias

* Limit work around bias - small other changes

* 3 spectral colors deep blue

* 4 spectral color deep blue

* 4 color spectral yellow

* 5 spectral colors neutral red-magenta

* 5 spectral color neutral red magenta

* Change threshold tempitc

* 5.9 compatibility

* Work around bad claculation Planck's formula

* Fixed bad behavior when using blackbody spectal

* 6 spectral color - checkbutton remove 2 passes

* Fixed various bugs

* Format rawimagesource.cc

* Various improvment before to find the good selection

* First new optimization (perhaps?)

* Display GUI patc deltaE

* Various optimzation and tooltip

* Default observer 2°- Simplify GUI - improve display GUI - remove too low numbers datas

* 4 spectral colors - change 2 settings

* Change calculation threshold 2 passes

* 6 spectral colors magenta

* 13 spectral colors

* Improvment GUI display

* remove checkbutton no_purple

* 2 spectral colors - remove in GUI low sampling 5.9

* Change default setting display in console

* Change behavior when temp near stdA

* 4 spectral colors - settings Itcwb_tempstdA

* Gamut control on image histogram

* Clean code and format rawimagesource.cc

* Comment and format colortemp.cc

* Remove unused fileds from GUI - change tooltips

* Add tooltips

* Various changes

* Change settings when camera temperature is out

* improvment extra and tooltip

* Small change when using auto grey as start reference

* Remove itcwb_fgreen from GUI

* Various change - and 'unsatisfactory' test to take into account Custom

* Change second temp when < 4000 - replace automatic by automatic and refinement

* Neutralize 'Use custom tempertaure and green'

* Green refinement

* Clean code - small changes

* Other clean code

* Added forgotten itcw_green in procparams.cc

* Fixed a bug dispaly deltaE

* Change threshold settings - change code for Custom

* various change in case of using camera settings

* Change way to estimate range green

* clean code and message in console

* Clean and optimize

* Disable 2 passes if custom

* Improve GUI 2 passes

* Increase sampling and number of temperature above 9400K

* Hide AWB temperature bais and green refinement when Custom temerature ans green

* marks out the code with past time markers

* Improve time processing with spectral colors temp calculations

* Replace in console msec by nsec

* Scan temp 5.9

* Change max temp and behavior if temp > 15000k

* Refine temp near 14000K

* Increase sampling temperature 132 to 167

* Increase sampling temperature

* Set in preference choice for itcwb_custom

* White point calculated  with observer instead of table

* More on whitepoint calculation - informations

* Clean and format code with astyle colortemp.cc rawimagesource.cc improccoordinator.cc

* Small change tooltip

* Improve update auto-wb

* Remove 'use custom temperature and tin' - simplify sampling to 2 choice

* Small change to rand AWB bias - green refinement - tooltips

* slightly modify the parameters upstream of the algo - do not use camera in some cases

* Mixed initial green

* Refine init green and temp when no camera

* Refine temp and green in do not use camera settings

* Change tint threshold and various improvments (tooltips, wrong values..)

* Refinment and clean code

* Improve mode No use camera settings

* Init nocam

* Refine use no camera  settings

* Small change

* 5.9 compatibility - and format

* Refine sampling temperature  around 7000 - 8000K

* Format astylert rawimagesource colortemp

* 5.9 settings

* 5.9 settings 2

* Various change - 5.9 - format

* Improve pre and post algorithm

* Fixed correction temp > 8000K

* Fixed bad behavior Tppat.minchroma

* Change sampling choices and tooltip

* Change name wp wp2 wip to wb wb2 iwb to avoid misunderstood

* Small Change settings - limit display studgood to 0.0001

* Improvment display GUI temp

* Change default sampling

* Change ACESP0 to JDCmax

* Improve GUI abstract profile

* Allows dispaly in console xy values thanks to Reffort

* Remove bruce rgb in wp and abstract

* Change wp abstract and save itcwb with dispaly cellxy

* Change prim = 13 improccoordinator iplab2rgb

* remove display datas in console - fixed wrong display Y xyY

* Fixed ifferences in GUI maxhist minhist

* Change limits x y in function sampling

* fixed a dizziness

* Change  after algorithm rule when temp > 6000K

* Harmonize limx limy for oldsampling 5.9

* Added Cam xyz matrix to sampling - thanks to Reffort

* Display in console xyz matrix

* Forgotten instruction when mix camera and autowb grey

* Change rgbloc with Camera matrix Dcraw when no input profile

* Change rep to repref in rgbxyz

* Remove message in console

* 5.9 compat

* 5.9 compat 2

* 5.9 compat 3

* 5.9 compat 4

* 5.9 compat 5 format

* 5.9 compta 6

* Improve code

* Diasble itcwb_sampling in GUI

* Comment code

* Clean and comment code

* 5 spectral colors

* 9 spectral colors

* 2 spectral colors

* Various improvments

* 5 spectral colors

* 5 spectral colors

* First changes review lawrence37

* Second changes review Lawrence37

* 3rd changes review Lawrence37

* 4th changes review Lawrence37

* Change windows and appimage yml

* Re-enable Rtv4_Bruce in procparams.cc

* test for 5.9 compatibility

* Try to fixed crash

* Slightly improve the management of 5.9

* test for 5.9 compatibility by passing parameters via the GUI

* Forgotten parameter

* Change ref_spec limit and remove pac_start for itcwb_sampling

* Puts back the old Planck formula - the same as in dev

* Revert "test for 5.9 compatibility by passing parameters via the GUI"

This reverts commit d6b5a8feda31b93a5574cee6ebf4d3e9d58bbcfb.

* Switch to new ITCWB only when changing WB method

Prevents sudden changing of the white balance if ITCWB is selected and
the image is reopened.

* Fix spelling in comment

* Suggested change from Lawrence37 to whitebalance - small change to improcoordinator

* tempbias Set_sentive(false) if itcwb_smapling - clean whitebalance

* Another clean whitebalance.cc

---------

Co-authored-by: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
2023-08-06 13:44:48 +02:00
Lawrence Lee
7ad414aa63
Fix macOS external editor app chooser popping up 2023-08-04 22:32:39 -07:00
Lawrence Lee
6bd822352e
Display actual language names in preferences
Add ability to set metadata variables in the language files.
Use the LANGUAGE_DISPLAY_NAME metadata variable value in preferences to
show the languages.

Metadata variables are defined in the first section of a language file,
i.e. the comments at the beginning of the file. At most one variable can
be defined per line. The definition takes the following format:
    #<header><whitespace>@<key>=<value>
where:
    <header> is any sequence of non-whitespace characters
    <whitespace> is any non-empty sequence of whitespace characters
    <key> is the metadata key name
    <value> is the metadata value
For example,
    #101 @LANGUAGE_DISPLAY_NAME=English (US)
defines a metadata key "LANGUAGE_DISPLAY_NAME" with value
"English (US)". Lines that do not match the format are ignored.
2023-07-04 17:52:01 -07:00
Lawrence Lee
eef54f0f2d
Add option to disable symlinks in recursive browse 2023-06-11 17:22:40 -07:00
Lawrence Lee
660c9507cc
Add recursive browsing options to preferences
Allow maximum recursion depth and maximum sub-directories to be
configured in preferences.
2023-06-11 11:47:46 -07:00
Alexander Brock
26ae65ec9e Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2023-06-10 13:23:33 +02:00
Lawrence37
c07a6e8901
Merge pull request #6641 from Lawrence37/tone-equalizer
Global tone equalizer
2023-06-09 21:15:58 -07:00