projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an "encapsulate" button to the layer dialog. Can someone design a better icon...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_segcalctangent.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
index
bb012b5
..
2159663
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
@@
-6,7
+6,7
@@
**
** \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 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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-59,7
+59,7
@@
ValueNode_SegCalcTangent::ValueNode_SegCalcTangent(const ValueBase::Type &x):
LinkableValueNode(x)
{
if(x!=ValueBase::TYPE_VECTOR)
LinkableValueNode(x)
{
if(x!=ValueBase::TYPE_VECTOR)
- throw Exception::BadType(ValueBase::type_name(x));
+ throw Exception::BadType(ValueBase::type_
local_
name(x));
set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT));
set_link("amount",ValueNode_Const::create(Real(0.5)));
set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT));
set_link("amount",ValueNode_Const::create(Real(0.5)));
@@
-112,20
+112,14
@@
ValueNode_SegCalcTangent::check_type(ValueBase::Type type)
}
bool
}
bool
-ValueNode_SegCalcTangent::set_link_vfunc(int i,ValueNode::Handle
x
)
+ValueNode_SegCalcTangent::set_link_vfunc(int i,ValueNode::Handle
value
)
{
{
- assert(i==0 || i==1);
- if(i==0)
- {
- segment_=x;
- signal_child_changed()(i);signal_value_changed()();
- return true;
- }
- if(i==1)
+ assert(i>=0 && i<link_count());
+
+ switch(i)
{
{
- amount_=x;
- signal_child_changed()(i);signal_value_changed()();
- return true;
+ case 0: CHECK_TYPE_AND_SET_VALUE(segment_, ValueBase::TYPE_SEGMENT);
+ case 1: CHECK_TYPE_AND_SET_VALUE(amount_, ValueBase::TYPE_REAL);
}
return false;
}
}
return false;
}
@@
-133,7
+127,8
@@
ValueNode_SegCalcTangent::set_link_vfunc(int i,ValueNode::Handle x)
ValueNode::LooseHandle
ValueNode_SegCalcTangent::get_link_vfunc(int i)const
{
ValueNode::LooseHandle
ValueNode_SegCalcTangent::get_link_vfunc(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return segment_;
if(i==1)
if(i==0)
return segment_;
if(i==1)
@@
-151,7
+146,8
@@
ValueNode_SegCalcTangent::link_count()const
String
ValueNode_SegCalcTangent::link_name(int i)const
{
String
ValueNode_SegCalcTangent::link_name(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return "segment";
if(i==1)
if(i==0)
return "segment";
if(i==1)
@@
-162,7
+158,8
@@
ValueNode_SegCalcTangent::link_name(int i)const
String
ValueNode_SegCalcTangent::link_local_name(int i)const
{
String
ValueNode_SegCalcTangent::link_local_name(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return _("Segment");
if(i==1)
if(i==0)
return _("Segment");
if(i==1)