fix 198818

[inkscape.git] / src / sp-path.cpp

diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index a8e3ad6eebf74db53a4a0aacee145a22c2e186d0..e401d0a2085414b05af36d077bb21937149df29c 100644 (file)
--- a/src/sp-path.cpp
+++ b/src/sp-path.cpp
@@ -33,6 +33,15 @@
 #include "sp-guide.h"
 
 #include "document.h"
+#include "desktop.h"
+#include "desktop-handles.h"
+#include "desktop-style.h"
+#include "event-context.h"
+#include "inkscape.h"
+#include "style.h"
+#include "message-stack.h"
+#include "prefs-utils.h"
+#include "selection.h"
 
 #define noPATH_VERBOSE
 
@@ -165,8 +174,6 @@ sp_path_convert_to_guides(SPItem *item)
     }
 
     sp_guide_pt_pairs_to_guides(doc, pts);
-
-    SP_OBJECT(path)->deleteObject(true);
 }
 
 /**
@@ -505,6 +512,66 @@ sp_path_get_curve_reference (SPPath *path)
     }
 }
 
+/* Create a single dot represented by a circle */
+void freehand_create_single_dot(SPEventContext *ec, NR::Point const &pt, char const *tool, guint event_state) {
+    g_return_if_fail(!strcmp(tool, "tools.freehand.pen") || !strcmp(tool, "tools.freehand.pencil"));
+
+    SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(ec);
+    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+    Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
+    repr->setAttribute("sodipodi:type", "arc");
+    SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
+    Inkscape::GC::release(repr);
+
+    /* apply the tool's current style */
+    sp_desktop_apply_style_tool(desktop, repr, tool, false);
+
+    /* find out stroke width (TODO: is there an easier way??) */
+    double stroke_width = 3.0;
+    gchar const *style_str = NULL;
+    style_str = repr->attribute("style");
+    if (style_str) {
+        SPStyle *style = sp_style_new(SP_ACTIVE_DOCUMENT);
+        sp_style_merge_from_style_string(style, style_str);
+        stroke_width = style->stroke_width.computed;
+        style->stroke_width.computed = 0;
+        sp_style_unref(style);
+    }
+    /* unset stroke and set fill color to former stroke color */
+    gchar * str;
+    str = g_strdup_printf("fill:#%06x;stroke:none;", sp_desktop_get_color_tool(desktop, tool, false) >> 8);
+    repr->setAttribute("style", str);
+    g_free(str);
+
+    /* put the circle where the mouse click occurred and set the diameter to the
+       current stroke width, multiplied by the amount specified in the preferences */
+    NR::Matrix const i2d (sp_item_i2d_affine (item));
+    NR::Point pp = pt * i2d;
+    double rad = 0.5 * prefs_get_double_attribute(tool, "dot-size", 3.0);
+    if (event_state & GDK_MOD1_MASK) {
+        /* TODO: We vary the dot size between 0.5*rad and 1.5*rad, where rad is the dot size
+           as specified in prefs. Very simple, but it might be sufficient in practice. If not,
+           we need to devise something more sophisticated. */
+        double s = g_random_double_range(-0.5, 0.5);
+        rad *= (1 + s);
+    }
+    if (event_state & GDK_SHIFT_MASK) {
+        // double the point size
+        rad *= 2;
+    }
+
+    sp_repr_set_svg_double (repr, "sodipodi:cx", pp[NR::X]);
+    sp_repr_set_svg_double (repr, "sodipodi:cy", pp[NR::Y]);
+    sp_repr_set_svg_double (repr, "sodipodi:rx", rad * stroke_width);
+    sp_repr_set_svg_double (repr, "sodipodi:ry", rad * stroke_width);
+    item->updateRepr();
+
+    sp_desktop_selection(desktop)->set(item);
+
+    desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Creating single dot"));
+    sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE, _("Create single dot"));
+}
+
 /*
   Local Variables:
   mode:c++