X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_waypoint.cpp;h=0f9dca2247d18401e4a52e9663338aa499d454e6;hb=6a6589a6f2255835f8238d3915c8590e946cc632;hp=f8fae327233d8b0914ef6921e4ffef053696ad6a;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp index f8fae32..0f9dca2 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file dialog_waypoint.cpp ** \brief Template Header ** ** $Id: widget_waypoint.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package 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 GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -42,7 +43,7 @@ #include "widget_waypoint.h" #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; using namespace studio; @@ -55,9 +56,9 @@ using namespace studio; /* === M E T H O D S ======================================================= */ -Widget_Waypoint::Widget_Waypoint(etl::handle canvas): +Widget_Waypoint::Widget_Waypoint(etl::handle canvas): Gtk::Table(4,3,false), - waypoint(sinfg::ValueBase(),0), + waypoint(synfig::ValueBase(),0), adj_tension(0.0,-20,20,0.1,1), adj_continuity(0.0,-20,20,0.1,1), adj_bias(0.0,-20,20,0.1,1), @@ -139,7 +140,7 @@ Widget_Waypoint::Widget_Waypoint(etl::handle canvas): } void -Widget_Waypoint::set_canvas(sinfg::Canvas::Handle x) +Widget_Waypoint::set_canvas(synfig::Canvas::Handle x) { canvas=x; assert(canvas); @@ -149,7 +150,7 @@ Widget_Waypoint::set_canvas(sinfg::Canvas::Handle x) } void -Widget_Waypoint::set_waypoint(sinfg::Waypoint &x) +Widget_Waypoint::set_waypoint(synfig::Waypoint &x) { time_widget->set_fps(canvas->rend_desc().get_frame_rate()); @@ -179,7 +180,7 @@ Widget_Waypoint::set_waypoint(sinfg::Waypoint &x) adj_temporal_tension.set_value(waypoint.get_temporal_tension()); } -const sinfg::Waypoint & +const synfig::Waypoint & Widget_Waypoint::get_waypoint()const { #warning This too! @@ -187,8 +188,8 @@ Widget_Waypoint::get_waypoint()const waypoint.set_value(value_widget->get_value()); //int i; - waypoint.set_before((sinfg::Waypoint::Interpolation)before->get_history()); - waypoint.set_after((sinfg::Waypoint::Interpolation)after->get_history()); + waypoint.set_before((synfig::Waypoint::Interpolation)before->get_history()); + waypoint.set_after((synfig::Waypoint::Interpolation)after->get_history()); waypoint.set_tension(adj_tension.get_value()); waypoint.set_continuity(adj_continuity.get_value());