**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright (c) 2007 Chris Moore
+** Copyright (c) 2007, 2008 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
#include <ETL/misc>
#include "widget_color.h"
#include <synfig/distance.h>
+#include <synfig/valuenode_blinecalcvertex.h>
+#include <synfig/valuenode_bline.h>
#include "app.h"
#include "general.h"
/* === M E T H O D S ======================================================= */
+bool
+restrict_blinevertex_duck(etl::handle<Duck> duck, WorkArea& w_area, synfig::Point *point)
+{
+ synfig::Point sub_trans_origin(duck->get_sub_trans_origin());
+ etl::handle<Duck> origin_duck = duck->get_origin_duck();
+ bool origin_changed = false;
+ if(origin_duck)
+ origin_changed = restrict_blinevertex_duck(origin_duck, w_area, &sub_trans_origin);
+
+ if( ValueNode_BLineCalcVertex::Handle bline_vertex =
+ ValueNode_BLineCalcVertex::Handle::cast_dynamic(duck->get_value_desc().get_value_node())
+ )
+ {
+ synfig::Point closest_point = duck->get_point();
+ synfig::Real radius = 0.0;
+ ValueNode_BLine::Handle bline = ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline")));
+ synfig::find_closest_point(
+ (*bline)(w_area.get_time()),
+ duck->get_point(),
+ radius,
+ bline->get_loop(),
+ &closest_point
+ );
+
+ if(closest_point != duck->get_point())
+ {
+ *point = closest_point * duck->get_scalar() + sub_trans_origin;
+ return true;
+ }
+ }
+
+ if(origin_changed)
+ {
+ *point = duck->get_point() * duck->get_scalar() + sub_trans_origin;
+ return true;
+ }
+
+ return false;
+}
+
Renderer_Ducks::~Renderer_Ducks()
{
}
// Render the beziers
for(std::list<handle<Duckmatic::Bezier> >::const_iterator iter=bezier_list.begin();iter!=bezier_list.end();++iter)
{
+ Point sub_trans_p1((*iter)->p1->get_sub_trans_point());
+ Point sub_trans_p2((*iter)->p2->get_sub_trans_point());
+ Point sub_trans_c1((*iter)->c1->get_sub_trans_point());
+ Point sub_trans_c2((*iter)->c2->get_sub_trans_point());
+
+ WorkArea* w_area = get_work_area();
+ restrict_blinevertex_duck((*iter)->p1, *w_area, &sub_trans_p1);
+ restrict_blinevertex_duck((*iter)->p2, *w_area, &sub_trans_p2);
+ restrict_blinevertex_duck((*iter)->c1, *w_area, &sub_trans_c1);
+ restrict_blinevertex_duck((*iter)->c2, *w_area, &sub_trans_c2);
+
Point window_start(window_startx,window_starty);
- Point p1((*iter)->p1->get_trans_point()-window_start);
- Point p2((*iter)->p2->get_trans_point()-window_start);
- Point c1((*iter)->c1->get_trans_point()-window_start);
- Point c2((*iter)->c2->get_trans_point()-window_start);
+ Point p1((*iter)->p1->get_transform_stack().perform(sub_trans_p1)-window_start);
+ Point p2((*iter)->p2->get_transform_stack().perform(sub_trans_p2)-window_start);
+ Point c1((*iter)->c1->get_transform_stack().perform(sub_trans_c1)-window_start);
+ Point c2((*iter)->c2->get_transform_stack().perform(sub_trans_c2)-window_start);
p1[0]/=pw;p1[1]/=ph;
p2[0]/=pw;p2[1]/=ph;
c1[0]/=pw;c1[1]/=ph;
// Real x,y;
// Gdk::Rectangle area;
- Point point((*iter)->get_trans_point());
- Point origin((*iter)->get_trans_origin());
-
- point[0]=(point[0]-window_startx)/pw;
- point[1]=(point[1]-window_starty)/ph;
+ Point sub_trans_point((*iter)->get_sub_trans_point());
+ Point sub_trans_origin((*iter)->get_sub_trans_origin());
+ etl::handle<Duck> origin_duck = (*iter)->get_origin_duck();
bool has_connect(false);
if((*iter)->get_tangent() || (*iter)->get_type()&Duck::TYPE_ANGLE)
if((*iter)->get_connect_duck())
{
has_connect=true;
- origin=(*iter)->get_connect_duck()->get_trans_point();
+ sub_trans_origin = (*iter)->get_connect_duck()->get_sub_trans_point();
+ origin_duck = (*iter)->get_connect_duck();
}
- origin[0]=(origin[0]-window_startx)/pw;
- origin[1]=(origin[1]-window_starty)/ph;
if (App::restrict_radius_ducks &&
(*iter)->is_radius())
{
- if (point[0] < origin[0]) point[0] = origin[0];
- if (point[1] > origin[1]) point[1] = origin[1];
+ if (sub_trans_point[0] < sub_trans_origin[0])
+ sub_trans_point[0] = sub_trans_origin[0];
+ if (sub_trans_point[1] < sub_trans_origin[1])
+ sub_trans_point[1] = sub_trans_origin[1];
}
+ WorkArea* w_area = get_work_area();
+ restrict_blinevertex_duck((*iter), *w_area, &sub_trans_point);
+ if(origin_duck)
+ restrict_blinevertex_duck(origin_duck, *w_area, &sub_trans_origin);
+
+ Point point((*iter)->get_transform_stack().perform(sub_trans_point));
+ Point origin((*iter)->get_transform_stack().perform(sub_trans_origin));
+
+ point[0]=(point[0]-window_startx)/pw;
+ point[1]=(point[1]-window_starty)/ph;
+
+ origin[0]=(origin[0]-window_startx)/pw;
+ origin[1]=(origin[1]-window_starty)/ph;
+
bool selected(get_work_area()->duck_is_selected(*iter));
bool hover(*iter==hover_duck || (*iter)->get_hover());
if(get_work_area()->get_selected_value_node())
{
synfigapp::ValueDesc value_desc((*iter)->get_value_desc());
- if(value_desc.is_valid() && value_desc.is_value_node() && get_work_area()->get_selected_value_node()==value_desc.get_value_node())
+ if (value_desc.is_valid() &&
+ ((value_desc.is_value_node() && get_work_area()->get_selected_value_node() == value_desc.get_value_node()) ||
+ (value_desc.parent_is_value_node() && get_work_area()->get_selected_value_node() == value_desc.get_parent_value_node())))
{
gc->set_function(Gdk::COPY);
gc->set_rgb_fg_color(DUCK_COLOR_SELECTED);
if(solid_lines)
{
gc->set_line_attributes(3,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
- gc->set_rgb_fg_color(Gdk::Color("#000000"));
+ gc->set_rgb_fg_color(DUCK_COLOR_CONNECT_OUTSIDE);
gc->set_function(Gdk::COPY);
drawable->draw_line(gc, (int)origin[0],(int)origin[1],(int)(point[0]),(int)(point[1]));
gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
- gc->set_rgb_fg_color(Gdk::Color("#9fefef"));
+ gc->set_rgb_fg_color(DUCK_COLOR_CONNECT_INSIDE);
drawable->draw_line(gc, (int)origin[0],(int)origin[1],(int)(point[0]),(int)(point[1]));
}
else
// gc->set_function(Gdk::INVERT);
// drawable->draw_line(gc, (int)origin[0],(int)origin[1],(int)(point[0]),(int)(point[1]));
gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
- gc->set_rgb_fg_color(Gdk::Color("#000000"));
+ gc->set_rgb_fg_color(DUCK_COLOR_CONNECT_OUTSIDE);
gc->set_function(Gdk::COPY);
drawable->draw_line(gc, (int)origin[0],(int)origin[1],(int)(point[0]),(int)(point[1]));
gc->set_line_attributes(1,Gdk::LINE_ON_OFF_DASH,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
- gc->set_rgb_fg_color(Gdk::Color("#9fefef"));
+ gc->set_rgb_fg_color(DUCK_COLOR_CONNECT_INSIDE);
drawable->draw_line(gc, (int)origin[0],(int)origin[1],(int)(point[0]),(int)(point[1]));
}
}
Real mag;
if (App::restrict_radius_ducks)
{
- Point point((*iter)->get_trans_point());
- Point origin((*iter)->get_trans_origin());
+ Point sub_trans_point((*iter)->get_sub_trans_point());
+ Point sub_trans_origin((*iter)->get_sub_trans_origin());
+
+ if (sub_trans_point[0] < sub_trans_origin[0])
+ sub_trans_point[0] = sub_trans_origin[0];
+ if (sub_trans_point[1] < sub_trans_origin[1])
+ sub_trans_point[1] = sub_trans_origin[1];
- if ((point[0] - origin[0]) * pw < 0) point[0] = origin[0];
- if ((point[1] - origin[1]) * ph > 0) point[1] = origin[1];
+ Point point((*iter)->get_transform_stack().perform(sub_trans_point));
+ Point origin((*iter)->get_transform_stack().perform(sub_trans_origin));
mag = (point-origin).mag();
}
real_mag.convert(App::distance_system,get_work_area()->get_rend_desc());
layout->set_text(real_mag.get_string());
- gc->set_rgb_fg_color(Gdk::Color("#000000"));
+ gc->set_rgb_fg_color(DUCK_COLOR_WIDTH_TEXT_1);
drawable->draw_layout(
gc,
round_to_int(point[0])+1+6,
round_to_int(point[1])+1-8,
layout
);
- gc->set_rgb_fg_color(Gdk::Color("#FF00FF"));
+ gc->set_rgb_fg_color(DUCK_COLOR_WIDTH_TEXT_2);
drawable->draw_layout(
gc,
round_to_int(point[0])+6,
projects / synfig.git / blobdiff