![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp
index 4071e4d92610d7068476576ea54d23590e942aee..79007cac7735a7494fb43db723ef5395de4f491c 100644 (file)
--- a/src/sp-flowregion.cpp
+++ b/src/sp-flowregion.cpp
#include "sp-text.h"
#include "sp-use.h"
#include "style.h"
+#include "document.h"
+#include "sp-title.h"
+#include "sp-desc.h"
#include "sp-flowregion.h"
static void sp_flowregion_remove_child (SPObject * object, Inkscape::XML::Node * child);
static void sp_flowregion_update (SPObject *object, SPCtx *ctx, guint flags);
static void sp_flowregion_modified (SPObject *object, guint flags);
-static Inkscape::XML::Node *sp_flowregion_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_flowregion_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static gchar * sp_flowregion_description (SPItem * item);
@@ -45,14 +48,14 @@ static void sp_flowregionexclude_child_added (SPObject * object, Inkscape::XML::
static void sp_flowregionexclude_remove_child (SPObject * object, Inkscape::XML::Node * child);
static void sp_flowregionexclude_update (SPObject *object, SPCtx *ctx, guint flags);
static void sp_flowregionexclude_modified (SPObject *object, guint flags);
-static Inkscape::XML::Node *sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static gchar * sp_flowregionexclude_description (SPItem * item);
static SPItemClass * flowregionexclude_parent_class;
-static void GetDest(SPObject* child,Shape **computed,NR::Matrix itr_mat);
+static void GetDest(SPObject* child,Shape **computed);
GType
sp_flowregion_get_type (void)
GObjectClass * object_class;
SPObjectClass * sp_object_class;
SPItemClass * item_class;
-
+
object_class = (GObjectClass *) klass;
sp_object_class = (SPObjectClass *) klass;
item_class = (SPItemClass *) klass;
-
+
flowregion_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM);
-
+
object_class->dispose = sp_flowregion_dispose;
-
+
sp_object_class->child_added = sp_flowregion_child_added;
sp_object_class->remove_child = sp_flowregion_remove_child;
sp_object_class->update = sp_flowregion_update;
sp_object_class->modified = sp_flowregion_modified;
sp_object_class->write = sp_flowregion_write;
-
+
item_class->description = sp_flowregion_description;
}
sp_flowregion_child_added (SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref)
{
SPItem *item;
-
+
item = SP_ITEM (object);
-
+
if (((SPObjectClass *) (flowregion_parent_class))->child_added)
(* ((SPObjectClass *) (flowregion_parent_class))->child_added) (object, child, ref);
-
+
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
{
if (((SPObjectClass *) (flowregion_parent_class))->remove_child)
(* ((SPObjectClass *) (flowregion_parent_class))->remove_child) (object, child);
-
+
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
SPObject *child;
SPItemCtx *ictx, cctx;
GSList *l;
-
+
group = SP_FLOWREGION (object);
ictx = (SPItemCtx *) ctx;
cctx = *ictx;
-
+
if (((SPObjectClass *) (flowregion_parent_class))->update)
((SPObjectClass *) (flowregion_parent_class))->update (object, ctx, flags);
-
+
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
-
+
l = NULL;
for (child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
g_object_ref (G_OBJECT (child));
void SPFlowregion::UpdateComputed(void)
{
SPObject* object=SP_OBJECT(this);
-
- NR::Matrix itr_mat=sp_item_i2root_affine (SP_ITEM(object));
- itr_mat=itr_mat.inverse();
-
+
for (std::vector<Shape*>::iterator it = computed.begin() ; it != computed.end() ; it++)
delete *it;
computed.clear();
-
+
for (SPObject* child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
Shape *shape = NULL;
- GetDest(child,&shape,itr_mat);
+ GetDest(child,&shape);
computed.push_back(shape);
}
}
SPFlowregion *group;
SPObject *child;
GSList *l;
-
- group = SP_FLOWREGION (object);
-
+
+ group = SP_FLOWREGION (object);
+
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
-
+
l = NULL;
for (child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
g_object_ref (G_OBJECT (child));
}
static Inkscape::XML::Node *
-sp_flowregion_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_flowregion_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
if (flags & SP_OBJECT_WRITE_BUILD) {
- if ( repr == NULL ) repr = sp_repr_new ("svg:flowRegion");
-
+ if ( repr == NULL ) {
+ repr = xml_doc->createElement("svg:flowRegion");
+ }
+
GSList *l = NULL;
for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
- Inkscape::XML::Node *crepr = child->updateRepr(NULL, flags);
+ if (SP_IS_TITLE(child) || SP_IS_DESC(child)) continue;
+ Inkscape::XML::Node *crepr = child->updateRepr(xml_doc, NULL, flags);
if (crepr) l = g_slist_prepend(l, crepr);
}
-
+
while (l) {
repr->addChild((Inkscape::XML::Node *) l->data, NULL);
Inkscape::GC::release((Inkscape::XML::Node *) l->data);
l = g_slist_remove(l, l->data);
}
-
+
} else {
for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
+ if (SP_IS_TITLE(child) || SP_IS_DESC(child)) continue;
child->updateRepr(flags);
}
}
if (((SPObjectClass *) (flowregion_parent_class))->write)
- ((SPObjectClass *) (flowregion_parent_class))->write (object, repr, flags);
-
+ ((SPObjectClass *) (flowregion_parent_class))->write (object, xml_doc, repr, flags);
+
return repr;
}
-static gchar *sp_flowregion_description(SPItem *item)
+static gchar *sp_flowregion_description(SPItem */*item*/)
{
// TRANSLATORS: "Flow region" is an area where text is allowed to flow
return g_strdup_printf(_("Flow region"));
GObjectClass * object_class;
SPObjectClass * sp_object_class;
SPItemClass * item_class;
-
+
object_class = (GObjectClass *) klass;
sp_object_class = (SPObjectClass *) klass;
item_class = (SPItemClass *) klass;
-
+
flowregionexclude_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM);
-
+
object_class->dispose = sp_flowregionexclude_dispose;
-
+
sp_object_class->child_added = sp_flowregionexclude_child_added;
sp_object_class->remove_child = sp_flowregionexclude_remove_child;
sp_object_class->update = sp_flowregionexclude_update;
sp_object_class->modified = sp_flowregionexclude_modified;
sp_object_class->write = sp_flowregionexclude_write;
-
+
item_class->description = sp_flowregionexclude_description;
}
sp_flowregionexclude_child_added (SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref)
{
SPItem *item;
-
+
item = SP_ITEM (object);
-
+
if (((SPObjectClass *) (flowregionexclude_parent_class))->child_added)
(* ((SPObjectClass *) (flowregionexclude_parent_class))->child_added) (object, child, ref);
-
+
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
@@ -352,7 +356,7 @@ sp_flowregionexclude_remove_child (SPObject * object, Inkscape::XML::Node * chil
{
if (((SPObjectClass *) (flowregionexclude_parent_class))->remove_child)
(* ((SPObjectClass *) (flowregionexclude_parent_class))->remove_child) (object, child);
-
+
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
@@ -364,17 +368,17 @@ sp_flowregionexclude_update (SPObject *object, SPCtx *ctx, unsigned int flags)
SPObject *child;
SPItemCtx *ictx, cctx;
GSList *l;
-
+
group = SP_FLOWREGIONEXCLUDE (object);
ictx = (SPItemCtx *) ctx;
cctx = *ictx;
-
+
if (((SPObjectClass *) (flowregionexclude_parent_class))->update)
((SPObjectClass *) (flowregionexclude_parent_class))->update (object, ctx, flags);
-
+
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
-
+
l = NULL;
for (child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
g_object_ref (G_OBJECT (child));
@@ -402,16 +406,14 @@ sp_flowregionexclude_update (SPObject *object, SPCtx *ctx, unsigned int flags)
void SPFlowregionExclude::UpdateComputed(void)
{
SPObject* object=SP_OBJECT(this);
-
- if (computed) {
+
+ if (computed) {
delete computed;
computed = NULL;
}
- NR::Matrix itr_mat=sp_item_i2root_affine (SP_ITEM(object));
- itr_mat=itr_mat.inverse();
-
+
for (SPObject* child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
- GetDest(child,&computed,itr_mat);
+ GetDest(child,&computed);
}
}
SPFlowregionExclude *group;
SPObject *child;
GSList *l;
-
+
group = SP_FLOWREGIONEXCLUDE (object);
-
+
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
-
+
l = NULL;
for (child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
g_object_ref (G_OBJECT (child));
}
static Inkscape::XML::Node *
-sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
if (flags & SP_OBJECT_WRITE_BUILD) {
- if ( repr == NULL ) repr = sp_repr_new ("svg:flowRegionExclude");
-
+ if ( repr == NULL ) {
+ repr = xml_doc->createElement("svg:flowRegionExclude");
+ }
+
GSList *l = NULL;
for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
- Inkscape::XML::Node *crepr = child->updateRepr(NULL, flags);
+ Inkscape::XML::Node *crepr = child->updateRepr(xml_doc, NULL, flags);
if (crepr) l = g_slist_prepend(l, crepr);
}
-
+
while (l) {
repr->addChild((Inkscape::XML::Node *) l->data, NULL);
Inkscape::GC::release((Inkscape::XML::Node *) l->data);
l = g_slist_remove(l, l->data);
}
-
+
} else {
for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
child->updateRepr(flags);
@@ -468,13 +472,13 @@ sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Node *repr, guint f
}
if (((SPObjectClass *) (flowregionexclude_parent_class))->write)
- ((SPObjectClass *) (flowregionexclude_parent_class))->write (object, repr, flags);
-
+ ((SPObjectClass *) (flowregionexclude_parent_class))->write (object, xml_doc, repr, flags);
+
return repr;
}
-static gchar *sp_flowregionexclude_description(SPItem *item)
+static gchar *sp_flowregionexclude_description(SPItem */*item*/)
{
/* TRANSLATORS: A region "cut out of" a flow region; text is not allowed to flow inside the
* flow excluded region. flowRegionExclude in SVG 1.2: see
}
}
-static void GetDest(SPObject* child,Shape **computed,NR::Matrix itr_mat)
-{
+static void GetDest(SPObject* child,Shape **computed)
+{
if ( child == NULL ) return;
-
+
SPCurve *curve=NULL;
-
+ Geom::Matrix tr_mat;
+
SPObject* u_child=child;
if ( SP_IS_USE(u_child) ) {
u_child=SP_USE(u_child)->child;
+ tr_mat = SP_ITEM(u_child)->getRelativeTransform(SP_OBJECT_PARENT(child));
+ } else {
+ tr_mat = SP_ITEM(u_child)->transform;
}
if ( SP_IS_SHAPE (u_child) ) {
curve = sp_shape_get_curve (SP_SHAPE (u_child));
} else if ( SP_IS_TEXT (u_child) ) {
curve = SP_TEXT (u_child)->getNormalizedBpath ();
}
-
+
if ( curve ) {
Path* temp=new Path;
- NR::Matrix tr_mat=sp_item_i2root_affine (SP_ITEM(u_child));
- tr_mat=itr_mat*tr_mat;
- temp->LoadArtBPath(curve->bpath,tr_mat,true);
+ temp->LoadPathVector(curve->get_pathvector(), tr_mat, true);
Shape* n_shp=new Shape;
temp->Convert(0.25);
temp->Fill(n_shp,0);
delete uncross;
delete n_shp;
delete temp;
- sp_curve_unref(curve);
+ curve->unref();
} else {
// printf("no curve\n");
}