Require a pageBox in the constructor for GfxState so that we do not always need to...

[inkscape.git] / src / extension / internal / grid.cpp

diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index cf5c7529db0e06bdb0740a7f747d18a8a9c73c4d..1957813e5cf53cc6fbe9e2b0c3f2afcdc9c454d9 100644 (file)
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -20,6 +20,8 @@
 #include "sp-object.h"
 #include "util/glib-list-iterators.h"
 
+#include "svg/path-string.h"
+
 #include "extension/effect.h"
 #include "extension/system.h"
 
@@ -44,30 +46,21 @@ Grid::load (Inkscape::Extension::Extension *module)
 
 namespace {
 
-Glib::ustring build_op(char op, NR::Point p) {
-    gchar *floatstring;
-    // FIXME: locale formatting issues?
-    floatstring = g_strdup_printf("%c%f,%f ", op, p[NR::X], p[NR::Y]);
-    Glib::ustring result(floatstring);
-    g_free(floatstring);
-    return result;
-}
-
 Glib::ustring build_lines(int axis, NR::Rect bounding_area,
                           float offset, float spacing)
 {
     NR::Point point_offset(0.0, 0.0);
     point_offset[axis] = offset;
 
-    Glib::ustring path_data("");
+    SVG::PathString path_data;
     for (NR::Point start_point = bounding_area.min();
             start_point[axis] + offset <= (bounding_area.max())[axis];
             start_point[axis] += spacing) {
         NR::Point end_point = start_point;
         end_point[1-axis] = (bounding_area.max())[1-axis];
 
-        path_data += build_op('M', start_point + point_offset)
-                   + build_op('L', end_point + point_offset);
+        path_data.moveTo(start_point + point_offset)
+                 .lineTo(end_point + point_offset);
     }
 
     return path_data;
@@ -93,7 +86,10 @@ Grid::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc
                                  NR::Point(sp_document_width(doc),
                                            sp_document_height(doc)));
     } else {
-        bounding_area = selection->bounds();
+        NR::Maybe<NR::Rect> bounds = selection->bounds();
+        if (bounds) {
+            bounding_area = *bounds;
+        }
 
         gdouble doc_height  =  sp_document_height(document->doc());
         NR::Rect temprec = NR::Rect(NR::Point(bounding_area.min()[NR::X], doc_height - bounding_area.min()[NR::Y]),
@@ -173,7 +169,7 @@ PrefAdjustment::val_changed (void)
     Uses AutoGUI for creating the GUI.
 */
 Gtk::Widget *
-Grid::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view)
+Grid::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal)
 {
     SPDocument * current_document = view->doc();
 
@@ -183,7 +179,7 @@ Grid::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View
     if (selected != NULL) 
         first_select = SP_OBJECT_REPR(*selected);
 
-    return module->autogui(current_document, first_select);
+    return module->autogui(current_document, first_select, changeSignal);
 }
 
 #include "clear-n_.h"
@@ -196,10 +192,10 @@ Grid::init (void)
             "<name>" N_("Grid") "</name>\n"
             "<id>org.inkscape.effect.grid</id>\n"
             "<param name=\"lineWidth\" gui-text=\"" N_("Line Width") "\" type=\"float\">1.0</param>\n"
-            "<param name=\"xspacing\" gui-text=\"" N_("Horizontal Spacing") "\" type=\"float\">10.0</param>\n"
-            "<param name=\"yspacing\" gui-text=\"" N_("Vertical Spacing") "\" type=\"float\">10.0</param>\n"
-            "<param name=\"xoffset\" gui-text=\"" N_("Horizontal Offset") "\" type=\"float\">5.0</param>\n"
-            "<param name=\"yoffset\" gui-text=\"" N_("Vertical Offset") "\" type=\"float\">5.0</param>\n"
+            "<param name=\"xspacing\" gui-text=\"" N_("Horizontal Spacing") "\" type=\"float\" min=\"0.1\" max=\"1000\">10.0</param>\n"
+            "<param name=\"yspacing\" gui-text=\"" N_("Vertical Spacing") "\" type=\"float\" min=\"0.1\" max=\"1000\">10.0</param>\n"
+            "<param name=\"xoffset\" gui-text=\"" N_("Horizontal Offset") "\" type=\"float\" min=\"0.0\" max=\"1000\">0.0</param>\n"
+            "<param name=\"yoffset\" gui-text=\"" N_("Vertical Offset") "\" type=\"float\" min=\"0.0\" max=\"1000\">0.0</param>\n"
             "<effect>\n"
                 "<object-type>all</object-type>\n"
                 "<effects-menu>\n"