This commit include : - cleanup rtgui/retinex.cc file (constructor only) and switched to Gtk::Grid (the new standard) instead of Gtk::Box. This however doesn't solve the issue of the Transmission curves in the Retinex tool, with wrong resize of the Frame when folding/unfolding the curves. - better alignment of the Histogram panel now with 4px of padding on the left and right side - Threshold selector now use the Scale's Trough style to draw its box and sliders - Curve's background are darker and restricted to the curve diagram - Diagonal and Flat curves has been converted to Gtk::Grid as well - A special color is now used for unsensitive Threshold selector and Sclaes widgets - Gap around the main Window has been removed on windows to circumvent a bug in Gtk3, but the window can now only be maximized (usual use case) or resized vertically by the top border only. - Buttons at the bottom of the Editor panel has now the same height
209 lines
5.1 KiB
C++
209 lines
5.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 <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include "mycurve.h"
|
|
#include "../rtengine/curves.h"
|
|
#include <cstring>
|
|
#include <gdkmm/types.h>
|
|
|
|
MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal(-1.f), listener(nullptr), cursor_type( CSArrow)
|
|
{
|
|
|
|
graphX = get_allocation().get_width() - RADIUS * 2;
|
|
graphY = get_allocation().get_height() - RADIUS * 2;
|
|
prevGraphW = graphW;
|
|
prevGraphH = graphH;
|
|
buttonPressed = false;
|
|
snapTo = ST_None;
|
|
leftBar = nullptr;
|
|
bottomBar = nullptr;
|
|
colorProvider = nullptr;
|
|
snapToElmt = -100;
|
|
curveIsDirty = true;
|
|
edited_point = -1;
|
|
|
|
add_events(Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK);
|
|
get_style_context()->add_class("drawingarea");
|
|
|
|
mcih = new MyCurveIdleHelper;
|
|
mcih->myCurve = this;
|
|
mcih->destroyed = false;
|
|
mcih->pending = 0;
|
|
}
|
|
|
|
MyCurve::~MyCurve ()
|
|
{
|
|
|
|
if (mcih->pending) {
|
|
mcih->destroyed = true;
|
|
} else {
|
|
delete mcih;
|
|
}
|
|
}
|
|
|
|
int MyCurve::calcDimensions ()
|
|
{
|
|
int newRequestedW, newRequestedH;
|
|
|
|
newRequestedW = newRequestedH = get_allocation().get_width();
|
|
|
|
if (leftBar && !bottomBar) {
|
|
newRequestedH -= CBAR_WIDTH + CBAR_MARGIN - RADIUS;
|
|
}
|
|
|
|
if (!leftBar && bottomBar) {
|
|
newRequestedH += CBAR_WIDTH + CBAR_MARGIN - RADIUS;
|
|
}
|
|
|
|
graphW = newRequestedW - RADIUS - (leftBar ? (CBAR_WIDTH + CBAR_MARGIN) : RADIUS);
|
|
graphH = newRequestedH - RADIUS - (bottomBar ? (CBAR_WIDTH + CBAR_MARGIN) : RADIUS);
|
|
graphX = newRequestedW - RADIUS - graphW;
|
|
graphY = RADIUS + graphH;
|
|
|
|
return newRequestedH;
|
|
}
|
|
|
|
Gtk::SizeRequestMode MyCurve::get_request_mode_vfunc () const
|
|
{
|
|
return Gtk::SIZE_REQUEST_HEIGHT_FOR_WIDTH;
|
|
}
|
|
|
|
void MyCurve::get_preferred_height_vfunc (int &minimum_height, int &natural_height) const
|
|
{
|
|
int minimumWidth = 0;
|
|
int naturalWidth = 0;
|
|
get_preferred_width_vfunc (minimumWidth, naturalWidth);
|
|
get_preferred_height_for_width_vfunc (minimumWidth, minimum_height, natural_height);
|
|
}
|
|
|
|
void MyCurve::get_preferred_width_vfunc (int &minimum_width, int &natural_width) const
|
|
{
|
|
natural_width = minimum_width = GRAPH_SIZE + 2 * RADIUS;
|
|
}
|
|
|
|
void MyCurve::get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const
|
|
{
|
|
minimum_height = width;
|
|
|
|
if (leftBar && !bottomBar) {
|
|
minimum_height -= CBAR_WIDTH + CBAR_MARGIN - RADIUS;
|
|
}
|
|
|
|
if (!leftBar && bottomBar) {
|
|
minimum_height += CBAR_WIDTH + CBAR_MARGIN - RADIUS;
|
|
}
|
|
|
|
/*
|
|
graphW = width - RADIUS - (leftBar ? (CBAR_WIDTH+CBAR_MARGIN) : RADIUS);
|
|
graphH = minimum_height - RADIUS - (bottomBar ? (CBAR_WIDTH+CBAR_MARGIN) : RADIUS);
|
|
graphX = width - RADIUS - graphW;
|
|
graphY = RADIUS + graphH;
|
|
*/
|
|
|
|
natural_height = minimum_height;
|
|
}
|
|
|
|
void MyCurve::get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const
|
|
{
|
|
get_preferred_width_vfunc (minimum_width, natural_width);
|
|
}
|
|
|
|
void MyCurve::setColoredBar (ColoredBar *left, ColoredBar *bottom)
|
|
{
|
|
leftBar = left;
|
|
bottomBar = bottom;
|
|
}
|
|
|
|
void MyCurve::notifyListener ()
|
|
{
|
|
|
|
if (listener) {
|
|
listener->curveChanged ();
|
|
}
|
|
}
|
|
|
|
bool MyCurve::snapCoordinateX(double testedVal, double realVal)
|
|
{
|
|
|
|
double dist = realVal - testedVal;
|
|
|
|
if (dist < 0.) {
|
|
dist = -dist;
|
|
}
|
|
|
|
if (dist < snapToMinDistX) {
|
|
snapToMinDistX = dist;
|
|
snapToValX = testedVal;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool MyCurve::snapCoordinateY(double testedVal, double realVal)
|
|
{
|
|
|
|
double dist = realVal - testedVal;
|
|
|
|
if (dist < 0.) {
|
|
dist = -dist;
|
|
}
|
|
|
|
if (dist < snapToMinDistY) {
|
|
snapToMinDistY = dist;
|
|
snapToValY = testedVal;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
float MyCurve::getVal(LUTf &curve, int x)
|
|
{
|
|
if ((graphW - 2) == curve.getSize()) {
|
|
return curve[x];
|
|
} else {
|
|
return curve.getVal01(float(x) / (graphW - 3));
|
|
}
|
|
}
|
|
|
|
void MyCurve::on_style_updated ()
|
|
{
|
|
setDirty(true);
|
|
queue_draw ();
|
|
}
|
|
|
|
void MyCurve::refresh()
|
|
{
|
|
if (leftBar != nullptr) {
|
|
leftBar->setDirty(true);
|
|
}
|
|
|
|
if (bottomBar != nullptr) {
|
|
bottomBar->setDirty(true);
|
|
}
|
|
|
|
setDirty(true);
|
|
|
|
Glib::RefPtr<Gdk::Window> win = get_window();
|
|
|
|
if (win) {
|
|
win->invalidate(true);
|
|
}
|
|
}
|