From 0251afb68398f00dbd4236a695d519e6c0d2e7a6 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 19 Aug 2012 02:28:40 +0200 Subject: Added "virtual pad" to SPMarker. (bzr r11608.1.19) --- src/marker.cpp | 160 +++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 110 insertions(+), 50 deletions(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index a5681e180..58cd8ea7c 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -98,6 +98,13 @@ static void sp_marker_class_init(SPMarkerClass *klass) sp_item_class->print = sp_marker_print; } +CMarker::CMarker(SPMarker* marker) : CGroup(marker) { + this->spmarker = marker; +} + +CMarker::~CMarker() { +} + /** * Initializes an SPMarker object. This notes the marker's viewBox is * not set and initializes the marker's c2p identity matrix. @@ -105,11 +112,33 @@ static void sp_marker_class_init(SPMarkerClass *klass) static void sp_marker_init (SPMarker *marker) { + marker->cmarker = new CMarker(marker); + marker->cgroup = marker->cmarker; + marker->clpeitem = marker->cmarker; + marker->citem = marker->cmarker; + marker->cobject = marker->cmarker; + marker->viewBox = Geom::OptRect(); marker->c2p.setIdentity(); marker->views = NULL; } +void CMarker::onBuild(SPDocument *document, Inkscape::XML::Node *repr) { + SPMarker* object = this->spmarker; + + object->readAttr( "markerUnits" ); + object->readAttr( "refX" ); + object->readAttr( "refY" ); + object->readAttr( "markerWidth" ); + object->readAttr( "markerHeight" ); + object->readAttr( "orient" ); + object->readAttr( "viewBox" ); + object->readAttr( "preserveAspectRatio" ); + + CGroup::onBuild(document, repr); +} + +// CPPIFY: remove /** * Virtual build callback for SPMarker. * @@ -122,20 +151,25 @@ sp_marker_init (SPMarker *marker) */ static void sp_marker_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - object->readAttr( "markerUnits" ); - object->readAttr( "refX" ); - object->readAttr( "refY" ); - object->readAttr( "markerWidth" ); - object->readAttr( "markerHeight" ); - object->readAttr( "orient" ); - object->readAttr( "viewBox" ); - object->readAttr( "preserveAspectRatio" ); + ((SPMarker*)object)->cmarker->onBuild(document, repr); +} + +void CMarker::onRelease() { + SPMarker* object = this->spmarker; - if (reinterpret_cast(parent_class)->build) { - reinterpret_cast(parent_class)->build(object, document, repr); + SPMarker *marker = reinterpret_cast(object); + + while (marker->views) { + // Destroy all DrawingItems etc. + // Parent class ::hide method + reinterpret_cast(parent_class)->hide(marker, marker->views->key); + sp_marker_view_remove (marker, marker->views, TRUE); } + + CGroup::onRelease(); } +// CPPIFY: remove /** * Removes, releases and unrefs all children of object * @@ -150,35 +184,12 @@ static void sp_marker_build(SPObject *object, SPDocument *document, Inkscape::XM */ static void sp_marker_release(SPObject *object) { - SPMarker *marker = reinterpret_cast(object); - - while (marker->views) { - // Destroy all DrawingItems etc. - // Parent class ::hide method - reinterpret_cast(parent_class)->hide(marker, marker->views->key); - sp_marker_view_remove (marker, marker->views, TRUE); - } - - if (reinterpret_cast(parent_class)->release) { - reinterpret_cast(parent_class)->release(object); - } + ((SPMarker*)object)->cmarker->onRelease(); } -/** - * Sets an attribute, 'key', of a marker object to 'value'. Supported - * attributes that can be set with this routine include: - * - * SP_ATTR_MARKERUNITS - * SP_ATTR_REFX - * SP_ATTR_REFY - * SP_ATTR_MARKERWIDTH - * SP_ATTR_MARKERHEIGHT - * SP_ATTR_ORIENT - * SP_ATTR_VIEWBOX - * SP_ATTR_PRESERVEASPECTRATIO - */ -static void sp_marker_set(SPObject *object, unsigned int key, const gchar *value) -{ +void CMarker::onSet(unsigned int key, const gchar* value) { + SPMarker* object = this->spmarker; + SPMarker *marker = SP_MARKER(object); switch (key) { @@ -310,18 +321,33 @@ static void sp_marker_set(SPObject *object, unsigned int key, const gchar *value } break; default: - if (((SPObjectClass *) parent_class)->set) - ((SPObjectClass *) parent_class)->set (object, key, value); + CGroup::onSet(key, value); break; } } +// CPPIFY: remove /** - * Updates when its attributes have changed. Takes care of setting up - * transformations and viewBoxes. + * Sets an attribute, 'key', of a marker object to 'value'. Supported + * attributes that can be set with this routine include: + * + * SP_ATTR_MARKERUNITS + * SP_ATTR_REFX + * SP_ATTR_REFY + * SP_ATTR_MARKERWIDTH + * SP_ATTR_MARKERHEIGHT + * SP_ATTR_ORIENT + * SP_ATTR_VIEWBOX + * SP_ATTR_PRESERVEASPECTRATIO */ -static void sp_marker_update(SPObject *object, SPCtx *ctx, guint flags) +static void sp_marker_set(SPObject *object, unsigned int key, const gchar *value) { + ((SPMarker*)object)->cmarker->onSet(key, value); +} + +void CMarker::onUpdate(SPCtx *ctx, guint flags) { + SPMarker* object = this->spmarker; + SPMarker *marker = SP_MARKER(object); SPItemCtx rctx; @@ -429,9 +455,7 @@ static void sp_marker_update(SPObject *object, SPCtx *ctx, guint flags) } // And invoke parent method - if (((SPObjectClass *) (parent_class))->update) { - ((SPObjectClass *) (parent_class))->update (object, (SPCtx *) &rctx, flags); - } + CGroup::onUpdate((SPCtx *) &rctx, flags); // As last step set additional transform of drawing group for (SPMarkerView *v = marker->views; v != NULL; v = v->next) { @@ -444,12 +468,19 @@ static void sp_marker_update(SPObject *object, SPCtx *ctx, guint flags) } } +// CPPIFY: remove /** - * Writes the object's properties into its repr object. + * Updates when its attributes have changed. Takes care of setting up + * transformations and viewBoxes. */ -static Inkscape::XML::Node * -sp_marker_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) +static void sp_marker_update(SPObject *object, SPCtx *ctx, guint flags) { + ((SPMarker*)object)->cmarker->onUpdate(ctx, flags); +} + +Inkscape::XML::Node* CMarker::onWrite(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { + SPMarker* object = this->spmarker; + SPMarker *marker; marker = SP_MARKER (object); @@ -502,12 +533,26 @@ sp_marker_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::X //XML Tree being used directly here while it shouldn't be.... repr->setAttribute("preserveAspectRatio", object->getRepr()->attribute("preserveAspectRatio")); - if (((SPObjectClass *) (parent_class))->write) - ((SPObjectClass *) (parent_class))->write (object, xml_doc, repr, flags); + CGroup::onWrite(xml_doc, repr, flags); return repr; } +// CPPIFY: remove +/** + * Writes the object's properties into its repr object. + */ +static Inkscape::XML::Node * +sp_marker_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) +{ + return ((SPMarker*)object)->cmarker->onWrite(xml_doc, repr, flags); +} + +Inkscape::DrawingItem* CMarker::onShow(Inkscape::Drawing &/*drawing*/, unsigned int /*key*/, unsigned int /*flags*/) { + return 0; +} + +// CPPIFY: remove /** * This routine is disabled to break propagation. */ @@ -518,6 +563,11 @@ sp_marker_private_show (SPItem */*item*/, Inkscape::Drawing &/*drawing*/, unsign return NULL; } +void CMarker::onHide(unsigned int key) { + +} + +// CPPIFY: remove /** * This routine is disabled to break propagation. */ @@ -527,6 +577,11 @@ sp_marker_private_hide (SPItem */*item*/, unsigned int /*key*/) /* Break propagation */ } +Geom::OptRect CMarker::onBbox(Geom::Affine const &transform, SPItem::BBoxType type) { + return Geom::OptRect(); +} + +// CPPIFY: remove /** * This routine is disabled to break propagation. */ @@ -537,6 +592,11 @@ sp_marker_bbox(SPItem const *, Geom::Affine const &, SPItem::BBoxType) return Geom::OptRect(); } +void CMarker::onPrint(SPPrintContext* ctx) { + +} + +// CPPIFY: remove /** * This routine is disabled to break propagation. */ -- cgit v1.2.3 From 99cb30e28d4ee193f39e23464abbd7630cac8a2d Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 6 Oct 2012 23:56:27 +0200 Subject: Added virtual pad to SPFlowtext; removed old calls to virtual SPItem methods. (bzr r11608.1.46) --- src/marker.cpp | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index 58cd8ea7c..50426a2cd 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -92,10 +92,10 @@ static void sp_marker_class_init(SPMarkerClass *klass) sp_object_class->update = sp_marker_update; sp_object_class->write = sp_marker_write; - sp_item_class->show = sp_marker_private_show; - sp_item_class->hide = sp_marker_private_hide; - sp_item_class->bbox = sp_marker_bbox; - sp_item_class->print = sp_marker_print; +// sp_item_class->show = sp_marker_private_show; +// sp_item_class->hide = sp_marker_private_hide; +// sp_item_class->bbox = sp_marker_bbox; +// sp_item_class->print = sp_marker_print; } CMarker::CMarker(SPMarker* marker) : CGroup(marker) { @@ -162,7 +162,11 @@ void CMarker::onRelease() { while (marker->views) { // Destroy all DrawingItems etc. // Parent class ::hide method - reinterpret_cast(parent_class)->hide(marker, marker->views->key); + //reinterpret_cast(parent_class)->hide(marker, marker->views->key); + // CPPIFY: correct one? + CGroup::onHide(marker->views->key); + + sp_marker_view_remove (marker, marker->views, TRUE); } @@ -548,8 +552,10 @@ sp_marker_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::X return ((SPMarker*)object)->cmarker->onWrite(xml_doc, repr, flags); } -Inkscape::DrawingItem* CMarker::onShow(Inkscape::Drawing &/*drawing*/, unsigned int /*key*/, unsigned int /*flags*/) { - return 0; +Inkscape::DrawingItem* CMarker::onShow(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) { + // CPPIFY: correct? + return CGroup::onShow(drawing, key, flags); + //return 0; } // CPPIFY: remove @@ -564,7 +570,8 @@ sp_marker_private_show (SPItem */*item*/, Inkscape::Drawing &/*drawing*/, unsign } void CMarker::onHide(unsigned int key) { - + // CPPIFY: correct? + CGroup::onHide(key); } // CPPIFY: remove @@ -631,7 +638,10 @@ sp_marker_show_dimension (SPMarker *marker, unsigned int key, unsigned int size) if (view && (view->items.size() != size)) { /* Free old view and allocate new */ /* Parent class ::hide method */ - ((SPItemClass *) parent_class)->hide ((SPItem *) marker, key); + // CPPIFY: correct one? + //((SPItemClass *) parent_class)->hide ((SPItem *) marker, key); + marker->cmarker->onHide(key); + sp_marker_view_remove (marker, view, TRUE); view = NULL; } @@ -670,9 +680,12 @@ sp_marker_show_instance ( SPMarker *marker, Inkscape::DrawingItem *parent, } if (!v->items[pos]) { /* Parent class ::show method */ - v->items[pos] = ((SPItemClass *) parent_class)->show ((SPItem *) marker, - parent->drawing(), key, - SP_ITEM_REFERENCE_FLAGS); +// v->items[pos] = ((SPItemClass *) parent_class)->show ((SPItem *) marker, +// parent->drawing(), key, +// SP_ITEM_REFERENCE_FLAGS); + // CPPIFY: correct one? + v->items[pos] = marker->cmarker->onShow(parent->drawing(), key, SP_ITEM_REFERENCE_FLAGS); + if (v->items[pos]) { /* fixme: Position (Lauris) */ parent->prependChild(v->items[pos]); @@ -717,7 +730,10 @@ sp_marker_hide (SPMarker *marker, unsigned int key) next = v->next; if (v->key == key) { /* Parent class ::hide method */ - ((SPItemClass *) parent_class)->hide ((SPItem *) marker, key); + // CPPIFY: correct one? + //((SPItemClass *) parent_class)->hide ((SPItem *) marker, key); + marker->cmarker->onHide(key); + sp_marker_view_remove (marker, v, TRUE); return; } -- cgit v1.2.3 From a0a8d020201e0e38a63d9aa3dce228d7d9e6fb35 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Thu, 14 Mar 2013 12:42:39 +0100 Subject: Various changes. (bzr r11608.1.48) --- src/marker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index 50426a2cd..8ee4813c6 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -86,7 +86,7 @@ static void sp_marker_class_init(SPMarkerClass *klass) parent_class = reinterpret_cast(g_type_class_ref(SP_TYPE_GROUP)); - sp_object_class->build = sp_marker_build; + //sp_object_class->build = sp_marker_build; sp_object_class->release = sp_marker_release; sp_object_class->set = sp_marker_set; sp_object_class->update = sp_marker_update; -- cgit v1.2.3 From 957c3e4b7909d42c5a13f1b1dd583f877fc32259 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 30 Mar 2013 00:46:57 +0100 Subject: Removed function pointers from SPObject and subclasses. Added some missing virtual pads for classes that were hidden by preprocessor macros. (bzr r11608.1.55) --- src/marker.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index 8ee4813c6..0018612f6 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -87,10 +87,10 @@ static void sp_marker_class_init(SPMarkerClass *klass) parent_class = reinterpret_cast(g_type_class_ref(SP_TYPE_GROUP)); //sp_object_class->build = sp_marker_build; - sp_object_class->release = sp_marker_release; - sp_object_class->set = sp_marker_set; - sp_object_class->update = sp_marker_update; - sp_object_class->write = sp_marker_write; +// sp_object_class->release = sp_marker_release; +// sp_object_class->set = sp_marker_set; +// sp_object_class->update = sp_marker_update; +// sp_object_class->write = sp_marker_write; // sp_item_class->show = sp_marker_private_show; // sp_item_class->hide = sp_marker_private_hide; -- cgit v1.2.3 From 7df6616da5ea2debb86838366ddf746841549cdb Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 30 Mar 2013 00:56:13 +0100 Subject: Renamed virtual function names. (bzr r11608.1.57) --- src/marker.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index 2e78876f7..f27715d92 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -89,7 +89,7 @@ sp_marker_init (SPMarker *marker) * * \see SPObject::build() */ -void CMarker::onBuild(SPDocument *document, Inkscape::XML::Node *repr) { +void CMarker::build(SPDocument *document, Inkscape::XML::Node *repr) { SPMarker* object = this->spmarker; object->readAttr( "markerUnits" ); @@ -101,10 +101,10 @@ void CMarker::onBuild(SPDocument *document, Inkscape::XML::Node *repr) { object->readAttr( "viewBox" ); object->readAttr( "preserveAspectRatio" ); - CGroup::onBuild(document, repr); + CGroup::build(document, repr); } -void CMarker::onRelease() { +void CMarker::release() { SPMarker* object = this->spmarker; SPMarker *marker = reinterpret_cast(object); @@ -114,13 +114,13 @@ void CMarker::onRelease() { // Parent class ::hide method //reinterpret_cast(parent_class)->hide(marker, marker->views->key); // CPPIFY: correct one? - CGroup::onHide(marker->views->key); + CGroup::hide(marker->views->key); sp_marker_view_remove (marker, marker->views, TRUE); } - CGroup::onRelease(); + CGroup::release(); } /** @@ -136,7 +136,7 @@ void CMarker::onRelease() { * \see SPObject::release() */ -void CMarker::onSet(unsigned int key, const gchar* value) { +void CMarker::set(unsigned int key, const gchar* value) { SPMarker* object = this->spmarker; SPMarker *marker = SP_MARKER(object); @@ -270,12 +270,12 @@ void CMarker::onSet(unsigned int key, const gchar* value) { } break; default: - CGroup::onSet(key, value); + CGroup::set(key, value); break; } } -void CMarker::onUpdate(SPCtx *ctx, guint flags) { +void CMarker::update(SPCtx *ctx, guint flags) { SPMarker* object = this->spmarker; SPMarker *marker = SP_MARKER(object); @@ -385,7 +385,7 @@ void CMarker::onUpdate(SPCtx *ctx, guint flags) { } // And invoke parent method - CGroup::onUpdate((SPCtx *) &rctx, flags); + CGroup::update((SPCtx *) &rctx, flags); // As last step set additional transform of drawing group for (SPMarkerView *v = marker->views; v != NULL; v = v->next) { @@ -398,7 +398,7 @@ void CMarker::onUpdate(SPCtx *ctx, guint flags) { } } -Inkscape::XML::Node* CMarker::onWrite(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { +Inkscape::XML::Node* CMarker::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { SPMarker* object = this->spmarker; SPMarker *marker; @@ -453,14 +453,14 @@ Inkscape::XML::Node* CMarker::onWrite(Inkscape::XML::Document *xml_doc, Inkscape //XML Tree being used directly here while it shouldn't be.... repr->setAttribute("preserveAspectRatio", object->getRepr()->attribute("preserveAspectRatio")); - CGroup::onWrite(xml_doc, repr, flags); + CGroup::write(xml_doc, repr, flags); return repr; } -Inkscape::DrawingItem* CMarker::onShow(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) { +Inkscape::DrawingItem* CMarker::show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) { // CPPIFY: correct? - return CGroup::onShow(drawing, key, flags); + return CGroup::show(drawing, key, flags); } /** @@ -473,9 +473,9 @@ sp_marker_private_show (SPItem */*item*/, Inkscape::Drawing &/*drawing*/, unsign return NULL; } -void CMarker::onHide(unsigned int key) { +void CMarker::hide(unsigned int key) { // CPPIFY: correct? - CGroup::onHide(key); + CGroup::hide(key); } /** @@ -487,7 +487,7 @@ sp_marker_private_hide (SPItem */*item*/, unsigned int /*key*/) /* Break propagation */ } -Geom::OptRect CMarker::onBbox(Geom::Affine const &transform, SPItem::BBoxType type) { +Geom::OptRect CMarker::bbox(Geom::Affine const &transform, SPItem::BBoxType type) { return Geom::OptRect(); } @@ -501,7 +501,7 @@ sp_marker_bbox(SPItem const *, Geom::Affine const &, SPItem::BBoxType) return Geom::OptRect(); } -void CMarker::onPrint(SPPrintContext* ctx) { +void CMarker::print(SPPrintContext* ctx) { } @@ -539,7 +539,7 @@ sp_marker_show_dimension (SPMarker *marker, unsigned int key, unsigned int size) if (view && (view->items.size() != size)) { /* Free old view and allocate new */ /* Parent class ::hide method */ - marker->cmarker->onHide(key); + marker->cmarker->hide(key); sp_marker_view_remove (marker, view, TRUE); view = NULL; @@ -579,7 +579,7 @@ sp_marker_show_instance ( SPMarker *marker, Inkscape::DrawingItem *parent, } if (!v->items[pos]) { /* Parent class ::show method */ - v->items[pos] = marker->cmarker->onShow(parent->drawing(), key, SP_ITEM_REFERENCE_FLAGS); + v->items[pos] = marker->cmarker->show(parent->drawing(), key, SP_ITEM_REFERENCE_FLAGS); if (v->items[pos]) { /* fixme: Position (Lauris) */ @@ -625,7 +625,7 @@ sp_marker_hide (SPMarker *marker, unsigned int key) next = v->next; if (v->key == key) { /* Parent class ::hide method */ - marker->cmarker->onHide(key); + marker->cmarker->hide(key); sp_marker_view_remove (marker, v, TRUE); return; -- cgit v1.2.3 From a5d6e692d661f0bf7648e64e8fcb04588bb8f3ab Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Mon, 1 Apr 2013 00:07:00 +0200 Subject: Prepared exchange of casting macros. (bzr r11608.1.63) --- src/marker.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index f27715d92..adf89b0be 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -67,6 +67,7 @@ static void sp_marker_init (SPMarker *marker) { marker->cmarker = new CMarker(marker); + marker->typeHierarchy.insert(typeid(SPMarker)); delete marker->cgroup; marker->cgroup = marker->cmarker; -- cgit v1.2.3 From 69f3b6f1abb2bb422935d43262e1e99aab359954 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 2 Apr 2013 01:41:30 +0200 Subject: Added constructors to SP classes. (bzr r11608.1.67) --- src/marker.cpp | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index adf89b0be..ef2aeaae5 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -42,7 +42,7 @@ static void sp_marker_print (SPItem *item, SPPrintContext *ctx); static void sp_marker_view_remove (SPMarker *marker, SPMarkerView *view, unsigned int destroyitems); -G_DEFINE_TYPE(SPMarker, sp_marker, SP_TYPE_GROUP); +G_DEFINE_TYPE(SPMarker, sp_marker, G_TYPE_OBJECT); /** * Initializes a SPMarkerClass object. Establishes the function pointers to the class' @@ -59,13 +59,9 @@ CMarker::CMarker(SPMarker* marker) : CGroup(marker) { CMarker::~CMarker() { } -/** - * Initializes an SPMarker object. This notes the marker's viewBox is - * not set and initializes the marker's c2p identity matrix. - */ -static void -sp_marker_init (SPMarker *marker) -{ +SPMarker::SPMarker() : SPGroup() { + SPMarker* marker = this; + marker->cmarker = new CMarker(marker); marker->typeHierarchy.insert(typeid(SPMarker)); @@ -75,11 +71,30 @@ sp_marker_init (SPMarker *marker) marker->citem = marker->cmarker; marker->cobject = marker->cmarker; + marker->aspect_clip = 0; + marker->aspect_align = 0; + marker->aspect_set = 0; + marker->markerUnits = 0; + marker->orient_auto = 0; + marker->markerUnits_set = 0; + marker->orient_set = 0; + marker->orient = 0; + marker->viewBox = Geom::OptRect(); marker->c2p.setIdentity(); marker->views = NULL; } +/** + * Initializes an SPMarker object. This notes the marker's viewBox is + * not set and initializes the marker's c2p identity matrix. + */ +static void +sp_marker_init (SPMarker *marker) +{ + new (marker) SPMarker(); +} + /** * Virtual build callback for SPMarker. * -- cgit v1.2.3 From d1af3566872dfff2aeec84859c87f1f8d13f79df Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 2 Apr 2013 19:14:36 +0200 Subject: Registered classes with new factory. Hkern, Vkern and FeFuncX have to be rewritten, as they aren't real classes. (bzr r11608.1.69) --- src/marker.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index ef2aeaae5..7b824c196 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -42,6 +42,16 @@ static void sp_marker_print (SPItem *item, SPPrintContext *ctx); static void sp_marker_view_remove (SPMarker *marker, SPMarkerView *view, unsigned int destroyitems); +#include "sp-factory.h" + +namespace { + SPObject* createMarker() { + return new SPMarker(); + } + + bool markerRegistered = SPFactory::instance().registerObject("svg:marker", createMarker); +} + G_DEFINE_TYPE(SPMarker, sp_marker, G_TYPE_OBJECT); /** -- cgit v1.2.3 From dbda80349e95767e390a178cda7c05787fbce1fe Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Fri, 5 Apr 2013 17:51:29 +0200 Subject: Merged Group and subclasses. (bzr r11608.1.77) --- src/marker.cpp | 344 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 181 insertions(+), 163 deletions(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index 7b824c196..1717c388e 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -52,57 +52,31 @@ namespace { bool markerRegistered = SPFactory::instance().registerObject("svg:marker", createMarker); } -G_DEFINE_TYPE(SPMarker, sp_marker, G_TYPE_OBJECT); - -/** - * Initializes a SPMarkerClass object. Establishes the function pointers to the class' - * member routines in the class vtable, and sets pointers to parent classes. - */ -static void sp_marker_class_init(SPMarkerClass *klass) -{ -} - -CMarker::CMarker(SPMarker* marker) : CGroup(marker) { - this->spmarker = marker; -} - -CMarker::~CMarker() { -} - SPMarker::SPMarker() : SPGroup() { - SPMarker* marker = this; - - marker->cmarker = new CMarker(marker); - marker->typeHierarchy.insert(typeid(SPMarker)); - - delete marker->cgroup; - marker->cgroup = marker->cmarker; - marker->clpeitem = marker->cmarker; - marker->citem = marker->cmarker; - marker->cobject = marker->cmarker; - - marker->aspect_clip = 0; - marker->aspect_align = 0; - marker->aspect_set = 0; - marker->markerUnits = 0; - marker->orient_auto = 0; - marker->markerUnits_set = 0; - marker->orient_set = 0; - marker->orient = 0; - - marker->viewBox = Geom::OptRect(); - marker->c2p.setIdentity(); - marker->views = NULL; + this->clpeitem = this; + this->citem = this; + this->cobject = this; + + this->aspect_clip = 0; + this->aspect_align = 0; + this->aspect_set = 0; + this->markerUnits = 0; + this->orient_auto = 0; + this->markerUnits_set = 0; + this->orient_set = 0; + this->orient = 0; + + this->viewBox = Geom::OptRect(); + this->c2p.setIdentity(); + this->views = NULL; } /** * Initializes an SPMarker object. This notes the marker's viewBox is * not set and initializes the marker's c2p identity matrix. */ -static void -sp_marker_init (SPMarker *marker) -{ - new (marker) SPMarker(); + +SPMarker::~SPMarker() { } /** @@ -115,38 +89,32 @@ sp_marker_init (SPMarker *marker) * * \see SPObject::build() */ -void CMarker::build(SPDocument *document, Inkscape::XML::Node *repr) { - SPMarker* object = this->spmarker; - - object->readAttr( "markerUnits" ); - object->readAttr( "refX" ); - object->readAttr( "refY" ); - object->readAttr( "markerWidth" ); - object->readAttr( "markerHeight" ); - object->readAttr( "orient" ); - object->readAttr( "viewBox" ); - object->readAttr( "preserveAspectRatio" ); - - CGroup::build(document, repr); +void SPMarker::build(SPDocument *document, Inkscape::XML::Node *repr) { + this->readAttr( "markerUnits" ); + this->readAttr( "refX" ); + this->readAttr( "refY" ); + this->readAttr( "markerWidth" ); + this->readAttr( "markerHeight" ); + this->readAttr( "orient" ); + this->readAttr( "viewBox" ); + this->readAttr( "preserveAspectRatio" ); + + SPGroup::build(document, repr); } -void CMarker::release() { - SPMarker* object = this->spmarker; - - SPMarker *marker = reinterpret_cast(object); - - while (marker->views) { +void SPMarker::release() { + while (this->views) { // Destroy all DrawingItems etc. // Parent class ::hide method //reinterpret_cast(parent_class)->hide(marker, marker->views->key); // CPPIFY: correct one? - CGroup::hide(marker->views->key); + SPGroup::hide(this->views->key); - sp_marker_view_remove (marker, marker->views, TRUE); + sp_marker_view_remove (this, this->views, TRUE); } - CGroup::release(); + SPGroup::release(); } /** @@ -162,99 +130,143 @@ void CMarker::release() { * \see SPObject::release() */ -void CMarker::set(unsigned int key, const gchar* value) { - SPMarker* object = this->spmarker; - - SPMarker *marker = SP_MARKER(object); - +void SPMarker::set(unsigned int key, const gchar* value) { switch (key) { case SP_ATTR_MARKERUNITS: - marker->markerUnits_set = FALSE; - marker->markerUnits = SP_MARKER_UNITS_STROKEWIDTH; + this->markerUnits_set = FALSE; + this->markerUnits = SP_MARKER_UNITS_STROKEWIDTH; + if (value) { if (!strcmp (value, "strokeWidth")) { - marker->markerUnits_set = TRUE; + this->markerUnits_set = TRUE; } else if (!strcmp (value, "userSpaceOnUse")) { - marker->markerUnits = SP_MARKER_UNITS_USERSPACEONUSE; - marker->markerUnits_set = TRUE; + this->markerUnits = SP_MARKER_UNITS_USERSPACEONUSE; + this->markerUnits_set = TRUE; } } - object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG); + + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG); break; + case SP_ATTR_REFX: - marker->refX.readOrUnset(value); - object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + this->refX.readOrUnset(value); + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; + case SP_ATTR_REFY: - marker->refY.readOrUnset(value); - object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + this->refY.readOrUnset(value); + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; + case SP_ATTR_MARKERWIDTH: - marker->markerWidth.readOrUnset(value, SVGLength::NONE, 3.0, 3.0); - object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + this->markerWidth.readOrUnset(value, SVGLength::NONE, 3.0, 3.0); + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; + case SP_ATTR_MARKERHEIGHT: - marker->markerHeight.readOrUnset(value, SVGLength::NONE, 3.0, 3.0); - object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + this->markerHeight.readOrUnset(value, SVGLength::NONE, 3.0, 3.0); + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; + case SP_ATTR_ORIENT: - marker->orient_set = FALSE; - marker->orient_auto = FALSE; - marker->orient = 0.0; + this->orient_set = FALSE; + this->orient_auto = FALSE; + this->orient = 0.0; + if (value) { if (!strcmp (value, "auto")) { - marker->orient_auto = TRUE; - marker->orient_set = TRUE; - } else if (sp_svg_number_read_f (value, &marker->orient)) { - marker->orient_set = TRUE; + this->orient_auto = TRUE; + this->orient_set = TRUE; + } else if (sp_svg_number_read_f (value, &this->orient)) { + this->orient_set = TRUE; } } - object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; + case SP_ATTR_VIEWBOX: - marker->viewBox = Geom::OptRect(); + this->viewBox = Geom::OptRect(); + if (value) { double x, y, width, height; char *eptr; + /* fixme: We have to take original item affine into account */ /* fixme: Think (Lauris) */ eptr = (gchar *) value; x = g_ascii_strtod (eptr, &eptr); - while (*eptr && ((*eptr == ',') || (*eptr == ' '))) eptr++; + + while (*eptr && ((*eptr == ',') || (*eptr == ' '))) { + eptr++; + } + y = g_ascii_strtod (eptr, &eptr); - while (*eptr && ((*eptr == ',') || (*eptr == ' '))) eptr++; + + while (*eptr && ((*eptr == ',') || (*eptr == ' '))) { + eptr++; + } + width = g_ascii_strtod (eptr, &eptr); - while (*eptr && ((*eptr == ',') || (*eptr == ' '))) eptr++; + + while (*eptr && ((*eptr == ',') || (*eptr == ' '))) { + eptr++; + } + height = g_ascii_strtod (eptr, &eptr); - while (*eptr && ((*eptr == ',') || (*eptr == ' '))) eptr++; + + while (*eptr && ((*eptr == ',') || (*eptr == ' '))) { + eptr++; + } + if ((width > 0) && (height > 0)) { /* Set viewbox */ - marker->viewBox = Geom::Rect( Geom::Point(x,y), - Geom::Point(x + width, y + height) ); + this->viewBox = Geom::Rect(Geom::Point(x, y), Geom::Point(x + width, y + height)); } } - object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG); + + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG); break; + case SP_ATTR_PRESERVEASPECTRATIO: /* Do setup before, so we can use break to escape */ - marker->aspect_set = FALSE; - marker->aspect_align = SP_ASPECT_NONE; - marker->aspect_clip = SP_ASPECT_MEET; - object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG); + this->aspect_set = FALSE; + this->aspect_align = SP_ASPECT_NONE; + this->aspect_clip = SP_ASPECT_MEET; + + this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG); + if (value) { int len; gchar c[256]; const gchar *p, *e; unsigned int align, clip; p = value; - while (*p && *p == 32) p += 1; - if (!*p) break; + + while (*p && *p == 32) { + p += 1; + } + + if (!*p) { + break; + } + e = p; - while (*e && *e != 32) e += 1; + + while (*e && *e != 32) { + e += 1; + } + len = e - p; - if (len > 8) break; + + if (len > 8) { + break; + } + memcpy (c, value, len); + c[len] = 0; + /* Now the actual part */ if (!strcmp (c, "none")) { align = SP_ASPECT_NONE; @@ -279,8 +291,13 @@ void CMarker::set(unsigned int key, const gchar* value) { } else { break; } + clip = SP_ASPECT_MEET; - while (*e && *e == 32) e += 1; + + while (*e && *e == 32) { + e += 1; + } + if (*e) { if (!strcmp (e, "meet")) { clip = SP_ASPECT_MEET; @@ -290,21 +307,20 @@ void CMarker::set(unsigned int key, const gchar* value) { break; } } - marker->aspect_set = TRUE; - marker->aspect_align = align; - marker->aspect_clip = clip; + + this->aspect_set = TRUE; + this->aspect_align = align; + this->aspect_clip = clip; } break; + default: - CGroup::set(key, value); + SPGroup::set(key, value); break; } } -void CMarker::update(SPCtx *ctx, guint flags) { - SPMarker* object = this->spmarker; - - SPMarker *marker = SP_MARKER(object); +void SPMarker::update(SPCtx *ctx, guint flags) { SPItemCtx rctx; // fixme: We have to set up clip here too @@ -317,15 +333,15 @@ void CMarker::update(SPCtx *ctx, guint flags) { rctx.i2vp = Geom::identity(); // Set up viewport - rctx.viewport = Geom::Rect::from_xywh(0, 0, marker->markerWidth.computed, marker->markerHeight.computed); + rctx.viewport = Geom::Rect::from_xywh(0, 0, this->markerWidth.computed, this->markerHeight.computed); // Start with identity transform - marker->c2p.setIdentity(); + this->c2p.setIdentity(); // Viewbox is always present, either implicitly or explicitly Geom::Rect vb; - if (marker->viewBox) { - vb = *marker->viewBox; + if (this->viewBox) { + vb = *this->viewBox; } else { vb = rctx.viewport; } @@ -337,7 +353,8 @@ void CMarker::update(SPCtx *ctx, guint flags) { // double y = 0; double width = 0; double height = 0; - if (marker->aspect_align == SP_ASPECT_NONE) { + + if (this->aspect_align == SP_ASPECT_NONE) { // x = 0.0; // y = 0.0; width = rctx.viewport.width(); @@ -347,7 +364,7 @@ void CMarker::update(SPCtx *ctx, guint flags) { // Things are getting interesting scalex = rctx.viewport.width() / (vb.width()); scaley = rctx.viewport.height() / (vb.height()); - scale = (marker->aspect_clip == SP_ASPECT_MEET) ? MIN (scalex, scaley) : MAX (scalex, scaley); + scale = (this->aspect_clip == SP_ASPECT_MEET) ? MIN (scalex, scaley) : MAX (scalex, scaley); width = (vb.width()) * scale; height = (vb.height()) * scale; @@ -395,48 +412,43 @@ void CMarker::update(SPCtx *ctx, guint flags) { break; }*/ } + // TODO fixme: all that work is done to figure out x and y, which are just ignored. Check why. // viewbox transformation and reference translation - marker->c2p = Geom::Translate(-marker->refX.computed, -marker->refY.computed) * + this->c2p = Geom::Translate(-this->refX.computed, -this->refY.computed) * Geom::Scale(width / vb.width(), height / vb.height()); - rctx.i2doc = marker->c2p * rctx.i2doc; + rctx.i2doc = this->c2p * rctx.i2doc; // If viewBox is set reinitialize child viewport // Otherwise it already correct - if (marker->viewBox) { - rctx.viewport = *marker->viewBox; + if (this->viewBox) { + rctx.viewport = *this->viewBox; rctx.i2vp = Geom::identity(); } // And invoke parent method - CGroup::update((SPCtx *) &rctx, flags); + SPGroup::update((SPCtx *) &rctx, flags); // As last step set additional transform of drawing group - for (SPMarkerView *v = marker->views; v != NULL; v = v->next) { + for (SPMarkerView *v = this->views; v != NULL; v = v->next) { for (unsigned i = 0 ; i < v->items.size() ; i++) { if (v->items[i]) { Inkscape::DrawingGroup *g = dynamic_cast(v->items[i]); - g->setChildTransform(marker->c2p); + g->setChildTransform(this->c2p); } } } } -Inkscape::XML::Node* CMarker::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { - SPMarker* object = this->spmarker; - - SPMarker *marker; - - marker = SP_MARKER (object); - +Inkscape::XML::Node* SPMarker::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) { repr = xml_doc->createElement("svg:marker"); } - if (marker->markerUnits_set) { - if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) { + if (this->markerUnits_set) { + if (this->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) { repr->setAttribute("markerUnits", "strokeWidth"); } else { repr->setAttribute("markerUnits", "userSpaceOnUse"); @@ -444,49 +456,55 @@ Inkscape::XML::Node* CMarker::write(Inkscape::XML::Document *xml_doc, Inkscape:: } else { repr->setAttribute("markerUnits", NULL); } - if (marker->refX._set) { - sp_repr_set_svg_double(repr, "refX", marker->refX.computed); + + if (this->refX._set) { + sp_repr_set_svg_double(repr, "refX", this->refX.computed); } else { repr->setAttribute("refX", NULL); } - if (marker->refY._set) { - sp_repr_set_svg_double (repr, "refY", marker->refY.computed); + + if (this->refY._set) { + sp_repr_set_svg_double (repr, "refY", this->refY.computed); } else { repr->setAttribute("refY", NULL); } - if (marker->markerWidth._set) { - sp_repr_set_svg_double (repr, "markerWidth", marker->markerWidth.computed); + + if (this->markerWidth._set) { + sp_repr_set_svg_double (repr, "markerWidth", this->markerWidth.computed); } else { repr->setAttribute("markerWidth", NULL); } - if (marker->markerHeight._set) { - sp_repr_set_svg_double (repr, "markerHeight", marker->markerHeight.computed); + + if (this->markerHeight._set) { + sp_repr_set_svg_double (repr, "markerHeight", this->markerHeight.computed); } else { repr->setAttribute("markerHeight", NULL); } - if (marker->orient_set) { - if (marker->orient_auto) { + + if (this->orient_set) { + if (this->orient_auto) { repr->setAttribute("orient", "auto"); } else { - sp_repr_set_css_double(repr, "orient", marker->orient); + sp_repr_set_css_double(repr, "orient", this->orient); } } else { repr->setAttribute("orient", NULL); } + /* fixme: */ //XML Tree being used directly here while it shouldn't be.... - repr->setAttribute("viewBox", object->getRepr()->attribute("viewBox")); + repr->setAttribute("viewBox", this->getRepr()->attribute("viewBox")); //XML Tree being used directly here while it shouldn't be.... - repr->setAttribute("preserveAspectRatio", object->getRepr()->attribute("preserveAspectRatio")); + repr->setAttribute("preserveAspectRatio", this->getRepr()->attribute("preserveAspectRatio")); - CGroup::write(xml_doc, repr, flags); + SPGroup::write(xml_doc, repr, flags); return repr; } -Inkscape::DrawingItem* CMarker::show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) { +Inkscape::DrawingItem* SPMarker::show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) { // CPPIFY: correct? - return CGroup::show(drawing, key, flags); + return SPGroup::show(drawing, key, flags); } /** @@ -499,9 +517,9 @@ sp_marker_private_show (SPItem */*item*/, Inkscape::Drawing &/*drawing*/, unsign return NULL; } -void CMarker::hide(unsigned int key) { +void SPMarker::hide(unsigned int key) { // CPPIFY: correct? - CGroup::hide(key); + SPGroup::hide(key); } /** @@ -513,7 +531,7 @@ sp_marker_private_hide (SPItem */*item*/, unsigned int /*key*/) /* Break propagation */ } -Geom::OptRect CMarker::bbox(Geom::Affine const &transform, SPItem::BBoxType type) { +Geom::OptRect SPMarker::bbox(Geom::Affine const &transform, SPItem::BBoxType type) { return Geom::OptRect(); } @@ -527,7 +545,7 @@ sp_marker_bbox(SPItem const *, Geom::Affine const &, SPItem::BBoxType) return Geom::OptRect(); } -void CMarker::print(SPPrintContext* ctx) { +void SPMarker::print(SPPrintContext* ctx) { } @@ -565,7 +583,7 @@ sp_marker_show_dimension (SPMarker *marker, unsigned int key, unsigned int size) if (view && (view->items.size() != size)) { /* Free old view and allocate new */ /* Parent class ::hide method */ - marker->cmarker->hide(key); + marker->hide(key); sp_marker_view_remove (marker, view, TRUE); view = NULL; @@ -605,7 +623,7 @@ sp_marker_show_instance ( SPMarker *marker, Inkscape::DrawingItem *parent, } if (!v->items[pos]) { /* Parent class ::show method */ - v->items[pos] = marker->cmarker->show(parent->drawing(), key, SP_ITEM_REFERENCE_FLAGS); + v->items[pos] = marker->show(parent->drawing(), key, SP_ITEM_REFERENCE_FLAGS); if (v->items[pos]) { /* fixme: Position (Lauris) */ @@ -651,7 +669,7 @@ sp_marker_hide (SPMarker *marker, unsigned int key) next = v->next; if (v->key == key) { /* Parent class ::hide method */ - marker->cmarker->hide(key); + marker->hide(key); sp_marker_view_remove (marker, v, TRUE); return; -- cgit v1.2.3 From 19d00efa85cfc42ccae9bd17ef575602f0d22c50 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Fri, 5 Apr 2013 19:42:32 +0200 Subject: Merged more classes. (bzr r11608.1.78) --- src/marker.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index 1717c388e..ba7366ec3 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -53,7 +53,6 @@ namespace { } SPMarker::SPMarker() : SPGroup() { - this->clpeitem = this; this->citem = this; this->cobject = this; -- cgit v1.2.3 From 8073924aacdda310fb7492750f78d5389b3186af Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Fri, 5 Apr 2013 22:45:01 +0200 Subject: Merged Item. (bzr r11608.1.81) --- src/marker.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index ba7366ec3..bcb246d2b 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -53,7 +53,6 @@ namespace { } SPMarker::SPMarker() : SPGroup() { - this->citem = this; this->cobject = this; this->aspect_clip = 0; -- cgit v1.2.3 From 27e2102f96a5554bcd5310ec11435d155773b279 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 7 Apr 2013 18:28:22 +0200 Subject: Merge Object and subclasses. Merging of SP- and C-classes complete. (bzr r11608.1.86) --- src/marker.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/marker.cpp') diff --git a/src/marker.cpp b/src/marker.cpp index bcb246d2b..518895a57 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -53,8 +53,6 @@ namespace { } SPMarker::SPMarker() : SPGroup() { - this->cobject = this; - this->aspect_clip = 0; this->aspect_align = 0; this->aspect_set = 0; -- cgit v1.2.3