liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch framing tool events to use event mapper

Browse Source 
* Removed hard coded events from ProcEventCode and RefreshMap
* Change HISTORY_MSG_* to HISTORY_MSG_FRAMING_*
This commit is contained in:
Daniel Gao 2024-11-30 15:03:14 -05:00
parent d3962c7e56
commit a54aacca3f
5 changed files with 70 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rtdata/languages/default
View File

@ -1380,24 +1380,6 @@ HISTORY_MSG_1147;Local - Jz BlackEv WhiteEv
HISTORY_MSG_1148;Local - Jz Sigmoid
HISTORY_MSG_1149;Local - Q Sigmoid
HISTORY_MSG_1150;Local - Log encoding Q instead Sigmoid Q
HISTORY_MSG_1151;Framing
HISTORY_MSG_1152;Framing - Method
HISTORY_MSG_1153;Framing - Aspect Ratio
HISTORY_MSG_1154;Framing - Orientation
HISTORY_MSG_1155;Framing - Framed Width
HISTORY_MSG_1156;Framing - Framed Height
HISTORY_MSG_1157;Framing - Upscaling
HISTORY_MSG_1158;Framing - Border Sizing Method
HISTORY_MSG_1159;Framing - Basis
HISTORY_MSG_1160;Framing - Relative Size
HISTORY_MSG_1161;Framing - Min Size
HISTORY_MSG_1162;Framing - Min Width
HISTORY_MSG_1163;Framing - Min Height
HISTORY_MSG_1164;Framing - Border Width
HISTORY_MSG_1165;Framing - Border Height
HISTORY_MSG_1166;Framing - Border (R)
HISTORY_MSG_1167;Framing - Border (G)
HISTORY_MSG_1168;Framing - Border (B)
HISTORY_MSG_BLSHAPE;Blur by level
HISTORY_MSG_BLURCWAV;Blur chroma
HISTORY_MSG_BLURWAV;Blur luminance
@ -1451,6 +1433,24 @@ HISTORY_MSG_FILMNEGATIVE_COLORSPACE;Film negative color space
HISTORY_MSG_FILMNEGATIVE_ENABLED;Film Negative
HISTORY_MSG_FILMNEGATIVE_REF_SPOT;FN - Reference input
HISTORY_MSG_FILMNEGATIVE_VALUES;Film negative values
HISTORY_MSG_FRAMING_ABSOLUTE_HEIGHT;Framing - Border Height
HISTORY_MSG_FRAMING_ABSOLUTE_WIDTH;Framing - Border Width
HISTORY_MSG_FRAMING_ALLOW_UPSCALING;Framing - Upscaling
HISTORY_MSG_FRAMING_ASPECT_RATIO;Framing - Aspect Ratio
HISTORY_MSG_FRAMING_BASIS;Framing - Basis
HISTORY_MSG_FRAMING_BORDER_BLUE;Framing - Border (B)
HISTORY_MSG_FRAMING_BORDER_GREEN;Framing - Border (G)
HISTORY_MSG_FRAMING_BORDER_RED;Framing - Border (R)
HISTORY_MSG_FRAMING_BORDER_SIZE;Framing - Relative Size
HISTORY_MSG_FRAMING_BORDER_SIZE_METHOD;Framing - Border Sizing Method
HISTORY_MSG_FRAMING_ENABLED;Framing
HISTORY_MSG_FRAMING_FRAMED_HEIGHT;Framing - Framed Height
HISTORY_MSG_FRAMING_FRAMED_WIDTH;Framing - Framed Width
HISTORY_MSG_FRAMING_METHOD;Framing - Method
HISTORY_MSG_FRAMING_MIN_HEIGHT;Framing - Min Height
HISTORY_MSG_FRAMING_MIN_SIZE_ENABLED;Framing - Min Size
HISTORY_MSG_FRAMING_MIN_WIDTH;Framing - Min Width
HISTORY_MSG_FRAMING_ORIENTATION;Framing - Orientation
HISTORY_MSG_GAMUTMUNSEL;Gamut-Munsell
HISTORY_MSG_HISTMATCHING;Auto-matched tone curve
HISTORY_MSG_HLBL;Color propagation - blur

19
rtengine/procevents.h
View File

@ -1177,25 +1177,6 @@ enum ProcEventCode {
Evlocallabsigjz = 1147,
Evlocallabsigq = 1148,
Evlocallablogcie = 1149,
EvFramingEnabled = 1150,
EvFramingMethod = 1151,
EvFramingAspectRatio = 1152,
EvFramingOrientation = 1153,
EvFramingFramedWidth = 1154,
EvFramingFramedHeight = 1155,
EvFramingAllowUpscaling = 1156,
EvFramingBorderSizingMethod = 1157,
EvFramingBasis = 1158,
EvFramingRelativeBorderSize = 1159,
EvFramingMinSizeEnabled = 1160,
EvFramingMinWidth = 1161,
EvFramingMinHeight = 1162,
EvFramingAbsWidth = 1163,
EvFramingAbsHeight = 1164,
EvFramingBorderRed = 1165,
EvFramingBorderGreen = 1166,
EvFramingBorderBlue = 1167,
NUMOFEVENTS
};

20
rtengine/refreshmap.cc
View File

@ -1185,25 +1185,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
AUTOEXP, //Evlocallabforcebw
AUTOEXP, //Evlocallabsigjz
AUTOEXP, //Evlocallabsigq
AUTOEXP, //Evlocallablogcie
RESIZE, // EvFramingEnabled
RESIZE, // EvFramingFramingMethod
RESIZE, // EvFramingAspectRatio
RESIZE, // EvFramingOrientation
RESIZE, // EvFramingFramedWidth
RESIZE, // EvFramingFramedHeight
RESIZE, // EvFramingAllowUpscaling
RESIZE, // EvFramingBorderSizingMethod
RESIZE, // EvFramingBasis
RESIZE, // EvFramingRelativeBorderSize
RESIZE, // EvFramingMinSizeEnabled
RESIZE, // EvFramingMinWidth
RESIZE, // EvFramingMinHeight
RESIZE, // EvFramingAbsWidth
RESIZE, // EvFramingAbsHeight
RESIZE, // EvFramingBorderRed
RESIZE, // EvFramingBorderGreen
RESIZE // EvFramingBorderBlue
AUTOEXP //Evlocallablogcie
};

28
rtgui/framing.cc
View File

@ -23,6 +23,7 @@
#include "aspectratios.h"
#include "colorpreview.h"
#include "eventmapper.h"
#include "paramsedited.h"
#include "resize.h"
@ -312,6 +313,7 @@ Framing::Framing() :
lastAllowUpscaling(false),
lastMinSizeEnabled(false)
{
setupEvents();
setupFramingMethodGui();
pack_start(*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)));
setupBorderSizeGui();
@ -323,6 +325,32 @@ Framing::~Framing() {
idleRegister.destroy();
}
void Framing::setupEvents()
{
auto m = ProcEventMapper::getInstance();
// clang-format off
EvFramingEnabled = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_ENABLED");
EvFramingMethod = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_METHOD");
EvFramingAspectRatio = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_ASPECT_RATIO");
EvFramingOrientation = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_ORIENTATION");
EvFramingFramedWidth = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_FRAMED_WIDTH");
EvFramingFramedHeight = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_FRAMED_HEIGHT");
EvFramingAllowUpscaling = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_ALLOW_UPSCALING");
EvFramingBorderSizingMethod = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_BORDER_SIZE_METHOD");
EvFramingBasis = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_BASIS");
EvFramingRelativeBorderSize = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_BORDER_SIZE");
EvFramingMinSizeEnabled = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_MIN_SIZE_ENABLED");
EvFramingMinWidth = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_MIN_WIDTH");
EvFramingMinHeight = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_MIN_HEIGHT");
EvFramingAbsWidth = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_ABSOLUTE_WIDTH");
EvFramingAbsHeight = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_ABSOLUTE_HEIGHT");
EvFramingBorderRed = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_BORDER_RED");
EvFramingBorderGreen = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_BORDER_GREEN");
EvFramingBorderBlue = m->newEvent(RESIZE, "HISTORY_MSG_FRAMING_BORDER_BLUE");
// clang-format on
}
void Framing::setupFramingMethodGui()
{
Gtk::Grid* combos = Gtk::manage(new Gtk::Grid());

23
rtgui/framing.h
View File

@ -25,6 +25,8 @@
#include "guiutils.h"
#include "toolpanel.h"
#include "../rtengine/procevents.h"
#include <memory>
class ColorPreview;
@ -96,6 +98,7 @@ private:
bool isDirty;
};
void setupEvents();
void setupFramingMethodGui();
void setupBorderSizeGui();
void setupBorderColorsGui();
@ -146,6 +149,26 @@ private:
Adjuster* blueAdj;
ColorPreview* colorPreview;
// Events
rtengine::ProcEvent EvFramingEnabled;
rtengine::ProcEvent EvFramingMethod;
rtengine::ProcEvent EvFramingAspectRatio;
rtengine::ProcEvent EvFramingOrientation;
rtengine::ProcEvent EvFramingFramedWidth;
rtengine::ProcEvent EvFramingFramedHeight;
rtengine::ProcEvent EvFramingAllowUpscaling;
rtengine::ProcEvent EvFramingBorderSizingMethod;
rtengine::ProcEvent EvFramingBasis;
rtengine::ProcEvent EvFramingRelativeBorderSize;
rtengine::ProcEvent EvFramingMinSizeEnabled;
rtengine::ProcEvent EvFramingMinWidth;
rtengine::ProcEvent EvFramingMinHeight;
rtengine::ProcEvent EvFramingAbsWidth;
rtengine::ProcEvent EvFramingAbsHeight;
rtengine::ProcEvent EvFramingBorderRed;
rtengine::ProcEvent EvFramingBorderGreen;
rtengine::ProcEvent EvFramingBorderBlue;
IdleRegister idleRegister;
std::unique_ptr<AspectRatios> aspectRatioData;