Commit Graph

530 Commits

Author SHA1 Message Date
Lawrence Lee
a120b304f1 Add tooltip for control lines 2020-06-10 13:13:18 -07:00
Lawrence Lee
11459a8bb1 Add label for control lines buttons 2020-06-10 12:50:14 -07:00
Lawrence Lee
852b3270e1 Make history message key names more descriptive
Use keys that are more descriptive than "HISTORY_MSG_###".
2020-05-04 18:15:27 -07:00
Lawrence Lee
fb5094b6f9 Merge from branch 'dev' 2020-05-04 14:07:45 -07:00
rom9
22eee9787e Film negative stable multipliers (#5485)
* Added new feature to calculate channel multipliers from crop area. This also saves the crop area channel medians to the processing profiles, in order to get a more consistent color balance when batch-applying the same profile to multiple pictures from the same film roll.

* Fixed wrong initialization of array, and missing check for the result of `getFilmNegativeMedians()`.
Moved `ImProcCoordinator::translateCoord()` from private member to anonymous namespace.
Fixed some whitespace and formatting issues.

* Fixed some formatting issues

* Passed `ipf` parameter as const in `translateCoord`.
Narrowed `using namespace` to single class `Coord2D`.

* Added `scaleGain` entry to thumbnail metadata file, to make `scale_mul` multipliers available in thumbnail processing phase. This simplifies multiplier calculations, so that "faking" thumbnail multipliers in the main image processing is not necessary anymore. This way, output values are immune to slight variations of multipliers between successive shots taken with in-camera AWB turned on.
Shifted multipliers so that the output channel medians are balanced when "Camera WB" is selected. This way, just computing multipliers from crop and setting "Camera WB" (which is the default) gives a pretty well balanced image as a starting point.

* New channel scaling method, based on a film base color sample instead of crop area channel medians. Channels are scaled so that the converted film base values are equal to 1/512th of the output range (65k). This giver better black levels in the output, and more consistency when batch-processing multiple negatives.
The output is now compensated for a known fixed WB value, so that the film base will appear grey when WB is set to 3500K, Green=1.
Added PPVERSION 347 to preserve backwards compatibility: when a processing profile saved by RT 5.7 is loaded (PPVERSION=346), the new fields are initialized to the special value -1, which will instruct the main processing to follow the old channel scaling behaviour. The old channel scaling multipliers will then be converted to the new film base values so that the resulting image is the same, and the fields will be overwritten as soon as the PP is saved again. This will transparently upgrade the processing profile.
When the new behaviour is used, but the film base values are still unset, they are estimated based on channel medians, excluding a 20% border around the image. This should give a better result out-of-the-box for pictures containing a large film holder.

* Code cleanup from review

* Run astyle on film neg source files

* Fixed automated build failure caused by incompatible libraries on my dev PC.

* Simplified `Thumbnail::processFilmNegative` method signature. There is no need to pass in `rmi`,`gmi`,`bmi` multipliers from the caller, i can do the same with my own internal multipliers.

* Added `FilmNegListener` class to pass estimeted film base values to the GUI after first processing. Removed old `filmBaseValues` instance variable from RawImageSource.

* Code cleanup

* Forgot to set baseValues flag in `PartialPasteDlg::applyPaste`
Fixed `filmBaseValuesLabel` not updating when reading zero baseValues. Normally not needed (the label is updated later by the listener), but when the user is browsing through pictures the listener won't fire, so the label must be updated to show values are unset.

* Overwritten channel scaling multipliers by calling `get_colorsCoeff` with `forceAutoWB=false`.
Initially, in `RawImageSource::load`, channels are auto-balanced by averaging the whole picture when computing multipliers.
This can give different multipliers for multiple shots of the same camera, which will lead to inconsistent conversions when batch-processing multiple negatives.
This commit re-sets `scale_mul`, `ref_pre_mul`, etc., in order to "undo" the auto-WB and use the normal camera multipliers.

* Found an easier way to get stable overall multipliers, removed the (horrible) on-the-fly mutation of scaling instance variables.
2020-04-13 17:20:56 +02:00
Desmis
9f5e81b026 Change tooltip offset 2020-04-06 09:42:46 +02:00
Desmis
31355ca70e Added equalizer denoise luminance 2020-04-06 09:37:37 +02:00
Desmis
ca8399bc90 change labels 2020-04-05 11:13:18 +02:00
Desmis
05250a2497 Change labels chroma 2020-04-05 11:04:01 +02:00
Desmis
2d52fbdcef Improve wavelet levels with denoise chroma 2020-04-05 10:28:45 +02:00
Desmis
d0e65ec93c Change history_msg 2020-04-05 06:59:17 +02:00
Desmis
d00ec5a1b2 Change tooltip and history msg damper 2020-04-04 08:32:34 +02:00
Desmis
61c6b19533 GUI for wavelt denoise chroma 2020-04-02 12:32:29 +02:00
Desmis
ed57e3163e Prepare ftblockdn to chroma denoise 2020-04-02 09:10:33 +02:00
Desmis
b8749f708c Added effect to edge sharpness 2020-03-31 14:24:17 +02:00
Desmis
5102c82c11 Improve blur with effect 2020-03-31 10:04:16 +02:00
Desmis
0fa2ca79c2 Improvment contrast to prevent texture and noise 2020-03-30 08:54:26 +02:00
Desmis
7d33319893 small change to blur - change label and tooltip 2020-03-29 08:00:48 +02:00
Desmis
a61463447a Improvment to Blur levels 2020-03-28 08:35:00 +01:00
Desmis
d10ff9e816 Wavelet Improvment to GUI Residual 2020-03-27 16:21:17 +01:00
Desmis
ac83695645 Suppress warning and add tooltips 2020-03-27 09:27:43 +01:00
Desmis
c836376766 Blur residual luma and chroma 2020-03-26 09:34:38 +01:00
Desmis
ea56e57ec2 First version blur by level 2020-03-26 07:19:54 +01:00
Desmis
51f1198b65 Init blur by levels 2020-03-25 18:06:32 +01:00
Desmis
cdf8d8ec7f Wavelet - added offset to contrast levels 2020-03-25 07:15:27 +01:00
Desmis
6d154bcdae Wavelet - Give possibility to use old algo SH residual image 2020-03-24 11:29:50 +01:00
Desmis
1f4613cd3b GUI for TM wavelet 2020-03-22 10:37:21 +01:00
Desmis
6c96e5a0a4 Added D41 to Ciecam02 illuminant 2020-03-05 08:10:47 +01:00
Desmis
bb54a97436 Ciecam02 change label and tooltip 2020-03-04 18:12:06 +01:00
Desmis
05f365c0d6 Added method Illuminant to make choices easier in free mode 2020-03-04 16:31:49 +01:00
Desmis
f4da001589 Ciecam02 autotempout button 2020-03-02 20:00:02 +01:00
Desmis
d55e649a64 merge with dev 2020-02-29 08:14:03 +01:00
Desmis
ae0586719a Enabled bencfun for Itcwb 2020-02-28 08:33:12 +01:00
Desmis
10af444786 Change tooltip orthographe 2020-02-27 18:08:02 +01:00
Desmis
d56c53b1ae Change tooltip 2020-02-27 18:06:30 +01:00
Desmis
32f3273a2a Change some tooltips 2020-02-27 08:50:08 +01:00
Lawrence Lee
357cf5b96a Remove scaling from perspective correction
Scaling is applied at the end of all geometric transformations, so it
would be more appropriate outside of the perspective correction tool.
Such an implementation would also work better with the auto-fit feature.
2020-02-26 22:52:55 -08:00
Desmis
603b55e690 Preset cat02 automatic 2020-02-25 17:28:19 +01:00
Morgan Hardwood
10b85f14cd generateTranslationDiffs on default only 2020-02-25 09:04:18 +01:00
Desmis
74c40382c8 merge with dev 2020-02-25 07:56:36 +01:00
Lawrence
f16773eb3f Merge branch 'dev' into perspective
Resolve minor conflict in ImProcFunctions::transformGeneral and add new
arguments for use of ImProcFunctions::needsTransform in
PerspectiveCorrection::autocompute.
2020-01-18 18:41:26 -08:00
Lawrence
7395b26db4 Add rotation to camera-based perspective tool
This rotation is different from the Rotate tool and the post-correction
adjustment rotation because it is applied between camera shift and
camera angle. It is equivalent to correcting the camera's roll and is
the same as the rotation calculated by automatic perspective correction.
2020-01-18 17:13:24 -08:00
Desmis
ba7a61c391 merge with dev 2020-01-13 08:33:45 +01:00
Desmis
4e81cbaa72 merge with dev 2020-01-13 08:02:43 +01:00
Ingo Weyrich
49d594f67a Log transform: add method combobox 2020-01-02 19:28:57 +01:00
Desmis
89bdb7e848 merge with dev 2019-12-30 10:28:19 +01:00
Desmis
31ae02e080 merge with dev 2019-12-30 10:14:27 +01:00
Lawrence
f83a62be5b Add back the old perspective tool
Add perspective correction method chooser to allow choice between the
original perspective tool (simple) and the new one (camera-based).
2019-12-28 17:18:59 -08:00
Lawrence
f514a69104 Group perspective adjusters in frames
Divide perspective correction adjusters into three groups: camera
attributes, post-correction adjustments, and perspective distortion
recovery.
2019-12-27 20:50:18 -08:00
Lawrence
f9a8875bb5 Add more perspective correction adjusters
Add camera lens/sensor shift support with horizontal/vertical shift
adjusters.

Add shifting and rotation of corrected image. This allows
post-correction adjustments to be made more easily given the fixed image
canvas size.

Add scaling of final result. This also helps reduce frustrations with
the fixed image canvas size.

Replace field of view with focal length and crop factor. Use of focal
length and crop factor is more common than diagonal angular field of
view. The new adjusters should be more intuitive for most photographers.
The implementation of perspective correction uses a focal length
relative to the image dimensions. The existing code calculates that
focal length with trigonometry. The new code does it by multiplying
by a ratio.

Replace vertical bias with horizontal and vertical perspective
distortion recovery. Vertical bias is not intuitive as it causes
vertical lines to converge off-center if horizontal correction is
applied. The new adjusters perform perspective distortion on the
projection of the corrected image, allowing vertical/horizontal lines to
converge towards the center lines of the image.

Refactor perspective transformation math to use dynamically computed
homogeneous coordinate matrices instead of pre-calculated formulas. This
should add some overhead, but results in more maintainable code and
possible improved performance due to the reduced number of arithmetic
and assignments needed for each pixel.

Integrate new adjusters in the GUI. This includes fine granularity for
batch processing add/set modes and history.
2019-12-27 16:40:41 -08:00