Author: Carlos Lopez <[email protected]>
Date: Thu Jul 21 19:09:51 2011 +0200
Remove homogeneous parameter from Advanced Outline Layer since it is only an
internal WPList optiion
---
.../src/modules/mod_geometry/advanced_outline.cpp | 50 --------------------
.../src/modules/mod_geometry/advanced_outline.h | 2 -
2 files changed, 0 insertions(+), 52 deletions(-)
diff --git a/synfig-core/src/modules/mod_geometry/advanced_outline.cpp
b/synfig-core/src/modules/mod_geometry/advanced_outline.cpp
index 21becd9..392ac16 100644
--- a/synfig-core/src/modules/mod_geometry/advanced_outline.cpp
+++ b/synfig-core/src/modules/mod_geometry/advanced_outline.cpp
@@ -78,7 +78,6 @@ Advanced_Outline::Advanced_Outline()
width_=1.0f;
expand_=0;
smoothness_=0.5;
- homogeneous_=false;
clear();
vector<BLinePoint> bline_point_list;
@@ -491,7 +490,6 @@ Advanced_Outline::set_param(const String & param, const
ValueBase &value)
wplist_=value;
return true;
}
- IMPORT_AS(homogeneous_, "homogeneous");
if(param=="vector_list")
return false;
return Layer_Polygon::set_param(param,value);
@@ -522,7 +520,6 @@ Advanced_Outline::get_param(const String& param)const
EXPORT_AS(end_tip_,"end_tip");
EXPORT_AS(width_, "width");
EXPORT_AS(wplist_, "wplist");
- EXPORT_AS(homogeneous_,"homogeneous");
EXPORT_NAME();
EXPORT_VERSION();
if(param=="vector_list")
@@ -587,10 +584,6 @@ Advanced_Outline::get_param_vocab()const
.set_origin("origin")
.set_description(_("List of width Points that defines the
variable width"))
);
- ret.push_back(ParamDesc("homogeneous")
- .set_local_name(_("Homogeneous"))
- .set_description(_("When checked the position is bline length
based"))
- );
return ret;
}
@@ -603,11 +596,6 @@ Advanced_Outline::connect_dynamic_param(const String&
param, etl::loose_handle<V
if(!connect_bline_to_wplist(x))
synfig::warning("Advanced Outline: WPList doesn't
accept new bline");
}
- if(param=="homogeneous")
- {
- if(!connect_homogeneous_to_wplist(x))
- synfig::warning("Advanced Outline: WPList doesn't
accept new homogeneous");
- }
if(param=="wplist")
{
if(Layer::connect_dynamic_param(param, x))
@@ -623,17 +611,6 @@ Advanced_Outline::connect_dynamic_param(const String&
param, etl::loose_handle<V
synfig::warning("Advanced Outline: WPList
doesn't accept new bline");
return false;
}
- iter=dynamic_param_list().find("homogeneous");
- if(iter==dynamic_param_list().end())
- {
- synfig::warning("Homogenous doesn't exist
yet!!");
- return false;
- }
- else if(!connect_homogeneous_to_wplist(iter->second))
- {
- synfig::warning("Advanced Outline: WPList
doesn't accept new homogeneous");
- return false;
- }
return true;
}
else
@@ -675,33 +652,6 @@
Advanced_Outline::connect_bline_to_wplist(etl::loose_handle<ValueNode> x)
return true;
}
-bool
-Advanced_Outline::connect_homogeneous_to_wplist(etl::loose_handle<ValueNode> x)
-{
- if(x->get_type() != ValueBase::TYPE_BOOL)
- {
- synfig::info("Not a bool");
- return false;
- }
- ValueNode::LooseHandle vnode;
- DynamicParamList::const_iterator
iter(dynamic_param_list().find("wplist"));
- if(iter==dynamic_param_list().end())
- {
- synfig::warning("WPList doesn't exist yet");
- return false;
- }
- ValueNode_WPList::Handle
wplist(ValueNode_WPList::Handle::cast_dynamic(iter->second));
- if(!wplist)
- {
- synfig::info("WPList is not ready: NULL");
- return false;
- }
- if(!wplist->link_count())
-
synfig::warning("Advanced_Outline::connect_homogeneous_to_wplist:
WPList::link_count()=0");
- wplist->set_homogeneous(ValueNode::Handle(x));
- return true;
-}
-
Real
Advanced_Outline::bline_to_bezier(Real bline_pos, Real origin, Real
bezier_size)
diff --git a/synfig-core/src/modules/mod_geometry/advanced_outline.h
b/synfig-core/src/modules/mod_geometry/advanced_outline.h
index d634774..d4702f3 100644
--- a/synfig-core/src/modules/mod_geometry/advanced_outline.h
+++ b/synfig-core/src/modules/mod_geometry/advanced_outline.h
@@ -58,7 +58,6 @@ private:
synfig::Real width_;
synfig::Real expand_;
Real smoothness_;
- bool homogeneous_;
public:
enum CuspType
@@ -82,7 +81,6 @@ public:
private:
bool connect_bline_to_wplist(etl::loose_handle<ValueNode> x);
- bool connect_homogeneous_to_wplist(etl::loose_handle<ValueNode> x);
Real bline_to_bezier(Real bline_pos, Real origin, Real bezier_size);
Real bezier_to_bline(Real bezier_pos, Real origin, Real bezier_size);
void add_tip(std::vector<Point> &side_a, std::vector<Point> &side_b,
const Point vertex, const Vector tangent, const WidthPoint wp);
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
