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

Improve mask preview and avoid reprocessing when switching spot

Browse Source 
Changes:
- Mask preview has been improved. It only applies on detailed image now
("dcrop" pipeline) which corrects unexpected behavior on navigator
image. Mask preview now only applies on selected spot: when switching
between spots, mask preview is deactivated on newly selected spot.
- Image reprocessing is now avoided when switching between spots (except
if mask preview was previously activated). Mask background update
remains functionnal.

Bugfixe:
- AStyle runned on several modified files
This commit is contained in:
Pandagrapher
2019-08-21 13:40:28 +02:00
parent 53eeffbebf
commit 2080f65197
13 changed files with 273 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtgui/locallabtools.h
View File

@@ -21,10 +21,8 @@
#ifndef _LOCALLABTOOLS_H_
#define _LOCALLABTOOLS_H_
#include "toolpanel.h"
#include "curveeditorgroup.h"
#include "curveeditor.h"
#include "../rtengine/rtengine.h"
#include "labgrid.h"
#include "thresholdadjuster.h"
@@ -45,8 +43,7 @@ class LocallabTool:
public ToolPanel,
public CurveListener,
public ColorProvider,
public AdjusterListener,
public rtengine::LocallabListener
public AdjusterListener
{
protected:
// Enumeration to manage mask type
@@ -129,10 +126,11 @@ public:
bool isLocallabToolAdded();
// Mask background management function
void refChanged(double huer, double lumar, double chromar);
void refChanged(const double huer, const double lumar, const double chromar);
// Mask preview reset function
// Mask preview functions
void resetMaskView();
virtual void getMaskView(int &colorMask, int &expMask, int &shMask, int &softMask, int &tmMask, int &retiMask, int &cbMask) {};
/* To be completed
Notes:
@@ -203,6 +201,8 @@ public:
void setListener(ToolPanelListener* tpl);
void getMaskView(int &colorMask, int &expMask, int &shMask, int &softMask, int &tmMask, int &retiMask, int &cbMask);
void colorForValue(double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);
void disableListener();
@@ -259,6 +259,8 @@ public:
LocallabExposure();
~LocallabExposure();
void getMaskView(int &colorMask, int &expMask, int &shMask, int &softMask, int &tmMask, int &retiMask, int &cbMask);
void disableListener();
void enableListener();
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
@@ -300,6 +302,8 @@ private:
public:
LocallabShadow();
void getMaskView(int &colorMask, int &expMask, int &shMask, int &softMask, int &tmMask, int &retiMask, int &cbMask);
void disableListener();
void enableListener();
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
@@ -383,6 +387,8 @@ private:
public:
LocallabSoft();
void getMaskView(int &colorMask, int &expMask, int &shMask, int &softMask, int &tmMask, int &retiMask, int &cbMask);
void disableListener();
void enableListener();
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
@@ -452,6 +458,8 @@ private:
public:
LocallabTone();
void getMaskView(int &colorMask, int &expMask, int &shMask, int &softMask, int &tmMask, int &retiMask, int &cbMask);
void disableListener();
void enableListener();
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
@@ -498,6 +506,8 @@ public:
LocallabRetinex();
~LocallabRetinex();
void getMaskView(int &colorMask, int &expMask, int &shMask, int &softMask, int &tmMask, int &retiMask, int &cbMask);
void disableListener();
void enableListener();
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
@@ -617,6 +627,8 @@ private:
public:
LocallabCBDL();
void getMaskView(int &colorMask, int &expMask, int &shMask, int &softMask, int &tmMask, int &retiMask, int &cbMask);
void disableListener();
void enableListener();
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);