![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp
index 4bd10e854d3c984e0c62f3ca0e6d4e0b16dc55b9..057d8f7dfcd6e2c9bac68a937a8fad3bb9868ee1 100644 (file)
--- a/src/box3d-side.cpp
+++ b/src/box3d-side.cpp
#include "inkscape.h"
#include "persp3d.h"
#include "box3d-context.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "desktop-style.h"
#include "box3d.h"
static void box3d_side_init (Box3DSide *side);
static void box3d_side_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
-static Inkscape::XML::Node *box3d_side_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *box3d_side_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void box3d_side_set (SPObject *object, unsigned int key, const gchar *value);
static void box3d_side_update (SPObject *object, SPCtx *ctx, guint flags);
@@ -103,14 +103,13 @@ box3d_side_build (SPObject * object, SPDocument * document, Inkscape::XML::Node
}
static Inkscape::XML::Node *
-box3d_side_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+box3d_side_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
Box3DSide *side = SP_BOX3D_SIDE (object);
if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
// this is where we end up when saving as plain SVG (also in other circumstances?)
// thus we don' set "sodipodi:type" so that the box is only saved as an ordinary svg:path
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object));
repr = xml_doc->createElement("svg:path");
}
if ( !curve ) {
return NULL;
}
- NArtBpath const *bpath = SP_CURVE_BPATH(curve);
- if ( !bpath ) {
- return NULL;
- }
- char *d = sp_svg_write_path ( bpath );
+ char *d = sp_svg_write_path ( curve->get_pathvector() );
repr->setAttribute("d", d);
g_free (d);
if (((SPObjectClass *) (parent_class))->write)
- ((SPObjectClass *) (parent_class))->write (object, repr, flags);
+ ((SPObjectClass *) (parent_class))->write (object, xml_doc, repr, flags);
return repr;
}
return;
}
- SPCurve *c = new SPCurve();
// TODO: Draw the correct quadrangle here
// To do this, determine the perspective of the box, the orientation of the side (e.g., XY-FRONT)
// compute the coordinates of the corners in P^3, project them onto the canvas, and draw the
unsigned int corners[4];
box3d_side_compute_corner_ids(side, corners);
+ SPCurve *c = new SPCurve();
+
+ if (!box3d_get_corner_screen(box, corners[0]).isFinite() ||
+ !box3d_get_corner_screen(box, corners[1]).isFinite() ||
+ !box3d_get_corner_screen(box, corners[2]).isFinite() ||
+ !box3d_get_corner_screen(box, corners[3]).isFinite() )
+ {
+ g_warning ("Trying to draw a 3D box side with invalid coordinates.\n");
+ return;
+ }
+
c->moveto(box3d_get_corner_screen(box, corners[0]));
c->lineto(box3d_get_corner_screen(box, corners[1]));
c->lineto(box3d_get_corner_screen(box, corners[2]));
c->lineto(box3d_get_corner_screen(box, corners[3]));
-
c->closepath();
- sp_lpe_item_perform_path_effect(SP_LPE_ITEM (side), c);
- sp_shape_set_curve_insync (SP_SHAPE (side), c, TRUE);
+
+ /* Reset the shape'scurve to the "original_curve"
+ * This is very important for LPEs to work properly! (the bbox might be recalculated depending on the curve in shape)*/
+ sp_shape_set_curve_insync (shape, c, TRUE);
+ if (sp_lpe_item_has_path_effect(SP_LPE_ITEM(shape)) && sp_lpe_item_path_effects_enabled(SP_LPE_ITEM(shape))) {
+ SPCurve *c_lpe = c->copy();
+ bool success = sp_lpe_item_perform_path_effect(SP_LPE_ITEM (shape), c_lpe);
+ if (success) {
+ sp_shape_set_curve_insync (shape, c_lpe, TRUE);
+ }
+ c_lpe->unref();
+ }
c->unref();
}
void
box3d_side_apply_style (Box3DSide *side) {
Inkscape::XML::Node *repr_face = SP_OBJECT_REPR(SP_OBJECT(side));
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- gchar *descr = g_strconcat ("desktop.", box3d_side_axes_string (side), NULL);
- const gchar * cur_style = prefs_get_string_attribute(descr, "style");
- g_free (descr);
+ Glib::ustring descr = "/desktop/";
+ descr += box3d_side_axes_string(side);
+ descr += "/style";
+ Glib::ustring cur_style = prefs->getString(descr);
SPDesktop *desktop = inkscape_active_desktop();
- bool use_current = prefs_get_int_attribute("tools.shapes.3dbox", "usecurrent", 0);
- if (use_current && cur_style !=NULL) {
+ bool use_current = prefs->getBool("/tools/shapes/3dbox/usecurrent", false);
+ if (use_current && !cur_style.empty()) {
/* use last used style */
- repr_face->setAttribute("style", cur_style);
+ repr_face->setAttribute("style", cur_style.data());
} else {
/* use default style */
GString *pstring = g_string_new("");
- g_string_printf (pstring, "tools.shapes.3dbox.%s", box3d_side_axes_string(side));
+ g_string_printf (pstring, "/tools/shapes/3dbox/%s", box3d_side_axes_string(side));
sp_desktop_apply_style_tool (desktop, repr_face, pstring->str, false);
}
}
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 :