Crop module gets orientation proxy support #17888
Open
+76
−27
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jenshannoschwalm
added
bugfix
|
Note: no support for the lighttable "actions on selections" button and not planned from my side. |
dterrahe
reviewed
Nov 25, 2024
dterrahe
reviewed
Nov 25, 2024
jenshannoschwalm
force-pushed
the
crop_orientation
branch
from
ecc457d
to
6f00a40
Compare
dterrahe
reviewed
Nov 26, 2024
We must call gui_changed() at the end of gui_update() to ensure a new history if parameters changed, UI symptoms possible were subtly wrong slider soft min/max. While checking some minor cleanup - g->cropping should be _grab_region_t instead of int and be initialized as that - deduplicate updating sliders in _update_sliders_and_limit()
dterrahe
reviewed
Nov 26, 2024
dterrahe
reviewed
Nov 26, 2024
jenshannoschwalm
force-pushed
the
crop_orientation
branch
from
2de7071
to
12e3a19
Compare
While developing an image in darkroom we might have set a cropping area, this commit
implements functionality to keep the cropped area if we change orientation via the
flip module.
Three parts in the codebase required additions without changing existing code.
1. `dt_develop_t` got two additions in cropping proxy,
`struct dt_iop_module_t *flip_handler` points to the crop module and is setup there.
We can't use `exposer` as the proxy because that is dynamically set in pixelpipe code
only if enabled and we want to change crop parameters even if crop is disabled.
`void (*flip_callback)` is the callback function changing crop parameters, defined in crop.
2. Orientation module uses the `flip_callback(self, orientation)` requesting changes in crop.
3. In crop we have `_crop_handle_flip()` as proxy `flip_callback` with proper logs about action.
- It gets the data from self `dt_iop_crop_params_t`,
- does the requested action,
- updates gui from parameters
- adds a new history stack entry (respecting the current `crop->enabled` status).
jenshannoschwalm
force-pushed
the
crop_orientation
branch
from
12e3a19
to
b1f0ad2
Compare
dterrahe
reviewed
Nov 27, 2024
| if(!p) return; | ||
|
|
||
| // we avoid action if default or fully symmetrical | ||
| const gboolean no_action = (p->cx == 1.f - p->ch) && (p->cy == 1.f - p->cw); |
There was a problem hiding this comment.
?
This is not testing for "full symmetry". ;-)
Also, some layouts that don't need adjustment under flipping do need to be rotated and vice versa. So if you want to do more than only avoid adjusting no-crops, you'll have to do a full before-after comparison, i.e.
const float ocx = p->cx, ocy = p->cy, ocw = p->cw, och = p->ch;
if(mode == ORIENTATION_FLIP_HORIZONTALLY) {p->cx = 1.f-ocw; p->cw = 1.f-ocx;}
else if(mode == ORIENTATION_FLIP_VERTICALLY) {p->cy = 1.f-och; p->ch = 1.f-ocy;}
else if(mode == ORIENTATION_ROTATE_CW_90_DEG) {p->cx = 1.f-och; p->ch = ocw; p->cw = 1.f-ocy; p->cy = ocx;}
else if(mode == ORIENTATION_ROTATE_CCW_90_DEG) {p->cx = ocy; p->cy = 1.f-ocw; p->cw = och; p->ch = 1.f-ocx;}
and skip the last two lines if all of p->cx vs ocx etc are sigma close enough (since these are calculated values, rather than constants like 0 or 1, you could get mismatches on 1/4 == 1 - 3/4 if someone types in 25% everywhere).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While developing an image in darkroom we might have set a cropping area, this commit implements functionality to keep the cropped area if we change orientation via the flip module.
Three parts in the codebase required additions without changing existing code so not expecting stability regressions.
dt_develop_tgot two additions in cropping proxy,struct dt_iop_module_t *flip_handlerpoints to the crop module and is setup there. We can't useexposeras the proxy because that is dynamically set in pixelpipe code only if enabled and we want to change crop parameters even if currently disabled.void (*flip_callback)is the callback function changing crop parameters, defined in crop.Orientation module uses the
flip_callback(self, orientation)requesting changes in crop.In crop we have
_crop_handle_flip()as proxyflip_callbackwith proper logs about action.dt_iop_crop_params_t,crop->enabledstatus.Finally worked on this, various pending issues:
Fixes #17631 #17498 #14788 #11614