Fix ef spam when adjusting pattern on text - patch from Adonis Papaderos

[inkscape.git] / src / box3d-side.cpp

diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp
index cdeb001ebe113a27b1e7384700e185db7b7f8c83..057d8f7dfcd6e2c9bac68a937a8fad3bb9868ee1 100644 (file)
--- a/src/box3d-side.cpp
+++ b/src/box3d-side.cpp
@@ -216,7 +216,6 @@ box3d_side_set_shape (SPShape *shape)
         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
@@ -225,14 +224,34 @@ box3d_side_set_shape (SPShape *shape)
     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();
 }
 
@@ -241,19 +260,20 @@ box3d_side_apply_style (Box3DSide *side) {
     Inkscape::XML::Node *repr_face = SP_OBJECT_REPR(SP_OBJECT(side));
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
-    Glib::ustring descr = "desktop.";
+    Glib::ustring descr = "/desktop/";
     descr += box3d_side_axes_string(side);
-    Glib::ustring cur_style = prefs->getString(descr, "style");    
+    descr += "/style";
+    Glib::ustring cur_style = prefs->getString(descr);    
     
     SPDesktop *desktop = inkscape_active_desktop();
-    bool use_current = prefs->getBool("tools.shapes.3dbox", "usecurrent", false);
+    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.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);
     }
 }
@@ -316,4 +336,4 @@ box3d_side_convert_to_path(Box3DSide *side) {
   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 :