add Group::clear(), do not clear _canvas member of Item when unparented (only the...

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index dddb1ee426a09c8b281de5c05529605bac582de4..27b5aac974997aa84bfd68d1d9b6e9efb8314cb4 100644 (file)
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -25,42 +25,30 @@
 
 using namespace std;
 
-#define MAX_CACHED_LINES 128
-
 TempoLines::TempoLines (ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height)
        : _canvas (canvas)
-       , _group(group)
-       , _clean_left(DBL_MAX)
-       , _clean_right(0.0)
-       , _height(screen_height)
+       , _group (group)
+       , _height (screen_height)
 {
 }
 
 void
 TempoLines::tempo_map_changed()
 {
-       _clean_left = DBL_MAX;
-       _clean_right = 0.0;
-
-       double_t d = 1.0;
-       // TODO: Dirty/slow, but 'needed' for zoom :(
-       for (Lines::iterator i = _lines.begin(); i != _lines.end(); d += 1.0) {
-               Lines::iterator next = i;
-               ++next;
-               i->second->set_x0 (-d);
-               i->second->set_x1 (-d);
-               ArdourCanvas::Line* f = i->second;
-               _lines.erase(i);
-               _lines.insert(make_pair(- d, f));
-               i = next;
-       }
+       /* remove all lines from the group, put them in the cache (to avoid
+        * unnecessary object destruction+construction later), and clear _lines
+        */
+        
+       _group->clear ();
+       _cache.insert (_cache.end(), _lines.begin(), _lines.end());
+       _lines.clear ();
 }
 
 void
 TempoLines::show ()
 {
        for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
-               i->second->show();
+               (*i)->show();
        }
 }
 
@@ -68,7 +56,7 @@ void
 TempoLines::hide ()
 {
        for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
-               i->second->hide();
+               (*i)->hide();
        }
 }
 
@@ -78,18 +66,13 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
                  double samples_per_pixel)
 {
        ARDOUR::TempoMap::BBTPointList::const_iterator i;
-       ArdourCanvas::Line *line = 0;
-       gdouble xpos;
+       ArdourCanvas::Rect const visible = _canvas.visible_area ();
        double  beat_density;
 
        uint32_t beats = 0;
        uint32_t bars = 0;
        uint32_t color;
 
-       const size_t needed = distance (begin, end);
-
-       ArdourCanvas::Rect const visible = _canvas.visible_area ();
-
        /* get the first bar spacing */
 
        i = end;
@@ -105,31 +88,7 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
                return;
        }
 
-       xpos = rint(((framepos_t)(*i).frame) / (double)samples_per_pixel);
-       const double needed_right = xpos;
-
-       i = begin;
-
-       xpos = rint(((framepos_t)(*i).frame) / (double)samples_per_pixel);
-       const double needed_left = xpos;
-
-       Lines::iterator left = _lines.lower_bound(xpos); // first line >= xpos
-
-       bool exhausted = (left == _lines.end());
-       Lines::iterator li = left;
-       if (li != _lines.end())
-               line = li->second;
-
-       // Tempo map hasn't changed and we're entirely within a clean
-       // range, don't need to do anything.  Yay.
-       if (needed_left >= _clean_left && needed_right <= _clean_right) {
-               // cerr << endl << "*** LINE CACHE PERFECT HIT" << endl;
-               return;
-       }
-
-       // cerr << endl << "*** LINE CACHE MISS" << endl;
-
-       bool invalidated = false;
+       tempo_map_changed ();
 
        for (i = begin; i != end; ++i) {
 
@@ -142,109 +101,24 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
                        color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBeat();
                }
 
-               xpos = rint(((framepos_t)(*i).frame) / (double)samples_per_pixel);
-
-               li = _lines.lower_bound(xpos); // first line >= xpos
-
-               line = (li != _lines.end()) ? li->second : 0;
-               assert(!line || line->x0() == li->first);
-               
-               Lines::iterator next = li;
-               if (next != _lines.end())
-                       ++next;
-               
-               exhausted = (next == _lines.end());
-
-               // Hooray, line is perfect
-               if (line && line->x0() == xpos) {
-                       if (li != _lines.end())
-                               ++li;
-                       
-                       line->set_outline_color (color);
-
-                       // Use existing line, moving if necessary
-               } else if (!exhausted) {
-                       Lines::iterator steal = _lines.end();
-                       --steal;
-                       
-                       // Steal from the right
-                       if (left->first > needed_left && li != steal && steal->first > needed_right) {
-                               // cerr << "*** STEALING FROM RIGHT" << endl;
-                               double const x = steal->first;
-                               line = steal->second;
-                               _lines.erase(steal);
-                               line->set_x0 (xpos);
-                               line->set_x1 (xpos);
-                               line->set_outline_color (color);
-                               _lines.insert(make_pair(xpos, line));
-                               invalidated = true;
-                               
-                               // Shift clean range left
-                               _clean_left = min(_clean_left, xpos);
-                               _clean_right = min(_clean_right, x);
-                               
-                               // Move this line to where we need it
-                       } else {
-                               Lines::iterator existing = _lines.find(xpos);
-                               if (existing != _lines.end()) {
-                                       //cout << "*** EXISTING LINE" << endl;
-                                       li = existing;
-                                       li->second->set_outline_color (color);
-                               } else {
-                                       //cout << "*** MOVING LINE" << endl;
-                                       const double x1 = line->x0();
-                                       const bool was_clean = x1 >= _clean_left && x1 <= _clean_right;
-                                       invalidated = invalidated || was_clean;
-                                       // Invalidate clean portion (XXX: too harsh?)
-                                       _clean_left  = needed_left;
-                                       _clean_right = needed_right;
-                                       _lines.erase(li);
-                                       line->set_outline_color (color);
-                                       line->set_x0 (xpos);
-                                       line->set_x1 (xpos);
-                                       _lines.insert(make_pair(xpos, line));
-                               }
-                       }
-                       
-                       // Create a new line
-               } else if (_lines.size() < needed || _lines.size() < MAX_CACHED_LINES) {
-                       // cerr << "*** CREATING LINE" << endl;
-                       /* if we already have a line there ... don't sweat it */
-                       if (_lines.find (xpos) == _lines.end()) {
-                               line = new ArdourCanvas::Line (_group);
-                               line->set_x0 (xpos);
-                               line->set_x1 (xpos);
-                               line->set_y0 (0.0);
-                               line->set_y1 (ArdourCanvas::COORD_MAX);
-                               line->set_outline_color (color);
-                               _lines.insert(make_pair(xpos, line));
-                       }
-                       
-                       // Steal from the left
+               ArdourCanvas::Coord xpos = rint(((framepos_t)(*i).frame) / (double)samples_per_pixel);
+
+               ArdourCanvas::Line* line;
+
+               if (!_cache.empty()) {
+                       line = _cache.back ();
+                       _cache.pop_back ();
+                       line->reparent (_group);
                } else {
-                       // cerr << "*** STEALING FROM LEFT" << endl;
-                       if (_lines.find (xpos) == _lines.end()) {
-                               Lines::iterator steal = _lines.begin();
-                               double const x = steal->first;
-                               line = steal->second;
-                               _lines.erase(steal);
-                               line->set_outline_color (color);
-                               line->set_x0 (xpos);
-                               line->set_x1 (xpos);
-                               _lines.insert(make_pair(xpos, line));
-                               invalidated = true;
-                       
-                               // Shift clean range right
-                               _clean_left = max(_clean_left, x);
-                               _clean_right = max(_clean_right, xpos);
-                       }
+                       line = new ArdourCanvas::Line (_group);
                }
-       }
 
-       // Extend range to what we've 'fixed'
-       if (!invalidated) {
-               _clean_left  = min(_clean_left, needed_left);
-               _clean_right = max(_clean_right, needed_right);
+               line->set_x0 (xpos);
+               line->set_x1 (xpos);
+               line->set_y0 (0.0);
+               line->set_y1 (_height);
+               line->set_outline_color (color);
+               line->show ();
        }
 }
 

diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h
index a0c76505162f9a2170b924d5cc57093f09dc86d3..f4ee293e29118694f292813d0513094721992d8d 100644 (file)
--- a/gtk2_ardour/tempo_lines.h
+++ b/gtk2_ardour/tempo_lines.h
@@ -19,39 +19,29 @@
 #ifndef __ardour_tempo_lines_h__
 #define __ardour_tempo_lines_h__
 
-#include <map>
-#include <boost/pool/pool.hpp>
-#include <boost/pool/pool_alloc.hpp>
+#include <list>
 #include "ardour/tempo.h"
 
-typedef boost::fast_pool_allocator<
-               std::pair<const double, ArdourCanvas::Line*>,
-               boost::default_user_allocator_new_delete,
-               boost::details::pool::null_mutex,
-               8192>
-       MapAllocator;
-
 class TempoLines {
 public:
        TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height);
 
        void tempo_map_changed();
 
-       void draw(const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, 
-                 const ARDOUR::TempoMap::BBTPointList::const_iterator& end, 
-                 double frames_per_unit);
+       void draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, 
+                  const ARDOUR::TempoMap::BBTPointList::const_iterator& end, 
+                  double frames_per_unit);
 
        void show();
        void hide();
 
 private:
-       typedef std::map<double, ArdourCanvas::Line*, std::less<double>, MapAllocator> Lines;
+        typedef std::list<ArdourCanvas::Line*> Lines;
        Lines _lines;
+        Lines _cache;
 
         ArdourCanvas::Canvas& _canvas;
        ArdourCanvas::Group*  _group;
-       double                _clean_left;
-       double                _clean_right;
        double                _height;
 };
 

diff --git a/libs/canvas/canvas/group.h b/libs/canvas/canvas/group.h
index 8dee5f267261bae2b4274df707f25142a8207b73..236880a906267f97ff2fd851a2f28c2aa953d8e8 100644 (file)
--- a/libs/canvas/canvas/group.h
+++ b/libs/canvas/canvas/group.h
@@ -40,6 +40,7 @@ public:
 
        void add (Item *);
        void remove (Item *);
+        void clear (bool with_delete = false);
        std::list<Item*> const & items () const {
                return _items;
        }

diff --git a/libs/canvas/group.cc b/libs/canvas/group.cc
index 907282f9cd8a74634ae6426f29b4ddc235bb6e83..fe783ad8b50c090ade5e31649a75dcce866c46d8 100644 (file)
--- a/libs/canvas/group.cc
+++ b/libs/canvas/group.cc
@@ -170,6 +170,8 @@ Group::compute_bounding_box () const
 void
 Group::add (Item* i)
 {
+       /* XXX should really notify canvas about this */
+
        _items.push_back (i);
        invalidate_lut ();
        _bounding_box_dirty = true;
@@ -180,11 +182,40 @@ Group::add (Item* i)
 void
 Group::remove (Item* i)
 {
+
+       if (i->parent() != this) {
+               return;
+       }
+
+       begin_change ();
+
+       i->unparent ();
        _items.remove (i);
        invalidate_lut ();
        _bounding_box_dirty = true;
        
-       DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: group remove\n");
+       end_change ();
+}
+
+void
+Group::clear (bool with_delete)
+{
+       begin_change ();
+
+       for (list<Item*>::iterator i = _items.begin(); i != _items.end(); ++i) {
+               if (with_delete) {
+                       delete *i;
+               } else {
+                       (*i)->unparent ();
+               }
+       }
+
+       _items.clear ();
+
+       invalidate_lut ();
+       _bounding_box_dirty = true;
+
+       end_change ();
 }
 
 void

diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc
index f5aa39d20df6292decea44e107e7f774d4e3790c..786c2f81cdc4d9262e6840b6fc761023506c57b7 100644 (file)
--- a/libs/canvas/item.cc
+++ b/libs/canvas/item.cc
@@ -236,13 +236,14 @@ Item::parent_to_item (ArdourCanvas::Rect const & d) const
 void
 Item::unparent ()
 {
-       _canvas = 0;
        _parent = 0;
 }
 
 void
 Item::reparent (Group* new_parent)
 {
+       assert (_canvas == _parent->canvas ());
+
        if (_parent) {
                _parent->remove (this);
        }
@@ -250,7 +251,6 @@ Item::reparent (Group* new_parent)
        assert (new_parent);
 
        _parent = new_parent;
-       _canvas = _parent->canvas ();
        _parent->add (this);
 }