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

Apply astyle to rtgui/controllines.*

Browse Source
This commit is contained in:
Lawrence Lee
2020-07-12 15:44:58 -07:00
parent 06caf40598
commit ef405eeb1d
2 changed files with 82 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
rtgui/controllines.cc
View File

@@ -43,10 +43,14 @@ ControlLineManager::ControlLineManager():
canvas_area->topLeft = Coord(0, 0); canvas_area->topLeft = Coord(0, 0);
mouseOverGeometry.push_back(canvas_area.get()); mouseOverGeometry.push_back(canvas_area.get());
line_icon_h = Cairo::RefPtr<RTSurface>(new RTSurface("bidirectional-arrow-horizontal-hicontrast.png")); line_icon_h = Cairo::RefPtr<RTSurface>(new RTSurface(
line_icon_v = Cairo::RefPtr<RTSurface>(new RTSurface("bidirectional-arrow-vertical-hicontrast.png")); "bidirectional-arrow-horizontal-hicontrast.png"));
line_icon_h_prelight = Cairo::RefPtr<RTSurface>(new RTSurface("bidirectional-arrow-horizontal-prelight.png")); line_icon_v = Cairo::RefPtr<RTSurface>(new RTSurface(
line_icon_v_prelight = Cairo::RefPtr<RTSurface>(new RTSurface("bidirectional-arrow-vertical-prelight.png")); "bidirectional-arrow-vertical-hicontrast.png"));
line_icon_h_prelight = Cairo::RefPtr<RTSurface>(new RTSurface(
"bidirectional-arrow-horizontal-prelight.png"));
line_icon_v_prelight = Cairo::RefPtr<RTSurface>(new RTSurface(
"bidirectional-arrow-vertical-prelight.png"));
} }
ControlLineManager::~ControlLineManager() = default; ControlLineManager::~ControlLineManager() = default;
@@ -91,6 +95,7 @@ bool ControlLineManager::button1Pressed(int modifierKey)
drag_delta = Coord(0, 0); drag_delta = Coord(0, 0);
const int object = dataProvider->getObject(); const int object = dataProvider->getObject();
if (object > 0) { // A control line. if (object > 0) { // A control line.
if (object % ::ControlLine::OBJ_COUNT == 2) { // Icon. if (object % ::ControlLine::OBJ_COUNT == 2) { // Icon.
action = Action::PICKING; action = Action::PICKING;
@@ -111,9 +116,11 @@ bool ControlLineManager::button1Pressed(int modifierKey)
bool ControlLineManager::button1Released(void) bool ControlLineManager::button1Released(void)
{ {
action = Action::NONE; action = Action::NONE;
if (selected_object > 0) { if (selected_object > 0) {
mouseOverGeometry[selected_object]->state = Geometry::NORMAL; mouseOverGeometry[selected_object]->state = Geometry::NORMAL;
} }
edited = true; edited = true;
callbacks->lineChanged(); callbacks->lineChanged();
drawing_line = false; drawing_line = false;
@@ -151,7 +158,8 @@ bool ControlLineManager::pick1(bool picked)
// Change line type. // Change line type.
int object_id = provider->getObject(); int object_id = provider->getObject();
::ControlLine& line = *control_lines[(object_id - 1) / ::ControlLine::OBJ_COUNT]; ::ControlLine& line =
*control_lines[(object_id - 1) / ::ControlLine::OBJ_COUNT];
if (line.type == rtengine::ControlLine::HORIZONTAL) { if (line.type == rtengine::ControlLine::HORIZONTAL) {
line.icon = line.icon_v; line.icon = line.icon_v;
@@ -197,8 +205,10 @@ bool ControlLineManager::drag1(int modifierKey)
return false; return false;
} }
::ControlLine& control_line = *control_lines[(selected_object - 1) / ::ControlLine::OBJ_COUNT]; ::ControlLine& control_line =
int component = selected_object % ::ControlLine::OBJ_COUNT; // 0 == end, 1 == line, 2 == icon, 3 == begin *control_lines[(selected_object - 1) / ::ControlLine::OBJ_COUNT];
// 0 == end, 1 == line, 2 == icon, 3 == begin
int component = selected_object % ::ControlLine::OBJ_COUNT;
Coord mouse = provider->posImage + provider->deltaImage; Coord mouse = provider->posImage + provider->deltaImage;
Coord delta = provider->deltaImage - drag_delta; Coord delta = provider->deltaImage - drag_delta;
int ih, iw; int ih, iw;
@@ -211,6 +221,7 @@ bool ControlLineManager::drag1(int modifierKey)
control_line.line->end = control_line.end->center; control_line.line->end = control_line.end->center;
control_line.end->state = Geometry::DRAGGED; control_line.end->state = Geometry::DRAGGED;
break; break;
case (1): { // line case (1): { // line
// Constrain delta so the end stays above the image. // Constrain delta so the end stays above the image.
Coord new_delta = control_line.end->center + delta; Coord new_delta = control_line.end->center + delta;
@@ -229,6 +240,7 @@ bool ControlLineManager::drag1(int modifierKey)
control_line.line->state = Geometry::DRAGGED; control_line.line->state = Geometry::DRAGGED;
break; break;
} }
case (3): // begin case (3): // begin
control_line.begin->center = mouse; control_line.begin->center = mouse;
control_line.begin->center.clip(iw, ih); control_line.begin->center.clip(iw, ih);
@@ -237,8 +249,10 @@ bool ControlLineManager::drag1(int modifierKey)
break; break;
} }
control_line.icon_h->position.x = (control_line.begin->center.x + control_line.end->center.x) / 2; control_line.icon_h->position.x = (control_line.begin->center.x +
control_line.icon_h->position.y = (control_line.begin->center.y + control_line.end->center.y) / 2; control_line.end->center.x) / 2;
control_line.icon_h->position.y = (control_line.begin->center.y +
control_line.end->center.y) / 2;
control_line.icon_v->position.x = control_line.icon_h->position.x; control_line.icon_v->position.x = control_line.icon_h->position.x;
control_line.icon_v->position.y = control_line.icon_h->position.y; control_line.icon_v->position.y = control_line.icon_h->position.y;
@@ -288,6 +302,7 @@ bool ControlLineManager::mouseOver(int modifierKey)
if (prev_obj != cur_obj && prev_obj > 0) { if (prev_obj != cur_obj && prev_obj > 0) {
visibleGeometry[prev_obj - 1]->state = Geometry::NORMAL; visibleGeometry[prev_obj - 1]->state = Geometry::NORMAL;
} }
prev_obj = cur_obj; prev_obj = cur_obj;
return true; return true;
@@ -310,9 +325,11 @@ void ControlLineManager::setEditProvider(EditDataProvider* provider)
EditSubscriber::setEditProvider(provider); EditSubscriber::setEditProvider(provider);
} }
void ControlLineManager::setLines(const std::vector<rtengine::ControlLine>& lines) void ControlLineManager::setLines(const std::vector<rtengine::ControlLine>&
lines)
{ {
removeAll(); removeAll();
for (auto&& line : lines) { for (auto&& line : lines) {
Coord start(line.x1, line.y1); Coord start(line.x1, line.y1);
Coord end(line.x2, line.y2); Coord end(line.x2, line.y2);
@@ -320,7 +337,8 @@ void ControlLineManager::setLines(const std::vector<rtengine::ControlLine>& line
} }
} }
void ControlLineManager::addLine(Coord begin, Coord end, rtengine::ControlLine::Type type) void ControlLineManager::addLine(Coord begin, Coord end,
rtengine::ControlLine::Type type)
{ {
constexpr int line_width = 2; constexpr int line_width = 2;
constexpr int handle_radius = 6; constexpr int handle_radius = 6;
@@ -334,14 +352,19 @@ void ControlLineManager::addLine(Coord begin, Coord end, rtengine::ControlLine::
line->begin = begin; line->begin = begin;
line->end = end; line->end = end;
const Cairo::RefPtr<RTSurface> null_surface = Cairo::RefPtr<RTSurface>(nullptr); const Cairo::RefPtr<RTSurface> null_surface =
Cairo::RefPtr<RTSurface>(nullptr);
icon_h = std::make_shared<OPIcon>(line_icon_h, null_surface, line_icon_h_prelight, icon_h = std::make_shared<OPIcon>(line_icon_h, null_surface,
null_surface, null_surface, Geometry::DP_CENTERCENTER); line_icon_h_prelight,
null_surface, null_surface,
Geometry::DP_CENTERCENTER);
icon_h->position = Coord((begin.x + end.x) / 2, (begin.y + end.y) / 2); icon_h->position = Coord((begin.x + end.x) / 2, (begin.y + end.y) / 2);
icon_v = std::make_shared<OPIcon>(line_icon_v, null_surface, line_icon_v_prelight, icon_v = std::make_shared<OPIcon>(line_icon_v, null_surface,
null_surface, null_surface, Geometry::DP_CENTERCENTER); line_icon_v_prelight,
null_surface, null_surface,
Geometry::DP_CENTERCENTER);
icon_v->position = Coord((begin.x + end.x) / 2, (begin.y + end.y) / 2); icon_v->position = Coord((begin.x + end.x) / 2, (begin.y + end.y) / 2);
begin_c = std::unique_ptr<Circle>(new Circle()); begin_c = std::unique_ptr<Circle>(new Circle());
@@ -361,11 +384,13 @@ void ControlLineManager::addLine(Coord begin, Coord end, rtengine::ControlLine::
control_line->end = std::move(end_c); control_line->end = std::move(end_c);
control_line->icon_h = icon_h; control_line->icon_h = icon_h;
control_line->icon_v = icon_v; control_line->icon_v = icon_v;
if (type == rtengine::ControlLine::HORIZONTAL) { if (type == rtengine::ControlLine::HORIZONTAL) {
control_line->icon = icon_h; control_line->icon = icon_h;
} else { } else {
control_line->icon = icon_v; control_line->icon = icon_v;
} }
control_line->line = std::move(line); control_line->line = std::move(line);
control_line->type = type; control_line->type = type;
@@ -393,6 +418,7 @@ void ControlLineManager::autoSetLineType(int object_id)
if (dx < 0) { if (dx < 0) {
dx = -dx; dx = -dx;
} }
if (dy < 0) { if (dy < 0) {
dy = -dy; dy = -dy;
} }
@@ -411,14 +437,16 @@ void ControlLineManager::autoSetLineType(int object_id)
if (type != line.type) { // Need to update line type. if (type != line.type) { // Need to update line type.
line.type = type; line.type = type;
line.icon = icon; line.icon = icon;
visibleGeometry[line_id * ::ControlLine::OBJ_COUNT + 1] = line.icon.get(); visibleGeometry[line_id * ::ControlLine::OBJ_COUNT + 1] =
line.icon.get();
} }
} }
void ControlLineManager::removeAll(void) void ControlLineManager::removeAll(void)
{ {
visibleGeometry.clear(); visibleGeometry.clear();
mouseOverGeometry.erase(mouseOverGeometry.begin() + 1, mouseOverGeometry.end()); mouseOverGeometry.erase(mouseOverGeometry.begin() + 1,
mouseOverGeometry.end());
control_lines.clear(); control_lines.clear();
prev_obj = -1; prev_obj = -1;
selected_object = -1; selected_object = -1;
@@ -432,17 +460,24 @@ void ControlLineManager::removeLine(size_t line_id)
return; return;
} }
visibleGeometry.erase(visibleGeometry.begin() + ::ControlLine::OBJ_COUNT * line_id, visibleGeometry.erase(
visibleGeometry.begin() + ::ControlLine::OBJ_COUNT * line_id + ::ControlLine::OBJ_COUNT); visibleGeometry.begin() + ::ControlLine::OBJ_COUNT * line_id,
mouseOverGeometry.erase(mouseOverGeometry.begin() + ::ControlLine::OBJ_COUNT * line_id + 1, visibleGeometry.begin() + ::ControlLine::OBJ_COUNT * line_id
mouseOverGeometry.begin() + ::ControlLine::OBJ_COUNT * line_id + ::ControlLine::OBJ_COUNT + 1); + ::ControlLine::OBJ_COUNT
);
mouseOverGeometry.erase(
mouseOverGeometry.begin() + ::ControlLine::OBJ_COUNT * line_id + 1,
mouseOverGeometry.begin() + ::ControlLine::OBJ_COUNT * line_id
+ ::ControlLine::OBJ_COUNT + 1
);
control_lines.erase(control_lines.begin() + line_id); control_lines.erase(control_lines.begin() + line_id);
edited = true; edited = true;
callbacks->lineChanged(); callbacks->lineChanged();
} }
void ControlLineManager::toControlLines(std::vector<rtengine::ControlLine>& converted) const void ControlLineManager::toControlLines(std::vector<rtengine::ControlLine>&
converted) const
{ {
converted.clear(); converted.clear();
converted.resize(control_lines.size()); converted.resize(control_lines.size());

49
rtgui/controllines.h
View File

@@ -29,8 +29,7 @@ class OPIcon;
class Rectangle; class Rectangle;
class RTSurface; class RTSurface;
struct ControlLine struct ControlLine {
{
static constexpr int OBJ_COUNT = 4; static constexpr int OBJ_COUNT = 4;
std::unique_ptr<Line> line; std::unique_ptr<Line> line;
std::shared_ptr<OPIcon> icon; std::shared_ptr<OPIcon> icon;
@@ -58,8 +57,8 @@ protected:
int prev_obj; int prev_obj;
int selected_object; int selected_object;
void addLine (rtengine::Coord begin, rtengine::Coord end, void addLine(rtengine::Coord begin, rtengine::Coord end,
rtengine::ControlLine::Type type = rtengine::ControlLine::VERTICAL); rtengine::ControlLine::Type type = rtengine::ControlLine::VERTICAL);
/** /**
* Set the line type of the line containing the object according to the * Set the line type of the line containing the object according to the
* line's angle. * line's angle.
@@ -68,7 +67,7 @@ protected:
* line, inclusive, the line type is set to vertical. Otherwise, horizontal. * line, inclusive, the line type is set to vertical. Otherwise, horizontal.
*/ */
void autoSetLineType(int object_id); void autoSetLineType(int object_id);
void removeLine (size_t line_id); void removeLine(size_t line_id);
public: public:
class Callbacks class Callbacks
@@ -76,9 +75,9 @@ public:
public: public:
virtual ~Callbacks() {}; virtual ~Callbacks() {};
/** Called when a line changed (added, removed, moved, etc.). */ /** Called when a line changed (added, removed, moved, etc.). */
virtual void lineChanged (void) {}; virtual void lineChanged(void) {};
/** Called when the EditSubscriber's switchOffEditMode is called. */ /** Called when the EditSubscriber's switchOffEditMode is called. */
virtual void switchOffEditMode (void) {}; virtual void switchOffEditMode(void) {};
}; };
/** Callbacks to invoke. */ /** Callbacks to invoke. */
@@ -87,30 +86,30 @@ public:
ControlLineManager(); ControlLineManager();
~ControlLineManager(); ~ControlLineManager();
bool getEdited (void) const; bool getEdited(void) const;
void removeAll (void); void removeAll(void);
/** Sets whether or not the lines are visible and interact-able. */ /** Sets whether or not the lines are visible and interact-able. */
void setActive (bool active); void setActive(bool active);
/** Set whether or not lines can be drawn and deleted. */ /** Set whether or not lines can be drawn and deleted. */
void setDrawMode (bool draw); void setDrawMode(bool draw);
void setEdited (bool edited); void setEdited(bool edited);
void setEditProvider (EditDataProvider* provider); void setEditProvider(EditDataProvider* provider);
void setLines (const std::vector<rtengine::ControlLine>& lines); void setLines(const std::vector<rtengine::ControlLine>& lines);
/** Returns the number of lines. */ /** Returns the number of lines. */
size_t size (void) const; size_t size(void) const;
/** /**
* Allocates a new array and populates it with copies of the control lines. * Allocates a new array and populates it with copies of the control lines.
*/ */
void toControlLines (std::vector<rtengine::ControlLine>& converted) const; void toControlLines(std::vector<rtengine::ControlLine>& converted) const;
// EditSubscriber overrides // EditSubscriber overrides
bool button1Pressed (int modifierKey) override; bool button1Pressed(int modifierKey) override;
bool button1Released (void) override; bool button1Released(void) override;
bool button3Pressed (int modifierKey) override; bool button3Pressed(int modifierKey) override;
bool pick1 (bool picked) override; bool pick1(bool picked) override;
bool pick3 (bool picked) override; bool pick3(bool picked) override;
bool drag1 (int modifierKey) override; bool drag1(int modifierKey) override;
CursorShape getCursor (int objectID) const override; CursorShape getCursor(int objectID) const override;
bool mouseOver (int modifierKey) override; bool mouseOver(int modifierKey) override;
void switchOffEditMode (void) override; void switchOffEditMode(void) override;
}; };