71 Commits

Author SHA1 Message Date
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
fc78a64066 Move scale option from perspective correction to lens/geometry 2024-07-20 14:56:21 +02:00
Alexander Brock
28a5d36e9a Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-03-10 17:22:19 +01:00
Alexander Brock
e1a3fe0656 Change default scale to 1 2023-05-02 00:49:37 +02:00
Alexander Brock
79bef50a8e Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2023-03-29 13:20:28 +02:00
Alexander Brock
f9e2e934df Move de-fish to distortion 2023-03-22 00:19:26 +01:00
Pandagrapher
c28d5aab97 Merge with "Beep6581/dev" 2023-03-11 11:02:29 +01:00
abrock
37cc311a46
Remove ipers_rotate_left/right in constructor call of adjuster for camera_scale
Co-authored-by: Lawrence37 <45837045+Lawrence37@users.noreply.github.com>
2023-02-25 21:25:17 +01:00
Alexander Brock
e0b72af60e Style fix 2023-02-22 13:52:46 +01:00
Alexander Brock
2e66dc11a2 Style changes as requested 2023-02-22 10:52:42 +01:00
Alexander Brock
2a92257438 Add HISTORY_MSG_PERSP_CAM_SCALE to default language file 2023-02-19 23:40:58 +01:00
Alexander Brock
66698d515c Change detection of scale factor 2023-02-19 20:11:34 +01:00
Alexander Brock
f023a90170 Add camera_defish to PerspCorrection::read/write 2023-02-11 23:51:32 +01:00
Alexander Brock
fb90908cbd Add GUI elements for defish and scale in perspective tool. Doesn't work very good yet. 2023-02-11 20:31:08 +01:00
Lawrence Lee
143e5c6783
Merge branch 'dev' into favorites-gui 2023-01-02 15:37:07 -08:00
Pandagrapher
1c85926200 Creates an RTImage cache
Fixes:
- Fixes GUI issue on Windows (GDI handles limit reached)
- Fixes an incorrect icon name in Perspective tool
- Adds robustness RTScalable::loadSurfaceFromIcon function
2022-09-02 19:15:42 +02:00
Pandagrapher
2cd6ba96ca Merge with 'Beep6581/dev' 2022-08-27 11:49:02 +02:00
Lawrence37
0a55428205
Clean up missing language keys (#6556)
* Clean up some unused code

* Use grid for abstract profile primaries

* Remove blank line from default
2022-08-24 20:23:09 +02:00
Pandagrapher
89d2bdce5b Initial commit for real hidpi support
Note: This commit has only been tested on MacOS

Changes:
- Icons now use the native hidpi support from Gtk (through Icon Theme)
- Icons are now directly generated from scalable file (i.e. SVG file)
- Widget sizes are scaled based on DPI and scale factor
- Font size is scaled based on DPI and scale factor
2022-08-19 16:47:28 +02:00
Lawrence Lee
9c5ce0d9bb Fix focal len autofill after browser adjustments
Don't update the camera-based perspective focal length and crop factor
parameters when making other adjustments using the file browser or batch
editor.

Closes #6402
2022-01-08 12:02:25 -08:00
Lawrence Lee
40678f67b0 Refactor tool name code 2021-12-11 21:21:54 -08:00
Lawrence Lee
f17eb2b504 Merge branch 'dev' into perspective-ux 2021-05-31 11:53:50 -07:00
Lawrence Lee
e7e6dd1cb5 Clean up rtgui perspective.* and controllines.*
Change size_t to std::size_t, remove void from function parameters, use
constants to represent the minimum required number of control lines, and
change const auto & to const auto.
2021-05-31 11:20:01 -07:00
Lawrence Lee
2c1e6a8ca1 Make control lines buttons react to line counts
Set the "apply" and "delete all" button sensitivity based on the number
of control lines. Add extra tooltip text to the apply button when
editing and there is not enough lines. The text explains there must be
enough vertical or horizontal control lines.
2021-05-30 18:02:29 -07:00
Lawrence Lee
3ade11c970 Leave control lines in good state on commit
When exiting perspective control line editing mode while dragging a
control line, set the geometry and control line state to the appropriate
state corresponding to when lines are not being dragged.
2021-05-22 18:17:30 -07:00
Lawrence Lee
36f1300a6b Fix control line edit crash when undoing history
When perspective control line editing is active and the history entry is
changed such that edit mode is automatically disabled, there is a crash.
The history change triggers a processing parameters update and disables
editing. When editing is disabled, the perspective tool also tries to
update the processing parameters, causing a double mutex lock attempt.

This commit avoids updating parameters from the perspective tool and
uses the tweak operator (introduced with the spot removal tool) to achieve
the same effect.

Closes #6251.
2021-05-22 15:50:35 -07:00
Thanatomanic
fc031ccb5a
Remove deprecated GTK3 code, fixes #6103 (#6113)
Replaces the following deprecated Gtk classes throughout the codebase by their non-deprecated counterparts. Style, HBox, VBox, HPaned, VPaned, HScrollbar, VScrollbar, VSeparator, HSeparator, Stock, Table, VScale and HScale.
2021-02-17 11:44:25 +01:00
Lawrence Lee
1e73135d51 Add perspective edit button to toolbar
The perspective control lines edit mode no longer piggybacks on the hand
tool button on the toolbar.
2020-07-31 21:58:00 -07:00
Lawrence Lee
a56c1fbb07 Add tooltips to control lines buttons 2020-07-20 15:30:01 -07:00
Lawrence Lee
06caf40598 Move control lines code to new files 2020-07-12 15:19:10 -07:00
Lawrence Lee
cef97eefea Simplify tooltip for perspective control lines
Only show how to draw new lines and delete a single line. Move the
tooltip activation area to the label.
2020-07-12 11:36:14 -07:00
Lawrence Lee
4f8aa2db2b Add perspective control lines to history
Allows undoing and redoing of changes to the control lines.
2020-07-11 13:34:05 -07:00
Lawrence Lee
eb548f1aff Make control lines part of processing parameters 2020-07-09 11:43:23 -07:00
Lawrence Lee
7f647d188c Fix cppcheck warnings 2020-07-08 11:57:04 -07:00
Lawrence Lee
a7f397541a Make control line type automatically set
Perspective control line type is automatically set when first drawn. The
type is determined by the line's angle. Buttons for specifying which
line type to draw are removed.
2020-07-08 11:46:28 -07:00
Lawrence Lee
98678c1f48 Use smart pointers 2020-07-05 16:37:49 -07:00
Lawrence Lee
c2ea6b2ebc Merge from 'dev' 2020-06-25 21:58:02 -07:00
Lawrence Lee
1b06cb9999 Limit preview refreshing in control line edit mode
Previously, changing values in the camera-based perspective correction
tool while in control line edit mode resulted in the preview being
refreshed. This is unnecessary because all perspective transformations
are disabled in edit mode. This commit disables preview refreshing for
camera-based perspective adjustments in edit mode.
2020-06-24 17:06:21 -07:00
Lawrence Lee
d76cf5cdae Make control lines hidden when switching mode
The program now exits control line editing mode when the perspective
correction method is switched out of camera-based mode.
2020-06-24 16:20:03 -07:00
Lawrence Lee
8d7a5546e1 Add separators in camera-based persp correction
Horizontal lines to separate the sliders, control lines buttons, and
automatic buttons.
2020-06-23 22:33:08 -07:00
Lawrence Lee
afc3edae26 Make control line correction keep old values
Perspective correction through control lines will no longer modify any
parameters if there are not enough lines to do any correction.
2020-06-23 22:24:27 -07:00
Lawrence Lee
7b4504e34f Add pointer initializer to avoid segfaults
PerspCorrection::metadata was not initialized, which could cause a
segfault.
2020-06-12 10:49:11 -07:00
Lawrence Lee
6c59f0586f Fix minor memory leaks 2020-06-11 12:41:43 -07:00
Lawrence Lee
24681f324c Remove unneeded code 2020-06-10 16:53:33 -07:00
Lawrence Lee
72d390e99a Add button for deleting all control lines 2020-06-10 16:16:40 -07:00
Lawrence Lee
a120b304f1 Add tooltip for control lines 2020-06-10 13:13:18 -07:00
Lawrence Lee
976cf4c103 Make control lines buttons disabled in batch mode 2020-06-10 12:57:08 -07:00
Lawrence Lee
11459a8bb1 Add label for control lines buttons 2020-06-10 12:50:14 -07:00
Lawrence Lee
72b69b3249 Fix a few small control lines bugs 2020-06-10 12:35:53 -07:00
Lawrence Lee
dd4364fab3 Add buttons for switching control line type 2020-06-10 11:41:15 -07:00