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
Download Patch File Download Diff File Expand all files Collapse all files

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;