projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give the text tool a name for the tooltip and 'state' menu. Let's call it... "Text...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_sine.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_sine.cpp
b/synfig-core/trunk/src/synfig/valuenode_sine.cpp
index
09b547c
..
9ebd3ac
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_sine.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_sine.cpp
@@
-1,11
+1,12
@@
/* === S Y N F I G ========================================================= */
/*! \file valuenode_sine.cpp
/* === S Y N F I G ========================================================= */
/*! \file valuenode_sine.cpp
-** \brief
Template File
+** \brief
Implementation of the "Sine" valuenode conversion.
**
**
-** $Id
: valuenode_sine.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** 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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-49,26
+50,32
@@
using namespace synfig;
/* === M E T H O D S ======================================================= */
/* === M E T H O D S ======================================================= */
-ValueNode_Sine::ValueNode_Sine(const ValueBase
::Type &x
):
- LinkableValueNode(
x
)
+ValueNode_Sine::ValueNode_Sine(const ValueBase
&value
):
+ LinkableValueNode(
value.get_type()
)
{
{
- switch(
x
)
+ switch(
value.get_type()
)
{
case ValueBase::TYPE_REAL:
{
case ValueBase::TYPE_REAL:
- set_link("angle",ValueNode_Const::create(Angle::
zero(
)));
- set_link("amp",ValueNode_Const::create(
Real(1
)));
+ set_link("angle",ValueNode_Const::create(Angle::
deg(90
)));
+ set_link("amp",ValueNode_Const::create(
value.get(Real()
)));
break;
default:
break;
default:
- throw Exception::BadType(ValueBase::type_
name(x
));
+ throw Exception::BadType(ValueBase::type_
local_name(value.get_type()
));
}
DCAST_HACK_ENABLE();
}
}
DCAST_HACK_ENABLE();
}
+LinkableValueNode*
+ValueNode_Sine::create_new()const
+{
+ return new ValueNode_Sine(get_type());
+}
+
ValueNode_Sine*
ValueNode_Sine::create(const ValueBase &x)
{
ValueNode_Sine*
ValueNode_Sine::create(const ValueBase &x)
{
- return new ValueNode_Sine(x
.get_type()
);
+ return new ValueNode_Sine(x);
}
ValueNode_Sine::~ValueNode_Sine()
}
ValueNode_Sine::~ValueNode_Sine()
@@
-98,7
+105,7
@@
ValueNode_Sine::get_local_name()const
{
return _("Sine");
}
{
return _("Sine");
}
-
+
bool
ValueNode_Sine::check_type(ValueBase::Type type)
{
bool
ValueNode_Sine::check_type(ValueBase::Type type)
{
@@
-106,20
+113,14
@@
ValueNode_Sine::check_type(ValueBase::Type type)
}
bool
}
bool
-ValueNode_Sine::set_link_vfunc(int i,ValueNode::Handle
x
)
+ValueNode_Sine::set_link_vfunc(int i,ValueNode::Handle
value
)
{
{
- assert(i==0 || i==1);
- if(i==0)
- {
- angle_=x;
- signal_child_changed()(i);signal_value_changed()();
- return true;
- }
- if(i==1)
+ assert(i>=0 && i<link_count());
+
+ switch(i)
{
{
- amp_=x;
- signal_child_changed()(i);signal_value_changed()();
- return true;
+ case 0: CHECK_TYPE_AND_SET_VALUE(angle_, ValueBase::TYPE_ANGLE);
+ case 1: CHECK_TYPE_AND_SET_VALUE(amp_, ValueBase::TYPE_REAL);
}
return false;
}
}
return false;
}
@@
-127,7
+128,8
@@
ValueNode_Sine::set_link_vfunc(int i,ValueNode::Handle x)
ValueNode::LooseHandle
ValueNode_Sine::get_link_vfunc(int i)const
{
ValueNode::LooseHandle
ValueNode_Sine::get_link_vfunc(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return angle_;
if(i==1)
if(i==0)
return angle_;
if(i==1)
@@
-145,7
+147,8
@@
ValueNode_Sine::link_count()const
String
ValueNode_Sine::link_name(int i)const
{
String
ValueNode_Sine::link_name(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return "angle";
if(i==1)
if(i==0)
return "angle";
if(i==1)
@@
-156,7
+159,8
@@
ValueNode_Sine::link_name(int i)const
String
ValueNode_Sine::link_local_name(int i)const
{
String
ValueNode_Sine::link_local_name(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return _("Angle");
if(i==1)
if(i==0)
return _("Angle");
if(i==1)
@@
-171,12
+175,6
@@
ValueNode_Sine::get_link_index_from_name(const String &name)const
return 0;
if(name=="amp")
return 1;
return 0;
if(name=="amp")
return 1;
-
- throw Exception::BadLinkName(name);
-}
-LinkableValueNode*
-ValueNode_Sine::create_new()const
-{
- return new ValueNode_Sine(get_type());
+ throw Exception::BadLinkName(name);
}
}