Moved most functions from Selection to ObjectSet

(bzr r14954.1.7)

1 files changed, 23 insertions, 277 deletions

diff --git a/src/selection.cpp b/src/selection.cpp
index 146d07a9d..32e27f2d4 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.
@@ -20,17 +22,12 @@
 #endif
 
 #include "inkscape.h"
-#include "document.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 "persp3d.h"
-#include <boost/lambda/lambda.hpp>
-#include <boost/lambda/casts.hpp>
+#include "document.h"
 
 #define SP_SELECTION_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE + 1)
 
@@ -46,7 +43,6 @@ Selection::Selection(LayerModel *layers, SPDesktop *desktop) :
 }
 
 Selection::~Selection() {
-    _clear();
     _layers = NULL;
     if (_idle) {
         g_source_remove(_idle);
@@ -66,8 +62,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;
@@ -100,8 +95,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;
@@ -112,148 +106,30 @@ Selection::_releaseContext(SPObject *obj)
     _selection_context = NULL;
 }
 
-void Selection::_clear() {
-    _selectionSet.clear();
-}
-
 SPObject *Selection::activeContext() {
     if (NULL != _selection_context)
         return _selection_context;
     return _layers->currentLayer();
-    }
-
-bool Selection::includes(SPObject *obj)  {
-    g_return_val_if_fail(obj != NULL, false);
-    g_return_val_if_fail(SP_IS_OBJECT(obj), false);
-
-    return _selectionSet.contains(obj);
-}
-
-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);
-
-    _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) {
-    _selectionSet.add(obj);
-    add_3D_boxes_recursively(obj);
-    _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));
-
-    _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);
-
-    _selectionSet.remove(obj);
-    remove_3D_boxes_recursively(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;
-
-    for (std::vector<SPItem*>::const_iterator iter = list.begin(); iter != list.end(); ++iter) {
-        SPObject *obj = *iter;
-        if (!includes(obj)) {
-            _add(obj);
-        }
-    }
-
-    _emitChanged();
+    ObjectSet::set(object);
+    _emitChanged(persist_selection_context);
 }
 
 void Selection::setReprList(std::vector<XML::Node*> const &list) {
-    _clear();
+    clear();
 
     for (std::vector<XML::Node*>::const_reverse_iterator iter = list.rbegin(); iter != list.rend(); ++iter) {
         SPObject *obj = _objectForXMLNode(*iter);
         if (obj) {
-            _add(obj);
+            add(obj);
         }
     }
 
     _emitChanged();
 }
 
-void Selection::clear() {
-    _clear();
-    _emitChanged();
-}
-
-bool Selection::isEmpty() {
-    return _selectionSet.size() == 0;
-}
-
-std::vector<SPObject*> Selection::list() {
-    return std::vector<SPObject*>(_selectionSet.begin(), _selectionSet.end());
-}
-
-std::vector<SPItem*> Selection::itemList() {
-    std::vector<SPObject *> tmp = list();
-    std::vector<SPItem*> result;
-    std::remove_if(tmp.begin(), tmp.end(), [](SPObject* o){return !SP_IS_ITEM(o);});
-    std::transform(tmp.begin(), tmp.end(), std::back_inserter(result), [](SPObject* o){return SP_ITEM(o);});
-    return result;
-}
-
 std::vector<XML::Node*> Selection::reprList() {
     std::vector<SPItem*> list = itemList();
     std::vector<XML::Node*> result;
@@ -261,154 +137,11 @@ std::vector<XML::Node*> Selection::reprList() {
     return result;
 }
 
-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 (_selectionSet.size() == 1) {
-        return *_selectionSet.begin();
-    }
-
-    return nullptr;
-}
-
-SPItem *Selection::singleItem() {
-    if (_selectionSet.size() == 1) {
-        SPObject* obj = *_selectionSet.begin();
-        if (SP_IS_ITEM(obj)) {
-            return SP_ITEM(obj);
-        }
-    }
-
-    return nullptr;
-}
-
-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() : nullptr;
 }
 
-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 {
     std::vector<Inkscape::SnapCandidatePoint> p;
 
@@ -461,6 +194,19 @@ size_t Selection::numberOfParents() {
     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);
+}
+
 }
 
 /*