Commit Graph

4119 Commits

Author SHA1 Message Date
Scott Gilbertson
cd64ced60f Address comments in pull request:
- use "const" where possible
 - add spaces after commas
 - use dateTimeFormatExamples by reference (don't copy)
 - fix incorrect cast to unsigned int (declare variable as gunichar)
2024-02-28 13:22:57 -05:00
Scott Gilbertson
1db8b0d643 Indent example path the same amount as other indented items in the queue template help 2024-02-25 17:49:00 -05:00
Scott Gilbertson
50f27c099c Make indentation consistent in queue template help 2024-02-25 17:38:42 -05:00
Scott Gilbertson
fbeaace607 Change literal to G_FILE_ATTRIBUTE_TIME_MODIFIED, change line spacing in template help 2024-02-25 10:14:10 -05:00
Scott Gilbertson
7c67739b9d Eliminated dateTimeIsValid, instead null-checking dateTime -- non-null means it's valid. 2024-02-19 11:43:04 -05:00
Scott Gilbertson
b39ab15659 Eliminated use of stat() instead using Gio::FileInfo to get file modification date 2024-02-19 11:35:46 -05:00
Scott Gilbertson
547ac41ad4 Make brace placement consistent 2024-02-18 12:28:00 -05:00
Scott Gilbertson
703a81ae0c Removed FIXME comment 2024-02-18 12:22:36 -05:00
Scott Gilbertson
94cd3d4626 Apply time/date format for %t output template specifier 2024-02-18 11:30:43 -05:00
Lawrence Lee
7945f93e8f Merge branch 'releases' into dev 2024-02-15 23:15:50 -08:00
Scott Gilbertson
dbd0829e61 Obtain the export, shooting or save time, per letter after %t output template specifier
Print the result (not yet processing a time formatting string)
2024-02-12 18:35:01 -05:00
Scott Gilbertson
79134ecc9f Instead of time now, in help examples use 2001-02-03T04:05:06.123456 local time 2024-02-12 17:06:08 -05:00
Scott Gilbertson
5d7586bab4 Simplify path help, add '%f' to generated examples 2024-02-11 15:28:39 -05:00
Scott Gilbertson
ccc667e390 Added specific tooltip for the location template "?" help toggle button 2024-02-11 15:10:02 -05:00
Scott Gilbertson
bc054ea506 Added help for time/date template specifiers 2024-02-11 15:07:50 -05:00
Scott Gilbertson
353a4d472a Added help sections for %r and %s tags, and for common examples 2024-02-11 14:28:03 -05:00
Scott Gilbertson
2690e27dea Generate help examples (Windows or Linux, as appropriate) for %d, %p and %P specifiers.
Also make the help pane half the overall width when first shown (and it's resizeable).
2024-02-11 14:03:58 -05:00
Scott Gilbertson
ed5792bb9f Make populateTemplateHelpBuffer a private member of class BatchQueuePanel 2024-02-10 13:49:19 -05:00
Scott Gilbertson
3fb7296cd1 Create template help Pango markdown programmatically (partial).
Do that the first time the text is shown, rather than at startup.
2024-02-10 13:44:12 -05:00
Desmis
8ad4ebf482 Change default behavior Local Adjustments settings Avoid Color Shift to XYZ Absolute (#6948)
* Change default settings avoidcolorshift to XYZ absolute

* Same change in controlspotpanel.cc
2024-02-08 21:53:07 -08:00
Lawrence37
e438e0e604 Some more cherry-picking for 5.10 (#6937)
* Local adjustments - Show additional settings - link with complexity  (#6899)

* Change hishow -additional seeting - with complexity

* Modify windows.yml and appimage.yml

* Fixed bug in duplicate spot

* Remove pre-dev builds

* Update camconst.json white levels for 1DxII

* Fix warnings: conversion to double/float, unused variables, register keyword

* Fix crash when opening image in editor

Do not access uninitialized raw image data. The raw data is requested
when the demosaic mode is set to None and the cursor is moved over the
image in the editor. It can occur before the raw data is loaded.

* Fix sRGB working profile crash

The sRGB working profile cannot be found under some conditions because
the profile name is stored as a Glib::ustring and the same strings may
not be equal when using different locales. Use std::string whenever
comparing profile names.

---------

Co-authored-by: Desmis <jdesmis@gmail.com>
Co-authored-by: CarVac <airplaniac2002@gmail.com>
Co-authored-by: Alexander Gruzintsev <0v3rt1r3d@gmail.com>
2024-02-04 15:43:33 -08:00
Lawrence37
0d0834cbe7 Dynamic Range Compression Improvement (5.10) (#6943)
* Improve Dynamic Range Compression - for some images with very high DR

* Clean code

* Improve TM fattal with saturation control in LA

* Saturation control fattal in LA

* Re-order paramsedit

* Change history_msg_tmo_satur with saturation

---------

Co-authored-by: U-PCSPECIALIST01\jdesm <jdesmis@gmail.com>
2024-02-04 15:38:04 -08:00
Scott Gilbertson
c7500becb8 Make template help initially hidden 2024-02-03 19:24:07 -05:00
Scott Gilbertson
e332446627 Added "?" toggle button to show/hide template help.
I haven't figured out how to make it initially hidden.
2024-02-03 15:28:46 -05:00
Scott Gilbertson
7632d0df7c Got template help show/hide working (I had been hiding the wrong widget) 2024-02-03 13:13:25 -05:00
Scott Gilbertson
bfcfaca0ba First try at adding expandable queue template help, using a Gtx::Paned.
Hiding doesn't work right yet. Click a thumbnail and the text disappears,
but the border between widgets doesn't move to the left side.
I tried using a Gtk::Expander, but couldn't get it to expand horizontally.
2024-02-03 13:02:02 -05:00
Desmis
5349f7a860 Improve Dynamic Range Compression - for some images with very high DR - Main and LA (#6931)
* Improve Dynamic Range Compression - for some images with very high DR

* Clean code

* Improve TM fattal with saturation control in LA

* Saturation control fattal in LA

* Re-order paramsedit

* Change history_msg_tmo_satur with saturation
2024-02-02 07:42:34 +01:00
Lawrence37
f06e756c20 AWB non-raw file fixes (for 5.10) (#6940)
* Improve Itcwb with non-raw files

* Change pre-dev builds wbrefinement

* Change template in pre-dev

* Improvment improccordinator.cc

* Forgotten observer convert

* Reenable wbauto autogrey as 5.8

* Remove wrong code

* Missing getrgbloc references

* Fixed bug due to bias in queu with temperaure correlation issue 6911

* Simpleprocess queue compatibility tif-jpg

* Preserve AWB edits from 5.9

In 5.9 for non-raw files,
   1. RGB grey uses the unit multipliers with temperature bias applied.
   2. Temperature correlation uses the equivalent of temperature 5000,
      green 1, and red/blue equalizer 1.

* Refactor temperature correlation AWB code

* Fix inaccurate RGB grey WB preview after using ITC

The RGB grey automatic white balance algorithm caches the multipliers.
Temperature correlation automatic white balance also caches results to
the same location, but never uses it. This causes the RGB grey method to
produce incorrect results in the editor. Removing the temperature
correlation cache fixes the issue and does not have side-effects.

---------

Co-authored-by: U-PCSPECIALIST01\jdesm <jdesmis@gmail.com>
2024-02-01 22:41:56 -08:00
Desmis
e4087e2fa2 White balance auto temperature correlation - improve behavior with non raw files (#6903)
* Improve Itcwb with non-raw files

* Change pre-dev builds wbrefinement

* Change template in pre-dev

* Improvment improccordinator.cc

* Forgotten observer convert

* Reenable wbauto autogrey as 5.8

* Remove wrong code

* Missing getrgbloc references

* Fixed bug due to bias in queu with temperaure correlation issue 6911

* Simpleprocess queue compatibility tif-jpg

* Preserve AWB edits from 5.9

In 5.9 for non-raw files,
   1. RGB grey uses the unit multipliers with temperature bias applied.
   2. Temperature correlation uses the equivalent of temperature 5000,
      green 1, and red/blue equalizer 1.

* Refactor temperature correlation AWB code

* Fix inaccurate RGB grey WB preview after using ITC

The RGB grey automatic white balance algorithm caches the multipliers.
Temperature correlation automatic white balance also caches results to
the same location, but never uses it. This causes the RGB grey method to
produce incorrect results in the editor. Removing the temperature
correlation cache fixes the issue and does not have side-effects.

---------

Co-authored-by: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
2024-02-01 07:48:07 +01:00
Lawrence37
ba065dc13f Merge pull request #6920 from sgilbertson/issue-6915-queue-template-improvements
Queue template improvements
2024-01-28 11:43:07 -08:00
Lawrence37
4dd7517a55 Merge pull request #6873 from 0v3rt1r3d/0v3rt1r3d/fix-a-couple-of-warnings
Fix a couple of warnings
2024-01-27 21:46:14 -08:00
Lawrence37
5ffa0632f2 Merge pull request #6885 from Lawrence37/asan-mem-leak
Fixes for memory leaks and memcpy overlap found by AddressSanitizer
2024-01-25 21:02:50 -08:00
Scott Gilbertson
11a0a0b697 Fixes per pull request comments: fix %p-1 missing slash, use static_cast, fix int/unsigned mismatches 2024-01-16 07:54:12 -05:00
Scott Gilbertson
6cbc448f63 Handle Samba-style UNC prefix '//' in %p and %P queue output template specifiers 2024-01-15 17:13:40 -05:00
Scott Gilbertson
1df9b4869e Make %p and %P queue output template specifiers limit invalid range rather than treating that as an error.
For example in a 4-element path "first 5 elements" and "last 5 elements" now return all four elements.
2024-01-15 16:39:38 -05:00
Scott Gilbertson
a39e6779e4 Fix: If %p or %P queue template term includes start of file path, prepend the leading /, \ or \\ from the file path 2024-01-15 15:27:09 -05:00
Scott Gilbertson
343b5ecc68 Left-justify the queue destination preview label and allow it to scroll horizontally 2024-01-15 14:40:56 -05:00
Scott Gilbertson
b3bbaa6421 Code formatting: move ampersands next to types 2024-01-10 18:55:52 -05:00
Scott Gilbertson
9e310b7454 Minor changes per feedback in issue #6915 (mostly code formatting) 2024-01-10 18:47:14 -05:00
Scott Gilbertson
c918de3178 Reversed %p and %P processing cases for location templates, which were opposite to what the help says. 2024-01-07 11:49:19 -05:00
Scott Gilbertson
0127b68bdb Minor comment clarification 2024-01-07 11:14:52 -05:00
Scott Gilbertson
df41028468 On Windows, use backslashes in template-generated paths
(but continue to accept either / or \ in input strings, on any platform)
Also deleted an unused helper function.
2024-01-07 11:10:05 -05:00
Scott Gilbertson
f92e07e5cf Make destination path preview label selectable, so its contents can be copied to the clipboard 2024-01-07 10:52:01 -05:00
Scott Gilbertson
0f66d43272 Update destination preview whenever the save format changes. 2024-01-07 10:09:45 -05:00
Lawrence Lee
d13badbbe0 Implement DNG bad pixels constant for LibRaw
Works if the FixBadPixelsConstant is zero, as implemented for dcraw.
Other constant values may be implemented in the future.
2024-01-06 21:40:00 -08:00
Scott Gilbertson
21c53823ee Reimplemented %p template specifier to use new method, added %P specifier
The %P specifier includes directories from the start of the file path,
whereas the original %p specifier includes them from the end. In both
cases N is from the last directory in the path, and -N is from the
first directory in the path (N=1..9).
2024-01-06 18:21:59 -05:00
Scott Gilbertson
b8d3f90ca0 Reimplement template %dN specifier, making %d-N count from start of path, not end
Also made %pN selectively skip the next character only if it's a slash or backslash,
so for example %p2/a, %p2\a and %p2a produce the same result.
2024-01-06 18:01:56 -05:00
Scott Gilbertson
587e0c6782 Simplified BatchQueue::updateDestinationPathPreview after noticing that calcAutoFileNameBase handles all cases 2024-01-06 16:32:14 -05:00
Scott Gilbertson
380d964077 Add destination path preview label to batch queue panel.
Label initially says "Destination path for the first selected image appears here"
so the feature is discoverable. Select a file and it shows the destination path
that would be used if it is the first file to be processed and the file does
not already exist. Label is updated as the template is edited, so you can see the
effect of the edits. If "Save to folder" is selected, the previewed path uses
that folder.
2024-01-06 16:00:19 -05:00
Lawrence Lee
2b7889b645 Add option to disable LibRaw in preferences 2023-12-17 16:00:30 -08:00