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

Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle

Browse Source
This commit is contained in:
DrSlony
2015-08-11 11:55:03 +02:00
parent effb46c3e1
commit 0e0cfb9b25
452 changed files with 133354 additions and 99460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
rtgui/mycurve.cc
View File

@@ -7,7 +7,7 @@
* 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
@@ -21,7 +21,8 @@
#include <cstring>
#include <gdkmm/types.h>
MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal(-1.f), listener(NULL) {
MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal(-1.f), listener(NULL)
{
cursor_type = CSArrow;
graphX = get_allocation().get_width() - RADIUS * 2;
@@ -42,9 +43,9 @@ MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal
#if defined (__APPLE__)
// Workaround: disabling POINTER_MOTION_HINT_MASK as for gtk 2.24.22 the get_pointer() function is buggy for quartz and modifier mask is not updated correctly.
// This workaround should be removed when bug is fixed in GTK2 or when migrating to GTK3
add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK);
add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK);
#else
add_events(Gdk::EXPOSURE_MASK | 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);
add_events(Gdk::EXPOSURE_MASK | 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);
#endif
mcih = new MyCurveIdleHelper;
@@ -53,91 +54,118 @@ MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal
mcih->pending = 0;
}
MyCurve::~MyCurve () {
MyCurve::~MyCurve ()
{
if (mcih->pending)
if (mcih->pending) {
mcih->destroyed = true;
else
} else {
delete mcih;
}
}
int MyCurve::calcDimensions () {
int newRequestedW, newRequestedH;
int MyCurve::calcDimensions ()
{
int newRequestedW, newRequestedH;
newRequestedW = newRequestedH = get_allocation().get_width();
if (leftBar && !bottomBar)
newRequestedH -= getBarWidth() + CBAR_MARGIN - RADIUS;
if (!leftBar && bottomBar)
newRequestedH += getBarWidth() + CBAR_MARGIN - RADIUS;
newRequestedW = newRequestedH = get_allocation().get_width();
graphW = newRequestedW - RADIUS - (leftBar ? (getBarWidth()+CBAR_MARGIN) : RADIUS);
graphH = newRequestedH - RADIUS - (bottomBar ? (getBarWidth()+CBAR_MARGIN) : RADIUS);
graphX = newRequestedW - RADIUS - graphW;
graphY = RADIUS + graphH;
if (leftBar && !bottomBar) {
newRequestedH -= getBarWidth() + CBAR_MARGIN - RADIUS;
}
return newRequestedH;
if (!leftBar && bottomBar) {
newRequestedH += getBarWidth() + CBAR_MARGIN - RADIUS;
}
graphW = newRequestedW - RADIUS - (leftBar ? (getBarWidth() + CBAR_MARGIN) : RADIUS);
graphH = newRequestedH - RADIUS - (bottomBar ? (getBarWidth() + CBAR_MARGIN) : RADIUS);
graphX = newRequestedW - RADIUS - graphW;
graphY = RADIUS + graphH;
return newRequestedH;
}
void MyCurve::setColoredBar (ColoredBar *left, ColoredBar *bottom) {
leftBar = left;
bottomBar = bottom;
void MyCurve::setColoredBar (ColoredBar *left, ColoredBar *bottom)
{
leftBar = left;
bottomBar = bottom;
}
void MyCurve::notifyListener () {
void MyCurve::notifyListener ()
{
if (listener)
if (listener) {
listener->curveChanged ();
}
}
bool MyCurve::snapCoordinateX(double testedVal, double realVal) {
bool MyCurve::snapCoordinateX(double testedVal, double realVal)
{
double dist = realVal - testedVal;
double dist = realVal - testedVal;
if (dist < 0.) dist = -dist;
if (dist < snapToMinDistX) {
snapToMinDistX = dist;
snapToValX = testedVal;
return true;
}
return false;
if (dist < 0.) {
dist = -dist;
}
if (dist < snapToMinDistX) {
snapToMinDistX = dist;
snapToValX = testedVal;
return true;
}
return false;
}
bool MyCurve::snapCoordinateY(double testedVal, double realVal) {
bool MyCurve::snapCoordinateY(double testedVal, double realVal)
{
double dist = realVal - testedVal;
double dist = realVal - testedVal;
if (dist < 0.) dist = -dist;
if (dist < snapToMinDistY) {
snapToMinDistY = dist;
snapToValY = testedVal;
return true;
}
return false;
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));
}
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_changed (const Glib::RefPtr<Gtk::Style>& style) {
setDirty(true);
void MyCurve::on_style_changed (const Glib::RefPtr<Gtk::Style>& style)
{
setDirty(true);
queue_draw ();
}
void MyCurve::refresh() {
if (leftBar != NULL)
leftBar->setDirty(true);
if (bottomBar != NULL)
bottomBar->setDirty(true);
void MyCurve::refresh()
{
if (leftBar != NULL) {
leftBar->setDirty(true);
}
setDirty(true);
if (bottomBar != NULL) {
bottomBar->setDirty(true);
}
Glib::RefPtr<Gdk::Window> win = get_window();
if (win)
win->invalidate(true);
setDirty(true);
Glib::RefPtr<Gdk::Window> win = get_window();
if (win) {
win->invalidate(true);
}
}