Changes to black compression and saturation controls. Black compression from 0-50 acts the same as 0-100 on the previous version, compressing dark tones without crushing blacks. 50-100 then starts crushing blacks until by 100 on the slider, all tones up to the set black point are sent to zero. In the new saturation control, negative values of the slider set a linear curve rather than an inverted S curve, and smoothly decrease saturation to zero across the board.
This commit is contained in:
Emil Martinec
419
rtgui/imagearea.cc
Normal file
419
rtgui/imagearea.cc
Normal file
@@ -0,0 +1,419 @@
|
||||
/*
|
||||
* 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 <imagearea.h>
|
||||
#include <time.h>
|
||||
#include <math.h>
|
||||
#include <options.h>
|
||||
#include <multilangmgr.h>
|
||||
#include <iomanip>
|
||||
#include <cropwindow.h>
|
||||
|
||||
ImageArea::ImageArea (ImageAreaPanel* p) : parent(p) {
|
||||
|
||||
infotext = "";
|
||||
cropgl = NULL;
|
||||
pmlistener = NULL;
|
||||
focusGrabber = NULL;
|
||||
mainCropWindow = NULL;
|
||||
previewHandler = NULL;
|
||||
lastClosedX = -1;
|
||||
showClippedH = false;
|
||||
showClippedS = false;
|
||||
listener = NULL;
|
||||
|
||||
zoomPanel = Gtk::manage (new ZoomPanel (this));
|
||||
indClippedPanel = Gtk::manage (new IndicateClippedPanel (this));
|
||||
|
||||
signal_style_changed().connect( sigc::mem_fun(*this, &ImageArea::styleChanged) );
|
||||
signal_size_allocate().connect( sigc::mem_fun(*this, &ImageArea::on_resized) );
|
||||
|
||||
dirty = false;
|
||||
ipc = NULL;
|
||||
}
|
||||
|
||||
void ImageArea::on_realize()
|
||||
{
|
||||
Gtk::DrawingArea::on_realize();
|
||||
|
||||
add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::SCROLL_MASK);
|
||||
|
||||
Cairo::FontOptions cfo;
|
||||
cfo.set_antialias (Cairo::ANTIALIAS_SUBPIXEL);
|
||||
get_pango_context ()->set_cairo_font_options (cfo);
|
||||
}
|
||||
|
||||
void ImageArea::on_resized (Gtk::Allocation& req) {
|
||||
|
||||
if (ipc && !mainCropWindow) {
|
||||
mainCropWindow = new CropWindow (this, ipc);
|
||||
mainCropWindow->setDecorated (false);
|
||||
mainCropWindow->setFitZoomEnabled (true);
|
||||
mainCropWindow->setPosition (0, 0);
|
||||
mainCropWindow->setSize (get_width(), get_height());
|
||||
mainCropWindow->addCropWindowListener (this);
|
||||
mainCropWindow->setCropGUIListener (cropgl);
|
||||
mainCropWindow->setPointerMotionListener (pmlistener);
|
||||
}
|
||||
else if (ipc) {
|
||||
mainCropWindow->setSize (get_width(), get_height());
|
||||
}
|
||||
}
|
||||
|
||||
void ImageArea::setImProcCoordinator (rtengine::StagedImageProcessor* ipc_) {
|
||||
|
||||
ipc = ipc_;
|
||||
}
|
||||
|
||||
void ImageArea::setPreviewHandler (PreviewHandler* ph) {
|
||||
|
||||
previewHandler = ph;
|
||||
}
|
||||
|
||||
|
||||
ImageArea::~ImageArea () {
|
||||
|
||||
for (std::list<CropWindow*>::iterator i=cropWins.begin(); i!=cropWins.end(); i++)
|
||||
delete *i;
|
||||
cropWins.clear ();
|
||||
|
||||
if (mainCropWindow)
|
||||
delete mainCropWindow;
|
||||
}
|
||||
|
||||
void ImageArea::styleChanged (const Glib::RefPtr<Gtk::Style>& style) {
|
||||
|
||||
// TODO: notify all crop windows that the style has been changed
|
||||
queue_draw ();
|
||||
}
|
||||
|
||||
void ImageArea::setInfoText (Glib::ustring text) {
|
||||
|
||||
infotext = text;
|
||||
|
||||
Glib::RefPtr<Pango::Context> context = get_pango_context () ;
|
||||
Pango::FontDescription fontd = context->get_font_description ();
|
||||
fontd.set_weight (Pango::WEIGHT_BOLD);
|
||||
fontd.set_size (12*Pango::SCALE);
|
||||
context->set_font_description (fontd);
|
||||
ilayout = create_pango_layout("");
|
||||
ilayout->set_markup(text);
|
||||
int iw, ih;
|
||||
ilayout->get_pixel_size (iw, ih);
|
||||
ipixbuf = Gdk::Pixbuf::create (Gdk::COLORSPACE_RGB, true, 8, iw+8, ih+8);
|
||||
ipixbuf->fill (128);
|
||||
}
|
||||
|
||||
void ImageArea::infoEnabled (bool e) {
|
||||
|
||||
if (options.showInfo!=e) {
|
||||
options.showInfo = e;
|
||||
queue_draw ();
|
||||
}
|
||||
}
|
||||
|
||||
CropWindow* ImageArea::getCropWindow (int x, int y) {
|
||||
|
||||
CropWindow* cw = mainCropWindow;
|
||||
for (std::list<CropWindow*>::iterator i=cropWins.begin(); i!=cropWins.end(); i++)
|
||||
if ((*i)->isInside (x, y))
|
||||
return *i;
|
||||
return cw;
|
||||
}
|
||||
|
||||
bool ImageArea::on_expose_event(GdkEventExpose* event) {
|
||||
dirty = false;
|
||||
|
||||
if (event->count)
|
||||
return true;
|
||||
|
||||
Glib::RefPtr<Gdk::Window> window = get_window();
|
||||
Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context();
|
||||
|
||||
if (mainCropWindow)
|
||||
mainCropWindow->expose (cr);
|
||||
|
||||
if (options.showInfo==true && infotext!="") {
|
||||
int fnw, fnh;
|
||||
ilayout->get_pixel_size (fnw, fnh);
|
||||
window->draw_pixbuf (get_style()->get_base_gc (Gtk::STATE_NORMAL), ipixbuf, 0, 0, 4, 4, fnw+8, fnh+8, Gdk::RGB_DITHER_NONE, 0, 0);
|
||||
cr->set_source_rgb (1.0, 1.0, 1.0);
|
||||
cr->move_to (8, 8);
|
||||
ilayout->add_to_cairo_context (cr);
|
||||
cr->fill ();
|
||||
}
|
||||
|
||||
for (std::list<CropWindow*>::reverse_iterator i=cropWins.rbegin(); i!=cropWins.rend(); i++)
|
||||
(*i)->expose (cr);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
bool ImageArea::on_motion_notify_event (GdkEventMotion* event) {
|
||||
|
||||
if (focusGrabber)
|
||||
focusGrabber->pointerMoved (event->x, event->y);
|
||||
else {
|
||||
CropWindow* cw = getCropWindow (event->x, event->y);
|
||||
if (cw)
|
||||
cw->pointerMoved (event->x, event->y);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ImageArea::on_button_press_event (GdkEventButton* event) {
|
||||
|
||||
if (focusGrabber)
|
||||
focusGrabber->buttonPress (event->button, event->type, event->state, event->x, event->y);
|
||||
else {
|
||||
CropWindow* cw = getCropWindow (event->x, event->y);
|
||||
if (cw)
|
||||
cw->buttonPress (event->button, event->type, event->state, event->x, event->y);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ImageArea::on_scroll_event (GdkEventScroll* event) {
|
||||
|
||||
CropWindow* cw = getCropWindow (event->x, event->y);
|
||||
if (cw) {
|
||||
if (event->direction==GDK_SCROLL_UP)
|
||||
cw->zoomIn ();
|
||||
else
|
||||
cw->zoomOut ();
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ImageArea::on_button_release_event (GdkEventButton* event) {
|
||||
|
||||
if (focusGrabber)
|
||||
focusGrabber->buttonRelease (event->button, event->type, event->state, event->x, event->y);
|
||||
else {
|
||||
CropWindow* cw = getCropWindow (event->x, event->y);
|
||||
if (cw) {
|
||||
cw->buttonRelease (event->button, event->type, event->state, event->x, event->y);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void ImageArea::grabFocus (CropWindow* cw) {
|
||||
|
||||
focusGrabber = cw;
|
||||
if (cw && cw!=mainCropWindow)
|
||||
cropWindowSelected (cw);
|
||||
}
|
||||
|
||||
void ImageArea::unGrabFocus () {
|
||||
|
||||
focusGrabber = NULL;
|
||||
}
|
||||
|
||||
void ImageArea::addCropWindow () {
|
||||
|
||||
CropWindow* cw = new CropWindow (this, ipc);
|
||||
cw->setCropGUIListener (cropgl);
|
||||
cw->setPointerMotionListener (pmlistener);
|
||||
cropWins.push_front (cw);
|
||||
|
||||
if (lastClosedX<0) {
|
||||
int K = 2;
|
||||
int hBorder = get_width()/K/8;
|
||||
int vBorder = get_height()/K/8;
|
||||
int N = cropWins.size()-1;
|
||||
int layer = N/K/K;
|
||||
int row = K-1 - (N % (K*K)) / K;
|
||||
int col = K-1 - (N % (K*K)) % K;
|
||||
|
||||
cw->setSize (get_width()/K - hBorder, get_height()/K - vBorder);
|
||||
cw->setPosition (col*get_width()/K + hBorder/2 + layer*30, row*get_height()/K + vBorder/2 + layer*30);
|
||||
}
|
||||
else {
|
||||
cw->setSize (lastClosedX, lastClosedY);
|
||||
cw->setPosition (lastClosedW, lastClosedH);
|
||||
}
|
||||
|
||||
mainCropWindow->setObservedCropWin (cropWins.front());
|
||||
queue_draw ();
|
||||
}
|
||||
|
||||
|
||||
void ImageArea::cropWindowSelected (CropWindow* cw) {
|
||||
|
||||
std::list<CropWindow*>::iterator i = std::find (cropWins.begin(), cropWins.end(), cw);
|
||||
if (i!=cropWins.end())
|
||||
cropWins.erase (i);
|
||||
cropWins.push_front (cw);
|
||||
mainCropWindow->setObservedCropWin (cropWins.front());
|
||||
}
|
||||
|
||||
void ImageArea::cropWindowClosed (CropWindow* cw) {
|
||||
|
||||
focusGrabber = NULL;
|
||||
cw->getPosition (lastClosedX, lastClosedY);
|
||||
cw->getSize (lastClosedW, lastClosedH);
|
||||
std::list<CropWindow*>::iterator i = std::find (cropWins.begin(), cropWins.end(), cw);
|
||||
if (i!=cropWins.end())
|
||||
cropWins.erase (i);
|
||||
delete cw;
|
||||
if (!cropWins.empty())
|
||||
mainCropWindow->setObservedCropWin (cropWins.front());
|
||||
else
|
||||
mainCropWindow->setObservedCropWin (NULL);
|
||||
queue_draw ();
|
||||
}
|
||||
|
||||
void ImageArea::straightenReady (double rotDeg) {
|
||||
|
||||
if (listener)
|
||||
listener->rotateSelectionReady (rotDeg);
|
||||
}
|
||||
|
||||
void ImageArea::spotWBSelected (int x, int y) {
|
||||
|
||||
if (listener)
|
||||
listener->spotWBselected (x, y);
|
||||
}
|
||||
|
||||
void ImageArea::redraw () {
|
||||
|
||||
if (!dirty) {
|
||||
dirty = true;
|
||||
queue_draw ();
|
||||
}
|
||||
}
|
||||
|
||||
void ImageArea::getScrollImageSize (int& w, int& h) {
|
||||
|
||||
if (mainCropWindow && ipc) {
|
||||
double z = mainCropWindow->getZoom ();
|
||||
w = ipc->getFullWidth() * z;
|
||||
h = ipc->getFullHeight() * z;
|
||||
}
|
||||
else
|
||||
w = h = 0;
|
||||
}
|
||||
|
||||
void ImageArea::getScrollPosition (int& x, int& y) {
|
||||
|
||||
if (mainCropWindow) {
|
||||
int cropX, cropY;
|
||||
mainCropWindow->getCropPosition (cropX, cropY);
|
||||
x = cropX*mainCropWindow->getZoom ();
|
||||
y = cropY*mainCropWindow->getZoom ();
|
||||
}
|
||||
else
|
||||
x = y = 0;
|
||||
}
|
||||
|
||||
void ImageArea::setScrollPosition (int x, int y) {
|
||||
|
||||
if (mainCropWindow) {
|
||||
mainCropWindow->delCropWindowListener (this);
|
||||
mainCropWindow->setCropPosition (x/mainCropWindow->getZoom (), y/mainCropWindow->getZoom ());
|
||||
mainCropWindow->addCropWindowListener (this);
|
||||
}
|
||||
}
|
||||
|
||||
void ImageArea::cropPositionChanged (CropWindow* cw) {
|
||||
|
||||
updateScrollbars ();
|
||||
}
|
||||
|
||||
void ImageArea::cropWindowSizeChanged (CropWindow* cw) {
|
||||
|
||||
updateScrollbars ();
|
||||
}
|
||||
|
||||
void ImageArea::cropZoomChanged (CropWindow* cw) {
|
||||
|
||||
if (cw==mainCropWindow) {
|
||||
parent->zoomChanged ();
|
||||
updateScrollbars ();
|
||||
zoomPanel->refreshZoomLabel ();
|
||||
}
|
||||
}
|
||||
|
||||
double ImageArea::getZoom () {
|
||||
|
||||
if (mainCropWindow)
|
||||
return mainCropWindow->getZoom ();
|
||||
else
|
||||
return 1.0;
|
||||
}
|
||||
|
||||
void ImageArea::setZoom (double zoom) {
|
||||
|
||||
if (mainCropWindow)
|
||||
mainCropWindow->setZoom (zoom);
|
||||
zoomPanel->refreshZoomLabel ();
|
||||
}
|
||||
|
||||
void ImageArea::initialImageArrived (CropWindow* cw) {
|
||||
|
||||
if (mainCropWindow)
|
||||
mainCropWindow->zoomFit ();
|
||||
}
|
||||
|
||||
void ImageArea::updateScrollbars () {
|
||||
parent->refreshScrollBars ();
|
||||
}
|
||||
|
||||
void ImageArea::setCropGUIListener (CropGUIListener* l) {
|
||||
|
||||
cropgl = l;
|
||||
for (std::list<CropWindow*>::iterator i=cropWins.begin(); i!=cropWins.end(); i++)
|
||||
(*i)->setCropGUIListener (cropgl);
|
||||
if (mainCropWindow)
|
||||
mainCropWindow->setCropGUIListener (cropgl);
|
||||
}
|
||||
|
||||
void ImageArea::setPointerMotionListener (PointerMotionListener* pml) {
|
||||
|
||||
pmlistener = pml;
|
||||
for (std::list<CropWindow*>::iterator i=cropWins.begin(); i!=cropWins.end(); i++)
|
||||
(*i)->setPointerMotionListener (pml);
|
||||
if (mainCropWindow)
|
||||
mainCropWindow->setPointerMotionListener (pml);
|
||||
}
|
||||
|
||||
ToolMode ImageArea::getToolMode () {
|
||||
|
||||
if (listener)
|
||||
return listener->getToolBar()->getTool ();
|
||||
else
|
||||
return TMHand;
|
||||
}
|
||||
|
||||
void ImageArea::setToolHand () {
|
||||
|
||||
if (listener)
|
||||
listener->getToolBar()->setTool (TMHand);
|
||||
}
|
||||
|
||||
int ImageArea::getSpotWBRectSize () {
|
||||
|
||||
if (listener)
|
||||
return listener->getSpotWBRectSize ();
|
||||
else
|
||||
return 1;
|
||||
}
|
||||
Reference in New Issue
Block a user