Remove spaces and tabs at end of lines.

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

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index d2f0651..a0f7fca 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.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
@@ -44,6 +44,9 @@
 #include "workarea.h"
 #include "widget_timeslider.h"
 #include "layerparamtreestore.h"
+#include "general.h"
+#include <synfig/timepointcollect.h>
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -66,7 +69,7 @@ class TimeTrackView : public Gtk::TreeView
        Gtk::TreeView *mimic_tree_view;
 public:
 
-       sigc::signal<void,synfigapp::ValueDesc,synfig::Waypoint,int> signal_waypoint_clicked;
+       sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint, std::less<UniqueID> >,int> signal_waypoint_clicked_timetrackview;
 
        LayerParamTreeStore::Model model;
 
@@ -86,7 +89,7 @@ public:
                        // Set up the value-node cell-renderer
                        cellrenderer_time_track=LayerParamTreeStore::add_cell_renderer_value_node(column);
                        cellrenderer_time_track->property_mode()=Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
-                       cellrenderer_time_track->signal_waypoint_clicked().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_clicked) );
+                       cellrenderer_time_track->signal_waypoint_clicked_cellrenderer().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_clicked_timetrackview));
                        cellrenderer_time_track->signal_waypoint_changed().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_changed) );
                        column->add_attribute(cellrenderer_time_track->property_value_desc(), model.value_desc);
                        column->add_attribute(cellrenderer_time_track->property_canvas(), model.canvas);
@@ -99,7 +102,6 @@ public:
                        column->set_resizable();
                        column->set_min_width(200);
 
-
                        append_column(*column);
                }
                set_rules_hint();
@@ -222,7 +224,9 @@ public:
 
                                Gtk::TreeRow row = *(get_model()->get_iter(path));
 
-                               if((event->motion.state&GDK_BUTTON1_MASK ||event->motion.state&GDK_BUTTON3_MASK) && column && cellrenderer_time_track==column->get_first_cell_renderer())
+                               if ((event->motion.state&GDK_BUTTON1_MASK || event->motion.state&GDK_BUTTON3_MASK) &&
+                                       column &&
+                                       cellrenderer_time_track == column->get_first_cell_renderer())
                                {
                                        Gdk::Rectangle rect;
                                        get_cell_area(path,*column,rect);
@@ -304,6 +308,9 @@ public:
        void
        on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node)
        {
+               // is this code used?
+               assert(0);
+
                synfigapp::Action::ParamList param_list;
                param_list.add("canvas",param_tree_store_->canvas_interface()->get_canvas());
                param_list.add("canvas_interface",param_tree_store_->canvas_interface());
@@ -311,7 +318,7 @@ public:
                param_list.add("waypoint",waypoint);
        //      param_list.add("time",canvas_interface()->get_time());
 
-               etl::handle<studio::Instance>::cast_static(param_tree_store_->canvas_interface()->get_instance())->process_action("waypoint_set_smart", param_list);
+               etl::handle<studio::Instance>::cast_static(param_tree_store_->canvas_interface()->get_instance())->process_action("WaypointSetSmart", param_list);
        }
 
        void mimic(Gtk::TreeView *param_tree_view)
@@ -343,7 +350,6 @@ public:
 
        void mimic_resync()
        {
-
                if(mimic_tree_view)
                {
                        Gtk::Adjustment &adjustment(*mimic_tree_view->get_vadjustment());
@@ -357,38 +363,34 @@ public:
                                row_height = atoi(getenv("SYNFIG_TIMETRACK_ROW_HEIGHT"));
                        if (row_height < 3)
                                row_height = 18;
-                                                                         
+
                        cellrenderer_time_track->set_fixed_size(-1,row_height);
                }
        }
 
        void
-       on_waypoint_clicked(const Glib::ustring &/*path_string*/, synfig::Waypoint waypoint,int button)
+       on_waypoint_clicked_timetrackview(const etl::handle<synfig::Node>& node,
+                                                                         const synfig::Time& time,
+                                                                         const synfig::Time& time_offset __attribute__ ((unused)),
+                                                                         int button)
        {
-/*
-               Gtk::TreePath path(path_string);
-
-               const Gtk::TreeRow row = *(get_model()->get_iter(path));
-               if(!row)
-                       return;
-*/
+               std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
+               synfig::waypoint_collect(waypoint_set,time,node);
 
-               ValueNode::Handle value_node(waypoint.get_parent_value_node());
-               assert(value_node);
+               synfigapp::ValueDesc value_desc;
 
-               Gtk::TreeRow row;
-               if(!param_tree_store_->find_first_value_node(value_node, row))
+               if (waypoint_set.size() == 1)
                {
-                       synfig::error(__FILE__":%d: Unable to find the valuenode",__LINE__);
-                       return;
-               }
-
-               if(!row)
-                       return;
+                       ValueNode::Handle value_node(waypoint_set.begin()->get_parent_value_node());
+                       assert(value_node);
 
-               synfigapp::ValueDesc value_desc(static_cast<synfigapp::ValueDesc>(row[model.value_desc]));
+                       Gtk::TreeRow row;
+                       if (param_tree_store_->find_first_value_node(value_node, row) && row)
+                               value_desc = static_cast<synfigapp::ValueDesc>(row[model.value_desc]);
+               }
 
-               signal_waypoint_clicked(value_desc,waypoint,button);
+               if (!waypoint_set.empty())
+                       signal_waypoint_clicked_timetrackview(value_desc,waypoint_set,button);
        }
 };
 
@@ -440,8 +442,7 @@ Dock_Timetrack::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view
        Gtk::TreeView* param_tree_view(dynamic_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("params")));
        tree_view->mimic(param_tree_view);
 
-       tree_view->signal_waypoint_clicked.connect(sigc::mem_fun(*canvas_view, &studio::CanvasView::on_waypoint_clicked));
-
+       tree_view->signal_waypoint_clicked_timetrackview.connect(sigc::mem_fun(*canvas_view, &studio::CanvasView::on_waypoint_clicked_canvasview));
 
        canvas_view->time_adjustment().signal_value_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw));
        canvas_view->time_adjustment().signal_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw));
@@ -484,7 +485,6 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_v
                table_=0;
        }
 
-
        if(canvas_view)
        {
                TimeTrackView* tree_view(dynamic_cast<TimeTrackView*>(canvas_view->get_ext_widget(get_name())));