Make history message key names more descriptive

Use keys that are more descriptive than "HISTORY_MSG_###".
This commit is contained in:
Lawrence Lee
2020-05-04 18:15:27 -07:00
parent fb5094b6f9
commit 852b3270e1
5 changed files with 24 additions and 22 deletions

View File

@@ -728,13 +728,6 @@ HISTORY_MSG_491;White Balance
HISTORY_MSG_492;RGB Curves HISTORY_MSG_492;RGB Curves
HISTORY_MSG_493;L*a*b* Adjustments HISTORY_MSG_493;L*a*b* Adjustments
HISTORY_MSG_494;Capture Sharpening HISTORY_MSG_494;Capture Sharpening
HISTORY_MSG_496;Perspective - Camera
HISTORY_MSG_497;Perspective - Camera
HISTORY_MSG_498;Perspective - Recovery
HISTORY_MSG_499;Perspective - PCA - Rotation
HISTORY_MSG_500;Perspective - PCA
HISTORY_MSG_501;Perspective - Camera
HISTORY_MSG_502;Perspective - Method
HISTORY_MSG_CAT02PRESET;Cat02 automatic preset HISTORY_MSG_CAT02PRESET;Cat02 automatic preset
HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
@@ -783,6 +776,13 @@ HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
HISTORY_MSG_PERSP_CAM_ANGLE;Perspective - Camera
HISTORY_MSG_PERSP_CAM_FL;Perspective - Camera
HISTORY_MSG_PERSP_CAM_SHIFT;Perspective - Camera
HISTORY_MSG_PERSP_METHOD;Perspective - Method
HISTORY_MSG_PERSP_PROJ_ANGLE;Perspective - Recovery
HISTORY_MSG_PERSP_PROJ_ROTATE;Perspective - PCA rotation
HISTORY_MSG_PERSP_PROJ_SHIFT;Perspective - PCA
HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter

View File

@@ -518,13 +518,6 @@ enum ProcEventCode {
EvLEnabled = 492, EvLEnabled = 492,
EvPdShrEnabled = 493, EvPdShrEnabled = 493,
EvPdShrMaskToggled = 494, EvPdShrMaskToggled = 494,
EvPerspCamFocalLength = 495,
EvPerspCamShift = 496,
EvPerspProjAngle = 497,
EvPerspProjRotate = 498,
EvPerspProjShift = 499,
EvPerspCamAngle = 500,
EvPerspMethod = 501,
NUMOFEVENTS NUMOFEVENTS

View File

@@ -521,14 +521,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
RGBCURVE, // EvRGBEnabled RGBCURVE, // EvRGBEnabled
LUMINANCECURVE, // EvLEnabled LUMINANCECURVE, // EvLEnabled
DEMOSAIC, // EvPdShrEnabled DEMOSAIC, // EvPdShrEnabled
CAPTURESHARPEN, // EvPdShrMaskToggled CAPTURESHARPEN // EvPdShrMaskToggled
TRANSFORM, // EvPerspCamFocalLength
TRANSFORM, // EvPerspCamShift
TRANSFORM, // EvPerspProjAngle
TRANSFORM, // EvPerspProjRotate
TRANSFORM, // EvPerspProjShift
TRANSFORM, // EvPerspCamAngle
TRANSFORM // EvPerspMethod
}; };

View File

@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "eventmapper.h"
#include "perspective.h" #include "perspective.h"
#include "rtimage.h" #include "rtimage.h"
@@ -28,6 +29,14 @@ using namespace rtengine::procparams;
PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("TP_PERSPECTIVE_LABEL")) PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("TP_PERSPECTIVE_LABEL"))
{ {
auto mapper = ProcEventMapper::getInstance();
EvPerspCamAngle = mapper->newEvent(TRANSFORM, "HISTORY_MSG_PERSP_CAM_ANGLE");
EvPerspCamFocalLength = mapper->newEvent(TRANSFORM, "HISTORY_MSG_PERSP_CAM_FL");
EvPerspCamShift = mapper->newEvent(TRANSFORM, "HISTORY_MSG_PERSP_CAM_SHIFT");
EvPerspMethod = mapper->newEvent(TRANSFORM, "HISTORY_MSG_PERSP_METHOD");
EvPerspProjAngle = mapper->newEvent(TRANSFORM, "HISTORY_MSG_PERSP_PROJ_ANGLE");
EvPerspProjRotate = mapper->newEvent(TRANSFORM, "HISTORY_MSG_PERSP_PROJ_ROTATE");
EvPerspProjShift = mapper->newEvent(TRANSFORM, "HISTORY_MSG_PERSP_PROJ_SHIFT");
lens_geom_listener = nullptr; lens_geom_listener = nullptr;
Gtk::Image* ipersHL = Gtk::manage (new RTImage ("perspective-horizontal-left-small.png")); Gtk::Image* ipersHL = Gtk::manage (new RTImage ("perspective-horizontal-left-small.png"));

View File

@@ -51,6 +51,13 @@ protected:
Adjuster* projection_shift_horiz; Adjuster* projection_shift_horiz;
Adjuster* projection_shift_vert; Adjuster* projection_shift_vert;
Adjuster* projection_yaw; Adjuster* projection_yaw;
rtengine::ProcEvent EvPerspCamFocalLength;
rtengine::ProcEvent EvPerspCamShift;
rtengine::ProcEvent EvPerspCamAngle;
rtengine::ProcEvent EvPerspMethod;
rtengine::ProcEvent EvPerspProjShift;
rtengine::ProcEvent EvPerspProjRotate;
rtengine::ProcEvent EvPerspProjAngle;
LensGeomListener* lens_geom_listener; LensGeomListener* lens_geom_listener;
const rtengine::FramesMetaData* metadata; const rtengine::FramesMetaData* metadata;