f9a8875bb5
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.
59 lines
2.1 KiB
C++
59 lines
2.1 KiB
C++
/*
|
|
* This file is part of RawTherapee.
|
|
*
|
|
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
|
|
*
|
|
* RawTherapee is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* RawTherapee is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
#pragma once
|
|
|
|
#include <gtkmm.h>
|
|
|
|
#include "adjuster.h"
|
|
#include "toolpanel.h"
|
|
|
|
class PerspCorrection final :
|
|
public ToolParamBlock,
|
|
public AdjusterListener,
|
|
public FoldableToolPanel
|
|
{
|
|
|
|
protected:
|
|
Adjuster* horiz;
|
|
Adjuster* vert;
|
|
Adjuster* camera_crop_factor;
|
|
Adjuster* camera_focal_length;
|
|
Adjuster* camera_shift_horiz;
|
|
Adjuster* camera_shift_vert;
|
|
Adjuster* projection_pitch;
|
|
Adjuster* projection_rotate;
|
|
Adjuster* projection_scale;
|
|
Adjuster* projection_shift_horiz;
|
|
Adjuster* projection_shift_vert;
|
|
Adjuster* projection_yaw;
|
|
|
|
public:
|
|
|
|
PerspCorrection ();
|
|
|
|
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
|
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
|
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
|
void setBatchMode (bool batchMode) override;
|
|
|
|
void adjusterChanged (Adjuster* a, double newval) override;
|
|
void setAdjusterBehavior (bool badd, bool camera_focal_length_add, bool camera_shift_add, bool projection_angle_add, bool projection_shift_add, bool projection_rotate_add, bool projection_scale_add);
|
|
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
|
};
|