merged with latest version of lpe-bool and trunk

(bzr r14862.2.3)

1 files changed, 30 insertions, 393 deletions

diff --git a/src/selection.cpp b/src/selection.cpp
index 6fc426be7..65e0e1e97 100644
--- a/src/selection.cpp
+++ b/src/selection.cpp
@@ -7,8 +7,10 @@
  *   bulia byak <buliabyak@users.sf.net>
  *   Andrius R. <knutux@gmail.com>
  *   Abhishek Sharma
+ *   Adrian Boguszewski
  *
- * Copyright (C)      2006 Andrius R.
+ * Copyright (C) 2016 Adrian Boguszewski
+ * Copyright (C) 2006 Andrius R.
  * Copyright (C) 2004-2005 MenTaLguY
  * Copyright (C) 1999-2002 Lauris Kaplinski
  * Copyright (C) 2001-2002 Ximian, Inc.
@@ -17,38 +19,24 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
 #endif
-#include "macros.h"
+
 #include "inkscape.h"
-#include "document.h"
-#include "layer-model.h"
-#include "selection.h"
-#include <2geom/rect.h>
 #include "xml/repr.h"
 #include "preferences.h"
 
 #include "sp-shape.h"
 #include "sp-path.h"
-#include "sp-item-group.h"
-#include "box3d.h"
-#include "box3d.h"
-#include "persp3d.h"
-
-#include <sigc++/functors/mem_fun.h>
+#include "desktop.h"
+#include "document.h"
 
 #define SP_SELECTION_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE + 1)
 
 namespace Inkscape {
 
-Selection::Selection(LayerModel *layers, SPDesktop *desktop) :
-    _objs(std::list<SPObject*>()),
-    _objs_vector(std::vector<SPObject*>()),
-    _objs_set(std::set<SPObject*>()),
-    _reprs(std::vector<XML::Node*>()),
-    _items(std::vector<SPItem*>()),
+Selection::Selection(LayerModel *layers, SPDesktop *desktop):
+    ObjectSet(desktop),
     _layers(layers),
-    _desktop(desktop),
     _selection_context(NULL),
     _flags(0),
     _idle(0)
@@ -56,7 +44,6 @@ Selection::Selection(LayerModel *layers, SPDesktop *desktop) :
 }
 
 Selection::~Selection() {
-    _clear();
     _layers = NULL;
     if (_idle) {
         g_source_remove(_idle);
@@ -76,8 +63,7 @@ void Selection::_schedule_modified(SPObject */*obj*/, guint flags) {
     this->_flags |= flags;
 }
 
-gboolean
-Selection::_emit_modified(Selection *selection)
+gboolean Selection::_emit_modified(Selection *selection)
 {
     /* force new handler to be created if requested before we return */
     selection->_idle = 0;
@@ -110,8 +96,7 @@ void Selection::_emitChanged(bool persist_selection_context/* = false */) {
     _changed_signal.emit(this);
 }
 
-void
-Selection::_releaseContext(SPObject *obj)
+void Selection::_releaseContext(SPObject *obj)
 {
     if (NULL == _selection_context || _selection_context != obj)
         return;
@@ -122,344 +107,10 @@ Selection::_releaseContext(SPObject *obj)
     _selection_context = NULL;
 }
 
-void Selection::_invalidateCachedLists() {
-    _items.clear();
-    _reprs.clear();
-    _objs_vector.clear();
-}
-
-void Selection::_clear() {
-    _invalidateCachedLists();
-    while (!_objs.empty()) {
-        SPObject *obj=_objs.front();
-        _remove(obj);
-    }
-}
-
 SPObject *Selection::activeContext() {
     if (NULL != _selection_context)
         return _selection_context;
     return _layers->currentLayer();
-    }
-
-bool Selection::includes(SPObject *obj) const {
-    if (obj == NULL)
-        return FALSE;
-
-    g_return_val_if_fail(SP_IS_OBJECT(obj), FALSE);
-
-    return ( _objs_set.find(obj)!=_objs_set.end() );
-}
-
-void Selection::add(SPObject *obj, bool persist_selection_context/* = false */) {
-    g_return_if_fail(obj != NULL);
-    g_return_if_fail(SP_IS_OBJECT(obj));
-    g_return_if_fail(obj->document != NULL);
-
-    if (includes(obj)) {
-        return;
-    }
-
-    _invalidateCachedLists();
-    _add(obj);
-    _emitChanged(persist_selection_context);
-}
-
-void Selection::add_3D_boxes_recursively(SPObject *obj) {
-    std::list<SPBox3D *> boxes = box3d_extract_boxes(obj);
-
-    for (std::list<SPBox3D *>::iterator i = boxes.begin(); i != boxes.end(); ++i) {
-        SPBox3D *box = *i;
-        _3dboxes.push_back(box);
-    }
-}
-
-void Selection::_add(SPObject *obj) {
-    // unselect any of the item's ancestors and descendants which may be selected
-    // (to prevent double-selection)
-    _removeObjectDescendants(obj);
-    _removeObjectAncestors(obj);
-    g_return_if_fail(SP_IS_OBJECT(obj));
-
-    _objs.push_front(obj);
-    _objs_set.insert(obj);
-
-    add_3D_boxes_recursively(obj);
-
-    _release_connections[obj] = obj->connectRelease(sigc::mem_fun(*this, (void (Selection::*)(SPObject *))&Selection::remove));
-    _modified_connections[obj] = obj->connectModified(sigc::mem_fun(*this, &Selection::_schedule_modified));
-}
-
-void Selection::set(SPObject *object, bool persist_selection_context) {
-    _clear();
-    add(object, persist_selection_context);
-}
-
-void Selection::toggle(SPObject *obj) {
-    if (includes (obj)) {
-        remove (obj);
-    } else {
-        add(obj);
-    }
-}
-
-void Selection::remove(SPObject *obj) {
-    g_return_if_fail(obj != NULL);
-    g_return_if_fail(SP_IS_OBJECT(obj));
-    g_return_if_fail(includes(obj));
-
-    _invalidateCachedLists();
-    _remove(obj);
-    _emitChanged();
-}
-
-void Selection::remove_3D_boxes_recursively(SPObject *obj) {
-    std::list<SPBox3D *> boxes = box3d_extract_boxes(obj);
-
-    for (std::list<SPBox3D *>::iterator i = boxes.begin(); i != boxes.end(); ++i) {
-        SPBox3D *box = *i;
-        std::list<SPBox3D *>::iterator b = std::find(_3dboxes.begin(), _3dboxes.end(), box);
-        if (b == _3dboxes.end()) {
-            g_print ("Warning! Trying to remove unselected box from selection.\n");
-            return;
-        }
-        _3dboxes.erase(b);
-    }
-}
-
-void Selection::_remove(SPObject *obj) {
-    _modified_connections[obj].disconnect();
-    _modified_connections.erase(obj);
-
-    _release_connections[obj].disconnect();
-    _release_connections.erase(obj);
-
-    remove_3D_boxes_recursively(obj);
-
-    _objs.remove(obj);
-    _objs_set.erase(obj);
-}
-
-void Selection::setList(std::vector<SPItem*> const &list) {
-    // Clear and add, or just clear with emit.
-    if (!list.empty()) {
-        _clear();
-        addList(list);
-    } else clear();
-}
-
-void Selection::addList(std::vector<SPItem*> const &list) {
-
-    if (list.empty())
-        return;
-
-    _invalidateCachedLists();
-
-    for ( std::vector<SPItem*>::const_iterator iter=list.begin();iter!=list.end(); ++iter) {
-        SPObject *obj = *iter;
-        if (includes(obj)) continue;
-        _add (obj);
-    }
-
-    _emitChanged();
-}
-
-void Selection::setReprList(std::vector<XML::Node*> const &list) {
-    _clear();
-
-    for ( std::vector<XML::Node*>::const_reverse_iterator iter=list.rbegin();iter!=list.rend(); ++iter) {
-        SPObject *obj=_objectForXMLNode(*iter);
-        if (obj) {
-            _add(obj);
-        }
-    }
-
-    _emitChanged();
-}
-
-void Selection::clear() {
-    _clear();
-    _emitChanged();
-}
-
-std::vector<SPObject*> const &Selection::list() {
-    if(!_objs_vector.empty())
-    return _objs_vector;
-
-    for ( std::list<SPObject*>::const_iterator iter=_objs.begin();iter!=_objs.end(); ++iter) {
-            _objs_vector.push_back(*iter);
-    }
-    return _objs_vector;
-
-}
-
-std::vector<SPItem*> const &Selection::itemList() {
-    if (!_items.empty()) {
-        return _items;
-    }
-
-    for ( std::list<SPObject*>::const_iterator iter=_objs.begin();iter!=_objs.end(); ++iter) {
-        SPObject *obj=*iter;
-        if (SP_IS_ITEM(obj)) {
-            _items.push_back(SP_ITEM(obj));
-        }
-    }
-    return _items;
-}
-
-std::vector<XML::Node*> const &Selection::reprList() {
-    if (!_reprs.empty()) { return _reprs; }
-    std::vector<SPItem*> list = itemList();
-    for ( std::vector<SPItem*>::const_iterator iter=list.begin();iter!=list.end(); ++iter) {
-        SPObject *obj = *iter;
-        _reprs.push_back(obj->getRepr());
-    }
-    return _reprs;
-}
-
-std::list<Persp3D *> const Selection::perspList() {
-    std::list<Persp3D *> pl;
-    for (std::list<SPBox3D *>::iterator i = _3dboxes.begin(); i != _3dboxes.end(); ++i) {
-        Persp3D *persp = box3d_get_perspective(*i);
-        if (std::find(pl.begin(), pl.end(), persp) == pl.end())
-            pl.push_back(persp);
-    }
-    return pl;
-}
-
-std::list<SPBox3D *> const Selection::box3DList(Persp3D *persp) {
-    std::list<SPBox3D *> boxes;
-    if (persp) {
-        for (std::list<SPBox3D *>::iterator i = _3dboxes.begin(); i != _3dboxes.end(); ++i) {
-            SPBox3D *box = *i;
-            if (persp == box3d_get_perspective(box)) {
-                boxes.push_back(box);
-            }
-        }
-    } else {
-        boxes = _3dboxes;
-    }
-    return boxes;
-}
-
-SPObject *Selection::single() {
-    if ( _objs.size() == 1 ) {
-        return _objs.front();
-    } else {
-        return NULL;
-    }
-}
-
-SPItem *Selection::singleItem() {
-    std::vector<SPItem*> const items=itemList();
-    if ( items.size()==1) {
-        return items[0];
-    } else {
-        return NULL;
-    }
-}
-
-SPItem *Selection::smallestItem(Selection::CompareSize compare) {
-    return _sizeistItem(true, compare);
-}
-
-SPItem *Selection::largestItem(Selection::CompareSize compare) {
-    return _sizeistItem(false, compare);
-}
-
-SPItem *Selection::_sizeistItem(bool sml, Selection::CompareSize compare) {
-    std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
-    gdouble max = sml ? 1e18 : 0;
-    SPItem *ist = NULL;
-
-    for ( std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end(); ++i) {
-        Geom::OptRect obox = SP_ITEM(*i)->desktopPreferredBounds();
-        if (!obox || obox.empty()) continue;
-        Geom::Rect bbox = *obox;
-
-        gdouble size = compare == 2 ? bbox.area() :
-            (compare == 1 ? bbox.width() : bbox.height());
-        size = sml ? size : size * -1;
-        if (size < max) {
-            max = size;
-            ist = SP_ITEM(*i);
-        }
-    }
-    return ist;
-}
-
-Inkscape::XML::Node *Selection::singleRepr() {
-    SPObject *obj=single();
-    return obj ? obj->getRepr() : NULL;
-}
-
-Geom::OptRect Selection::bounds(SPItem::BBoxType type) const
-{
-    return (type == SPItem::GEOMETRIC_BBOX) ?
-        geometricBounds() : visualBounds();
-}
-
-Geom::OptRect Selection::geometricBounds() const
-{
-    std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
-
-    Geom::OptRect bbox;
-    for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
-        bbox.unionWith(SP_ITEM(*iter)->desktopGeometricBounds());
-    }
-    return bbox;
-}
-
-Geom::OptRect Selection::visualBounds() const
-{
-    std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
-
-    Geom::OptRect bbox;
-    for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
-        bbox.unionWith(SP_ITEM(*iter)->desktopVisualBounds());
-    }
-    return bbox;
-}
-
-Geom::OptRect Selection::preferredBounds() const
-{
-    if (Inkscape::Preferences::get()->getInt("/tools/bounding_box") == 0) {
-        return bounds(SPItem::VISUAL_BBOX);
-    } else {
-        return bounds(SPItem::GEOMETRIC_BBOX);
-    }
-}
-
-Geom::OptRect Selection::documentBounds(SPItem::BBoxType type) const
-{
-    Geom::OptRect bbox;
-    std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
-    if (items.empty()) return bbox;
-
-    for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
-        SPItem *item = SP_ITEM(*iter);
-        bbox |= item->documentBounds(type);
-    }
-
-    return bbox;
-}
-
-// If we have a selection of multiple items, then the center of the first item
-// will be returned; this is also the case in SelTrans::centerRequest()
-boost::optional<Geom::Point> Selection::center() const {
-    std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
-    if (!items.empty()) {
-        SPItem *first = items.back(); // from the first item in selection
-        if (first->isCenterSet()) { // only if set explicitly
-            return first->getCenter();
-        }
-    }
-    Geom::OptRect bbox = preferredBounds();
-    if (bbox) {
-        return bbox->midpoint();
-    } else {
-        return boost::optional<Geom::Point>();
-    }
 }
 
 std::vector<Inkscape::SnapCandidatePoint> Selection::getSnapPoints(SnapPreferences const *snapprefs) const {
@@ -468,8 +119,8 @@ std::vector<Inkscape::SnapCandidatePoint> Selection::getSnapPoints(SnapPreferenc
     if (snapprefs != NULL){
         SnapPreferences snapprefs_dummy = *snapprefs; // create a local copy of the snapping prefs
         snapprefs_dummy.setTargetSnappable(Inkscape::SNAPTARGET_ROTATION_CENTER, false); // locally disable snapping to the item center
-        std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
-        for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
+        auto items = const_cast<Selection *>(this)->items();
+        for (auto iter = items.begin(); iter != items.end(); ++iter) {
             SPItem *this_item = *iter;
             this_item->getSnappoints(p, &snapprefs_dummy);
             
@@ -484,34 +135,6 @@ std::vector<Inkscape::SnapCandidatePoint> Selection::getSnapPoints(SnapPreferenc
     return p;
 }
 
-void Selection::_removeObjectDescendants(SPObject *obj) {
-    std::vector<SPObject*> toremove;
-    for ( std::list<SPObject*>::const_iterator iter=_objs.begin();iter!=_objs.end(); ++iter) {
-        SPObject *sel_obj= dynamic_cast<SPObject*>(*iter);
-        SPObject *parent = sel_obj->parent;
-        while (parent) {
-            if ( parent == obj ) {
-                toremove.push_back(sel_obj);
-                break;
-            }
-            parent = parent->parent;
-        }
-    }
-    for ( std::vector<SPObject*>::const_iterator iter=toremove.begin();iter!=toremove.end(); ++iter) {
-        _remove(*iter);
-    }
-}
-
-void Selection::_removeObjectAncestors(SPObject *obj) {
-        SPObject *parent = obj->parent;
-        while (parent) {
-            if (includes(parent)) {
-                _remove(parent);
-            }
-            parent = parent->parent;
-        }
-}
-
 SPObject *Selection::_objectForXMLNode(Inkscape::XML::Node *repr) const {
     g_return_val_if_fail(repr != NULL, NULL);
     gchar const *id = repr->attribute("id");
@@ -522,25 +145,39 @@ SPObject *Selection::_objectForXMLNode(Inkscape::XML::Node *repr) const {
 }
 
 size_t Selection::numberOfLayers() {
-    std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
+    auto items = this->items();
     std::set<SPObject*> layers;
-    for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
+    for (auto iter = items.begin(); iter != items.end(); ++iter) {
         SPObject *layer = _layers->layerForObject(*iter);
         layers.insert(layer);
     }
+
     return layers.size();
 }
 
 size_t Selection::numberOfParents() {
-    std::vector<SPItem*> const items = const_cast<Selection *>(this)->itemList();
+    auto items = this->items();
     std::set<SPObject*> parents;
-    for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
+    for (auto iter = items.begin(); iter != items.end(); ++iter) {
         SPObject *parent = (*iter)->parent;
         parents.insert(parent);
     }
     return parents.size();
 }
 
+void Selection::_emitSignals() {
+    _emitChanged();
+}
+
+void Selection::_connectSignals(SPObject *object) {
+    _modified_connections[object] = object->connectModified(sigc::mem_fun(*this, &Selection::_schedule_modified));
+}
+
+void Selection::_releaseSignals(SPObject *object) {
+    _modified_connections[object].disconnect();
+    _modified_connections.erase(object);
+}
+
 }
 
 /*