Use ValueNode_DynamicList::set_member_canvas() to set the canvas for each blinepoint...

[synfig.git] / synfig-studio / trunk / src / gtkmm / state_bline.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index 9eadbfb..ba754f6 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@ -6,7 +6,7 @@
 **
 **     \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
@@ -64,6 +64,9 @@ using namespace studio;
 
 /* === M A C R O S ========================================================= */
 
+// if defined, show the first duck as green while drawing
+#define DISTINGUISH_FIRST_DUCK
+
 /* === G L O B A L S ======================================================= */
 
 StateBLine studio::state_bline;
@@ -600,6 +603,8 @@ StateBLine_Context::run_()
                if(!canvas)
                        canvas=get_canvas_view()->get_canvas();
 
+               value_node_bline->set_member_canvas(canvas);
+
                synfigapp::SelectionManager::LayerList layer_selection;
 
                ///////////////////////////////////////////////////////////////////////////
@@ -988,7 +993,12 @@ StateBLine_Context::refresh_ducks(bool button_down)
                // First add the duck associated with this vertex
                duck=new WorkArea::Duck(bline_point.get_vertex());
                duck->set_editable(true);
+#ifdef DISTINGUISH_FIRST_DUCK
+               if (iter!=bline_point_list.begin())
+                       duck->set_type(Duck::TYPE_VERTEX);
+#else
                duck->set_type(Duck::TYPE_VERTEX);
+#endif
                duck->set_name(strprintf("%x-vertex",value_node.get()));
                duck->signal_edited().connect(
                        sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_vertex_change),value_node)
@@ -1091,6 +1101,9 @@ StateBLine_Context::refresh_ducks(bool button_down)
 
                duck=new WorkArea::Duck(bline_point.get_vertex());
                duck->set_editable(true);
+#ifndef DISTINGUISH_FIRST_DUCK
+               duck->set_type(Duck::TYPE_VERTEX);
+#endif
                duck->set_name(strprintf("%x-vertex",bline_point_list.front().get()));
                duck->signal_edited().connect(
                        sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_vertex_change),bline_point_list.front())
@@ -1134,12 +1147,12 @@ StateBLine_Context::refresh_ducks(bool button_down)
        if(bezier && !loop_)
        {
                duck=new WorkArea::Duck(bline_point.get_vertex());
-               duck->set_editable(false);
+               duck->set_ignore(true);
                duck->set_name("temp");
 
                // Add the tangent1 duck
                tduck=new WorkArea::Duck(Vector(0,0));
-               tduck->set_editable(false);
+               tduck->set_ignore(true);
                tduck->set_name("ttemp");
                tduck->set_origin(duck);
                tduck->set_scalar(-0.33333333333333333);
@@ -1271,27 +1284,24 @@ StateBLine_Context::bline_insert_vertex(synfig::ValueNode_Const::Handle value_no
        for(iter=bline_point_list.begin();iter!=bline_point_list.end();++iter)
                if(*iter==value_node)
                {
-                       list<ValueNode_Const::Handle>::iterator prev(iter);
-                       --prev;
-
                        BLinePoint bline_point;
-
                        BLinePoint next_bline_point((*iter)->get_value().get(BLinePoint()));
                        BLinePoint prev_bline_point;
 
-                       if(iter!=bline_point_list.begin())
-                       {
-                               prev_bline_point=(*prev)->get_value().get(BLinePoint());
-                       }
-                       else
+                       list<ValueNode_Const::Handle>::iterator prev(iter);
+                       if(iter==bline_point_list.begin())
                        {
-                               prev_bline_point.set_vertex(Point(0,0));
-                               prev_bline_point.set_width(next_bline_point.get_width());
-                               prev_bline_point.set_origin(0.5);
-                               prev_bline_point.set_split_tangent_flag(false);
+                               assert(loop_);
+                               prev = bline_point_list.end();
                        }
+                       prev--;
+
+                       prev_bline_point=(*prev)->get_value().get(BLinePoint());
 
-                       etl::hermite<Vector> curve(prev_bline_point.get_vertex(),next_bline_point.get_vertex(),prev_bline_point.get_tangent2(),next_bline_point.get_tangent1());
+                       etl::hermite<Vector> curve(prev_bline_point.get_vertex(),
+                                                                          next_bline_point.get_vertex(),
+                                                                          prev_bline_point.get_tangent2(),
+                                                                          next_bline_point.get_tangent1());
                        etl::derivative< etl::hermite<Vector> > deriv(curve);
 
                        bline_point.set_vertex(curve(origin));