Module: synfig/synfig
Branch: genete_width_outline
Commit: f06dc96c27c143a27a4be62df5b124cc14af1277
URL:    
http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig/synfig;a=commit;h=f06dc96c27c143a27a4be62df5b124cc14af1277

Author: Carlos Lopez <[email protected]>
Date:   Wed Jan 26 21:36:29 2011 +0100

Get ride of Hidden Vertex since it is not longer needed.

---

 synfig-core/src/synfig/loadcanvas.cpp          |   21 ---------------------
 synfig-core/src/synfig/savecanvas.cpp          |    1 -
 synfig-core/src/synfig/valuenode_composite.cpp |   11 +----------
 synfig-core/src/synfig/widthpoint.cpp          |   13 -------------
 synfig-core/src/synfig/widthpoint.h            |    3 ---
 5 files changed, 1 insertions(+), 48 deletions(-)

diff --git a/synfig-core/src/synfig/loadcanvas.cpp 
b/synfig-core/src/synfig/loadcanvas.cpp
index cb0eae5..9196eae 100644
--- a/synfig-core/src/synfig/loadcanvas.cpp
+++ b/synfig-core/src/synfig/loadcanvas.cpp
@@ -923,27 +923,6 @@ CanvasParser::parse_width_point(xmlpp::Element *element)
                        
ret.set_side_type_after(parse_integer(dynamic_cast<xmlpp::Element*>(*iter)));
                }
                else
-               // Hidden vertex
-               if(child->get_name()=="hidden_vertex")
-               {
-                       xmlpp::Element::NodeList list = child->get_children();
-                       xmlpp::Element::NodeList::iterator iter;
-                       // Search for the first non-text XML element
-                       for(iter = list.begin(); iter != list.end(); ++iter)
-                               if(dynamic_cast<xmlpp::Element*>(*iter)) break;
-                       if(iter==list.end())
-                       {
-                               error(element, "Undefined value in 
<hidden_vertex>");
-                               continue;
-                       }
-                       if((*iter)->get_name()!="vector")
-                       {
-                               
error_unexpected_element((*iter),(*iter)->get_name(),"vector");
-                               continue;
-                       }
-                       
ret.set_hidden_vertex(parse_vector(dynamic_cast<xmlpp::Element*>(*iter)));
-               }
-               else
                        error_unexpected_element(child,child->get_name());
        }
        return ret;
diff --git a/synfig-core/src/synfig/savecanvas.cpp 
b/synfig-core/src/synfig/savecanvas.cpp
index 50e8d49..71d19b7 100644
--- a/synfig-core/src/synfig/savecanvas.cpp
+++ b/synfig-core/src/synfig/savecanvas.cpp
@@ -201,7 +201,6 @@ xmlpp::Element* encode_width_point(xmlpp::Element* 
root,WidthPoint width_point)
        
encode_real(root->add_child("width")->add_child("real"),width_point.get_width());
        
encode_integer(root->add_child("side_before")->add_child("integer"),width_point.get_side_type_before());
        
encode_integer(root->add_child("side_after")->add_child("integer"),width_point.get_side_type_after());
-       
encode_vector(root->add_child("hidden_vertex")->add_child("vector"),width_point.get_hidden_vertex());
        return root;
 }
 
diff --git a/synfig-core/src/synfig/valuenode_composite.cpp 
b/synfig-core/src/synfig/valuenode_composite.cpp
index 97d38c7..93af850 100644
--- a/synfig-core/src/synfig/valuenode_composite.cpp
+++ b/synfig-core/src/synfig/valuenode_composite.cpp
@@ -98,7 +98,6 @@ synfig::ValueNode_Composite::ValueNode_Composite(const 
ValueBase &value):
                        
set_link("width",ValueNode_Const::create(wpoint.get_width()));
                        
set_link("side_before",ValueNode_Const::create(wpoint.get_side_type_before()));
                        
set_link("side_after",ValueNode_Const::create(wpoint.get_side_type_after()));
-                       set_link("hidden_vertex", 
ValueNode_Const::create(wpoint.get_hidden_vertex()));
                        break;
                }
                default:
@@ -176,12 +175,11 @@ synfig::ValueNode_Composite::operator()(Time t)const
                case ValueBase::TYPE_WIDTHPOINT:
                {
                        WidthPoint ret;
-                       assert(components[0] && components[1] && components[2] 
&& components[3] && components[4]);
+                       assert(components[0] && components[1] && components[2] 
&& components[3]);
                        ret.set_position((*components[0])(t).get(Real()));
                        ret.set_width((*components[1])(t).get(Real()));
                        
ret.set_side_type_before((*components[2])(t).get(int()));
                        ret.set_side_type_after((*components[3])(t).get(int()));
-                       
ret.set_hidden_vertex((*components[4])(t).get(Vector()));
                        return ret;
                }
                default:
@@ -351,8 +349,6 @@ ValueNode_Composite::get_link_index_from_name(const String 
&name)const
                        return 2;
                if(name=="side_after")
                        return 3;
-               if(name=="hidden_vertex")
-                       return 4;
        default:
                break;
        }
@@ -492,11 +488,6 @@ ValueNode_Composite::get_children_vocab_vfunc()const
                        .add_enum_value(WidthPoint::TYPE_SQUARED,"squared", 
_("Squared Stop"))
                        .add_enum_value(WidthPoint::TYPE_PEAK,"peak", _("Peak 
Stop"))
                );
-               ret.push_back(ParamDesc(ValueBase(),"hidden_vertex")
-                       .set_local_name(_("Hidden Vertex"))
-                       .set_description(_("The calculated vertex that lies on 
the BLine"))
-                       .hidden()
-               );
                return ret;
        default:
                break;
diff --git a/synfig-core/src/synfig/widthpoint.cpp 
b/synfig-core/src/synfig/widthpoint.cpp
index 4ca95cc..e0afdbd 100644
--- a/synfig-core/src/synfig/widthpoint.cpp
+++ b/synfig-core/src/synfig/widthpoint.cpp
@@ -126,16 +126,3 @@ WidthPoint::get_side_type(int i)
 {
        return i>0? side_type_[1]: side_type_[0];
 }
-
-const Vector&
-WidthPoint::get_hidden_vertex()const
-{
-       return hidden_vertex_;
-}
-
-void
-WidthPoint::set_hidden_vertex(Vector x)
-{
-       hidden_vertex_[0]=x[0];
-       hidden_vertex_[1]=x[1];
-}
diff --git a/synfig-core/src/synfig/widthpoint.h 
b/synfig-core/src/synfig/widthpoint.h
index ee1c702..74f607f 100644
--- a/synfig-core/src/synfig/widthpoint.h
+++ b/synfig-core/src/synfig/widthpoint.h
@@ -46,7 +46,6 @@ private:
        Real position_;
        Real width_;
        int side_type_[2]; // Before [0] and After[1] side types
-       Vector hidden_vertex_;
 
 public:
 
@@ -75,8 +74,6 @@ public:
        int get_side_type_after();
        void set_side_type_after(int sideafter);
        int get_side_type(int i);
-       const Vector& get_hidden_vertex()const;
-       void set_hidden_vertex(Vector hv);
        bool operator < (const WidthPoint& rhs) { return position_  < 
rhs.position_; }
 
 }; // END of class WidthPoint


------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl

Reply via email to