Removed a bunch more DEBUGPOINT()s.

[synfig.git] / synfig-core / trunk / src / synfig / layer_pastecanvas.cpp

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index 4cfa767..7d8fbea 100644 (file)
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file layer_pastecanvas.cpp
-**     \brief Template Header
+**     \brief Implementation of the "Paste Canvas" layer
 **
 **     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 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
@@ -69,9 +70,9 @@ public:
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_LAYER_INIT(Layer_PasteCanvas);
-SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas");
-SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas"));
-SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Default"));
+SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas"); // todo: use paste_canvas
+SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,N_("Paste Canvas"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,N_("Other"));
 SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1");
 SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$");
 
@@ -146,16 +147,32 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
 {
        IMPORT(origin);
 
-       if(param=="canvas" && value.same_as(Canvas::Handle()))
+       // IMPORT(canvas);
+       if(param=="canvas" && value.same_type_as(Canvas::Handle()))
        {
                set_sub_canvas(value.get(Canvas::Handle()));
                return true;
        }
 
-//     IMPORT(canvas);
+       //! \todo this introduces bug 1844764 if enabled; it was introduced in r954, but I can't see if it's useful
+#if 0
+       if (param=="time_offset" && value.same_type_as(time_offset))
+       {
+               if (time_offset != value.get(Time()))
+               {
+                       value.put(&time_offset);
+                       // notify that the time_offset has changed so we can update the
+                       // waypoint positions in parent layers
+                       changed();
+               }
+               return true;
+       }
+#else
+       IMPORT(time_offset);
+#endif
+
        IMPORT(children_lock);
        IMPORT(zoom);
-       IMPORT(time_offset);
 
        return Layer_Composite::set_param(param,value);
 }
@@ -231,7 +248,7 @@ Layer_PasteCanvas::set_time(Context context, Time time)const
        context.set_time(time);
        if(canvas)
        {
-               canvas->set_time(time);
+               canvas->set_time(time+time_offset);
 
                bounds=(canvas->get_context().get_full_bounding_rect()-canvas->rend_desc().get_focus())*exp(zoom)+origin+canvas->rend_desc().get_focus();
        }
@@ -280,7 +297,6 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 
        if(depth==MAX_DEPTH)
        {
-               DEBUGPOINT();
                // if we are at the extent of our depth,
                // then we should just return whatever is under us.
                return context.accelerated_render(surface,quality,renddesc,cb);
@@ -358,7 +374,9 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 
                Surface pastesurface;
 
-               if(area.area()<=0.000001 || desc.get_w()==0 || desc.get_h()==0)
+               // \todo this used to also have "area.area()<=0.000001 || " - is it useful?
+               //               it was causing bug #1809480 (Zoom in beyond 8.75 in nested canvases fails)
+               if(desc.get_w()==0 || desc.get_h()==0)
                {
                        if(cb && !cb->amount_complete(10000,10000)) return false;
 
@@ -407,16 +425,17 @@ void Layer_PasteCanvas::get_times_vfunc(Node::time_set &set) const
        Node::time_set tset;
        if(canvas) tset = canvas->get_times();
 
-       Node::time_set::iterator        i = tset.begin(),
-                                                                       end = tset.end();
+       Node::time_set::iterator i = tset.begin(), end = tset.end();
 
        //Make sure we offset the time...
-       //TODO: SOMETHING STILL HAS TO BE DONE WITH THE OTHER DIRECTION
-       //              (recursing down the tree needs to take this into account too...)
+       //! \todo: SOMETHING STILL HAS TO BE DONE WITH THE OTHER DIRECTION
+       //                 (recursing down the tree needs to take this into account too...)
        for(; i != end; ++i)
-       {
-               set.insert(*i + time_offset);
-       }
+               set.insert(*i
+#ifdef ADJUST_WAYPOINTS_FOR_TIME_OFFSET // see node.h
+                                  - time_offset
+#endif
+                       );
 
        Layer::get_times_vfunc(set);
 }