![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 452a4ff9d7ab762a379c685f39df399a259aefc7..55cfe9234a0b47e4c47608dae81e1e0cfae2376d 100644 (file)
@@ -285,9 +285,9 @@ void sp_selection_delete_impl(GSList const *items, bool propagate = true, bool p
sp_object_ref((SPObject *)i->data, NULL);
}
for (GSList const *i = items; i != NULL; i = i->next) {
- SPItem *item = (SPItem *) i->data;
- SP_OBJECT(item)->deleteObject(propagate, propagate_descendants);
- sp_object_unref((SPObject *)item, NULL);
+ SPItem *item = reinterpret_cast<SPItem *>(i->data);
+ item->deleteObject(propagate, propagate_descendants);
+ sp_object_unref(item, NULL);
}
}
g_free(newref);
}
}
+ } else if (SP_IS_OFFSET(old_clone)) {
+ for (guint j = 0; j < old_ids.size(); j++) {
+ if (!strcmp(SP_OFFSET(old_clone)->sourceHref+1, old_ids[j])) {
+ gchar *newref = g_strdup_printf("#%s", new_ids[j]);
+ doc->getObjectById(new_ids[i])->repr->setAttribute("xlink:href", newref);
+ g_free(newref);
+ }
+ }
}
}
}
GSList *items = sp_item_group_item_list(SP_GROUP(dt->currentLayer()));
while (items) {
- SP_OBJECT(items->data)->deleteObject();
+ reinterpret_cast<SPObject*>(items->data)->deleteObject();
items = g_slist_remove(items, items->data);
}
GSList *
get_all_items(GSList *list, SPObject *from, SPDesktop *desktop, bool onlyvisible, bool onlysensitive, GSList const *exclude)
{
- for (SPObject *child = sp_object_first_child(SP_OBJECT(from)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
+ for (SPObject *child = sp_object_first_child(from) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
if (SP_IS_ITEM(child) &&
!desktop->isLayer(SP_ITEM(child)) &&
(!onlysensitive || !SP_ITEM(child)->isLocked()) &&
}
void sp_selection_group_impl(GSList *p, Inkscape::XML::Node *group, Inkscape::XML::Document *xml_doc, SPDocument *doc) {
-
+
p = g_slist_sort(p, (GCompareFunc) sp_repr_compare_position);
// Remember the position and parent of the topmost object.
}
GSList const *l = (GSList *) selection->reprList();
-
+
GSList *p = g_slist_copy((GSList *) l);
-
+
selection->clear();
Inkscape::XML::Node *group = xml_doc->createElement("svg:g");
// Iterate over all objects in the selection (starting from top).
if (selected) {
while (rev) {
- SPObject *child = SP_OBJECT(rev->data);
+ SPObject *child = reinterpret_cast<SPObject*>(rev->data);
// for each selected object, find the next sibling
for (SPObject *newref = child->next; newref; newref = newref->next) {
// if the sibling is an item AND overlaps our selection,
}
sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_RAISE,
- //TRANSLATORS: only translate "string" in "context|string".
- // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
- // "Raise" means "to raise an object" in the undo history
- Q_("undo action|Raise"));
+ //TRANSLATORS: "Raise" means "to raise an object" in the undo history
+ C_("Undo action", "Raise"));
}
void sp_selection_raise_to_top(SPDesktop *desktop)
// Iterate over all objects in the selection (starting from top).
if (selected) {
while (rev) {
- SPObject *child = SP_OBJECT(rev->data);
+ SPObject *child = reinterpret_cast<SPObject*>(rev->data);
// for each selected object, find the prev sibling
for (SPObject *newref = prev_sibling(child); newref; newref = prev_sibling(newref)) {
// if the sibling is an item AND overlaps our selection,
take_style_from_item(SPItem *item)
{
// write the complete cascaded style, context-free
- SPCSSAttr *css = sp_css_attr_from_object(SP_OBJECT(item), SP_STYLE_FLAG_ALWAYS);
+ SPCSSAttr *css = sp_css_attr_from_object(item, SP_STYLE_FLAG_ALWAYS);
if (css == NULL)
return NULL;
- if ((SP_IS_GROUP(item) && SP_OBJECT(item)->children) ||
- (SP_IS_TEXT(item) && SP_OBJECT(item)->children && SP_OBJECT(item)->children->next == NULL)) {
+ if ((SP_IS_GROUP(item) && item->children) ||
+ (SP_IS_TEXT(item) && item->children && item->children->next == NULL)) {
// if this is a text with exactly one tspan child, merge the style of that tspan as well
// If this is a group, merge the style of its topmost (last) child with style
for (SPObject *last_element = item->lastChild(); last_element != NULL; last_element = SP_OBJECT_PREV(last_element)) {
- if (SP_OBJECT_STYLE(last_element) != NULL) {
+ if ( last_element->style ) {
SPCSSAttr *temp = sp_css_attr_from_object(last_element, SP_STYLE_FLAG_IFSET);
if (temp) {
sp_repr_css_merge(css, temp);
@@ -1339,7 +1345,7 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Matrix cons
// we're moving both a clone and its original or any ancestor in clone chain?
bool transform_clone_with_original = selection_contains_original(item, selection);
// ...both a text-on-path and its path?
- bool transform_textpath_with_path = (SP_IS_TEXT_TEXTPATH(item) && selection->includes( sp_textpath_get_path_item(SP_TEXTPATH(sp_object_first_child(SP_OBJECT(item)))) ));
+ bool transform_textpath_with_path = (SP_IS_TEXT_TEXTPATH(item) && selection->includes( sp_textpath_get_path_item(SP_TEXTPATH(sp_object_first_child(item))) ));
// ...both a flowtext and its frame?
bool transform_flowtext_with_frame = (SP_IS_FLOWTEXT(item) && selection->includes( SP_FLOWTEXT(item)->get_frame(NULL))); // (only the first frame is checked so far)
// ...both an offset and its source?
@@ -1374,7 +1380,7 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Matrix cons
* Same for linked offset if we are also moving its source: do not move it. */
if (transform_textpath_with_path || transform_offset_with_source) {
// Restore item->transform field from the repr, in case it was changed by seltrans.
- sp_object_read_attr(SP_OBJECT(item), "transform");
+ sp_object_read_attr(item, "transform");
} else if (transform_flowtext_with_frame) {
// apply the inverse of the region's transform to the <use> so that the flow remains
// the same (even though the output itself gets transformed)
@@ -1392,7 +1398,7 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Matrix cons
// transform and its move compensation are both cancelled out.
// restore item->transform field from the repr, in case it was changed by seltrans
- sp_object_read_attr(SP_OBJECT(item), "transform");
+ sp_object_read_attr(item, "transform");
// calculate the matrix we need to apply to the clone to cancel its induced transform from its original
Geom::Matrix parent2dt = sp_item_i2d_affine(SP_ITEM(SP_OBJECT_PARENT(item)));
@@ -1434,7 +1440,7 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Matrix cons
// center by the same matrix (only necessary for non-translations)
if (set_i2d && item->isCenterSet() && !(affine.isTranslation() || affine.isIdentity())) {
item->setCenter(old_center * affine);
- SP_OBJECT(item)->updateRepr();
+ item->updateRepr();
}
}
}
Inkscape::GC::release(clone);
}
- // TRANSLATORS: only translate "string" in "context|string".
- // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_CLONE,
- Q_("action|Clone"));
+ C_("Action","Clone"));
selection->setReprList(newsel);
continue;
SP_OBJECT_REPR(item)->setAttribute("xlink:href", newref);
- SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
relinked = true;
}
SPItem *item = (SPItem *) items->data;
if (SP_IS_TEXT(item)) {
- SPObject *tspan = sp_tref_convert_to_tspan(SP_OBJECT(item));
+ SPObject *tspan = sp_tref_convert_to_tspan(item);
if (tspan) {
- SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
}
// Set unlink to true, and fall into the next if which
SPItem *unlink;
if (SP_IS_USE(item)) {
unlink = sp_use_unlink(SP_USE(item));
+ // Unable to unlink use (external or invalid href?)
+ if (!unlink) {
+ new_select = g_slist_prepend(new_select, item);
+ continue;
+ }
} else /*if (SP_IS_TREF(use))*/ {
- unlink = SP_ITEM(sp_tref_convert_to_tspan(SP_OBJECT(item)));
+ unlink = SP_ITEM(sp_tref_convert_to_tspan(item));
}
unlinked = true;
} else if (SP_IS_OFFSET(item) && SP_OFFSET(item)->sourceHref) {
original = sp_offset_get_source(SP_OFFSET(item));
} else if (SP_IS_TEXT_TEXTPATH(item)) {
- original = sp_textpath_get_path_item(SP_TEXTPATH(sp_object_first_child(SP_OBJECT(item))));
+ original = sp_textpath_get_path_item(SP_TEXTPATH(sp_object_first_child(item)));
} else if (SP_IS_FLOWTEXT(item)) {
original = SP_FLOWTEXT(item)->get_frame(NULL); // first frame only
} else { // it's an object that we don't know what to do with
}
sp_document_ensure_up_to_date(doc);
- Geom::OptRect r = selection->bounds();
+ Geom::OptRect r = selection->bounds(SPItem::RENDERING_BBOX);
boost::optional<Geom::Point> c = selection->center();
if ( !r || !c ) {
return;
}
// calculate the transform to be applied to objects to move them to 0,0
- Geom::Point move_p = -*c;
- Geom::Matrix move = Geom::Translate(move_p);
+ Geom::Point move_p = Geom::Point(0, sp_document_height(doc)) - *c;
+ move_p[Geom::Y] = -move_p[Geom::Y];
+ Geom::Matrix move = Geom::Matrix(Geom::Translate(move_p));
GSList *items = g_slist_copy((GSList *) selection->itemList());
if (apply) {
// delete objects so that their clones don't get alerted; this object will be restored shortly
for (GSList *i = items; i != NULL; i = i->next) {
- SPObject *item = SP_OBJECT(i->data);
+ SPObject *item = reinterpret_cast<SPObject*>(i->data);
item->deleteObject(false);
}
}
@@ -2340,7 +2350,7 @@ static void sp_selection_to_guides_recursive(SPItem *item, bool deleteitem, bool
sp_item_convert_item_to_guides(item);
if (deleteitem) {
- SP_OBJECT(item)->deleteObject(true);
+ item->deleteObject(true);
}
}
}
}
sp_document_ensure_up_to_date(doc);
- Geom::OptRect r = selection->bounds();
+ Geom::OptRect r = selection->bounds(SPItem::RENDERING_BBOX);
if ( !r ) {
return;
}
// calculate the transform to be applied to objects to move them to 0,0
- Geom::Point move_p = -(r->min() + Geom::Point(0, r->dimensions()[Geom::Y]));
+ Geom::Point move_p = Geom::Point(0, sp_document_height(doc)) - (r->min() + Geom::Point(0, r->dimensions()[Geom::Y]));
+ move_p[Geom::Y] = -move_p[Geom::Y];
Geom::Matrix move = Geom::Matrix(Geom::Translate(move_p));
GSList *items = g_slist_copy((GSList *) selection->itemList());
if (apply) {
// delete objects so that their clones don't get alerted; this object will be restored shortly
for (GSList *i = items; i != NULL; i = i->next) {
- SPObject *item = SP_OBJECT(i->data);
+ SPObject *item = reinterpret_cast<SPObject*>(i->data);
item->deleteObject(false);
}
}
SPItem *item = (SPItem *) items->data;
- SPStyle *style = SP_OBJECT_STYLE(item);
+ SPStyle *style = item->style;
if (!style || !style->fill.isPaintserver())
continue;
- SPObject *server = SP_OBJECT_STYLE_FILL_SERVER(item);
+ SPPaintServer *server = item->style->getFillPaintServer();
if (!SP_IS_PATTERN(server))
continue;
Geom::Matrix pat_transform = to_2geom(pattern_patternTransform(SP_PATTERN(server)));
pat_transform *= item->transform;
- for (SPObject *child = sp_object_first_child(SP_OBJECT(pattern)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
+ for (SPObject *child = sp_object_first_child(pattern) ; child != NULL; child = child->next ) {
Inkscape::XML::Node *copy = SP_OBJECT_REPR(child)->duplicate(xml_doc);
SPItem *i = SP_ITEM(desktop->currentLayer()->appendChildRepr(copy));
Geom::Matrix t;
double shift_x = bbox.x0;
- double shift_y = bbox.y0;
+ double shift_y = bbox.y1;
if (res == PX_PER_IN) { // for default 90 dpi, snap it to pixel grid
shift_x = round(shift_x);
- shift_y = round(shift_y);
+ shift_y = -round(-shift_y); // this gets correct rounding despite coordinate inversion, remove the negations when the inversion is gone
}
- t = Geom::Translate(shift_x, shift_y) * eek.inverse();
+ t = Geom::Scale(1, -1) * Geom::Translate(shift_x, shift_y) * eek.inverse();
// Do the export
sp_export_png_file(document, filepath,
@@ -2858,7 +2869,7 @@ sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_to_la
GSList *items = g_slist_copy((GSList *) selection->itemList());
items = g_slist_sort(items, (GCompareFunc) sp_object_compare_position);
-
+
// See lp bug #542004
selection->clear();
@@ -2867,7 +2878,7 @@ sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_to_la
GSList *apply_to_items = NULL;
GSList *items_to_delete = NULL;
GSList *items_to_select = NULL;
-
+
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
bool topmost = prefs->getBool("/options/maskobject/topmost", true);
bool remove_original = prefs->getBool("/options/maskobject/remove", true);
@@ -2876,13 +2887,13 @@ sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_to_la
if (apply_to_layer) {
// all selected items are used for mask, which is applied to a layer
apply_to_items = g_slist_prepend(apply_to_items, desktop->currentLayer());
-
+
for (GSList *i = items; i != NULL; i = i->next) {
Inkscape::XML::Node *dup = (SP_OBJECT_REPR(i->data))->duplicate(xml_doc);
mask_items = g_slist_prepend(mask_items, dup);
- SPObject *item = SP_OBJECT(i->data);
- if (remove_original) {
+ SPObject *item = reinterpret_cast<SPObject*>(i->data);
+ if (remove_original) {
items_to_delete = g_slist_prepend(items_to_delete, item);
}
else {
@@ -2896,7 +2907,7 @@ sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_to_la
mask_items = g_slist_prepend(mask_items, dup);
if (remove_original) {
- SPObject *item = SP_OBJECT(i->data);
+ SPObject *item = reinterpret_cast<SPObject*>(i->data);
items_to_delete = g_slist_prepend(items_to_delete, item);
}
@@ -2915,7 +2926,7 @@ sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_to_la
mask_items = g_slist_prepend(mask_items, dup);
if (remove_original) {
- SPObject *item = SP_OBJECT(i->data);
+ SPObject *item = reinterpret_cast<SPObject*>(i->data);
items_to_delete = g_slist_prepend(items_to_delete, item);
}
}
@@ -2940,7 +2951,7 @@ sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_to_la
reprs_to_group = g_slist_reverse(reprs_to_group);
sp_selection_group_impl(reprs_to_group, group, xml_doc, doc);
-
+
reprs_to_group = NULL;
// apply clip/mask only to newly created group
@@ -3010,14 +3021,14 @@ sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_to_la
g_slist_free(apply_to_items);
for (GSList *i = items_to_delete; NULL != i; i = i->next) {
- SPObject *item = SP_OBJECT(i->data);
+ SPObject *item = reinterpret_cast<SPObject*>(i->data);
item->deleteObject(false);
items_to_select = g_slist_remove(items_to_select, item);
}
g_slist_free(items_to_delete);
-
+
items_to_select = g_slist_reverse(items_to_select);
-
+
selection->addList(items_to_select);
g_slist_free(items_to_select);
GSList *items = g_slist_copy((GSList *) selection->itemList());
selection->clear();
-
+
GSList *items_to_ungroup = NULL;
GSList *items_to_select = g_slist_copy(items);
- items_to_select = g_slist_reverse(items_to_select);
-
+ items_to_select = g_slist_reverse(items_to_select);
+
// SPObject* refers to a group containing the clipped path or mask itself,
// whereas SPItem* refers to the item being clipped or masked
}
g_slist_free(items_to_ungroup);
-
+
// rebuild selection
items_to_select = g_slist_reverse(items_to_select);
selection->addList(items_to_select);
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to fit canvas to."));
return false;
}
- Geom::OptRect const bbox(desktop->selection->bounds());
+ Geom::OptRect const bbox(desktop->selection->bounds(SPItem::RENDERING_BBOX));
if (bbox) {
doc->fitToRect(*bbox, with_margins);
return true;
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :