X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdisplay%2Fcanvas-grid.cpp;h=5892e1dc736dfb11b89fdba115c308ec7ce867ed;hb=0dc33d4ce43e0bb49c63aa53b826ec4a1ff68e28;hp=7d9d009f02e1b8c8c8b3a73c4451232eb4386491;hpb=1f8c5954acb3f152aeb1411b098ebc5fed99e6b0;p=inkscape.git diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 7d9d009f0..5892e1dc7 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -1,10 +1,9 @@ -#define INKSCAPE_CANVAS_GRID_C - -/* - * - * Copyright (C) Johan Engelen 2006-2007 +/** @file + * @brief Cartesian grid implementation + */ +/* Copyright (C) Johan Engelen 2006-2007 * Copyright (C) Lauris Kaplinski 2000 - * + * Abhishek Sharma */ /* As a general comment, I am not exactly proud of how things are done. @@ -13,11 +12,10 @@ * Don't be shy to correct things. */ - +#include "sp-canvas-group.h" #include "sp-canvas-util.h" -#include "util/mathfns.h" -#include "display-forward.h" -#include +#include "util/mathfns.h" +#include "libnr/nr-pixops.h" #include "desktop-handles.h" #include "helper/units.h" #include "svg/svg-color.h" @@ -29,11 +27,13 @@ #include "desktop.h" #include "../document.h" -#include "prefs-utils.h" +#include "preferences.h" #include "canvas-grid.h" #include "canvas-axonomgrid.h" +using Inkscape::DocumentUndo; + namespace Inkscape { static gchar const *const grid_name[] = { @@ -52,7 +52,7 @@ static void grid_canvasitem_class_init (GridCanvasItemClass *klass); static void grid_canvasitem_init (GridCanvasItem *grid); static void grid_canvasitem_destroy (GtkObject *object); -static void grid_canvasitem_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags); +static void grid_canvasitem_update (SPCanvasItem *item, Geom::Matrix const &affine, unsigned int flags); static void grid_canvasitem_render (SPCanvasItem *item, SPCanvasBuf *buf); static SPCanvasItemClass * parent_class; @@ -64,7 +64,7 @@ grid_canvasitem_get_type (void) if (!grid_canvasitem_type) { GtkTypeInfo grid_canvasitem_info = { - "GridCanvasItem", + (gchar *)"GridCanvasItem", sizeof (GridCanvasItem), sizeof (GridCanvasItemClass), (GtkClassInitFunc) grid_canvasitem_class_init, @@ -124,7 +124,7 @@ grid_canvasitem_render (SPCanvasItem * item, SPCanvasBuf * buf) } static void -grid_canvasitem_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags) +grid_canvasitem_update (SPCanvasItem *item, Geom::Matrix const &affine, unsigned int flags) { GridCanvasItem *gridcanvasitem = INKSCAPE_GRID_CANVASITEM (item); @@ -157,7 +157,7 @@ grid_canvasitem_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned i }; CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc, GridType type) - : namelabel("", Gtk::ALIGN_CENTER), visible(true), gridtype(type) + : visible(true), gridtype(type) { repr = in_repr; doc = in_doc; @@ -167,22 +167,6 @@ CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocume namedview = nv; canvasitems = NULL; - - Glib::ustring str(""); - str += getName(); - str += ""; - namelabel.set_markup(str); - vbox.pack_start(namelabel, true, true); - - _rcb_visible.init ( _("_Visible"), - _("Determines whether the grid is displayed or not. Objects are still snapped to invisible grids."), - "visible", _wr, false, repr, doc); - vbox.pack_start(*dynamic_cast(_rcb_visible._button), true, true); - - _rcb_snap_enabled.init ( _("_Snapping enabled"), - _("Determines whether to snap to this grid or not. Can be 'on' for invisible grids."), - "snap_enabled", _wr, false, repr, doc); - vbox.pack_start(*dynamic_cast(_rcb_snap_enabled._button), true, true); } CanvasGrid::~CanvasGrid() @@ -264,15 +248,15 @@ CanvasGrid::writeNewGridToRepr(Inkscape::XML::Node * repr, SPDocument * doc, Gri // first create the child xml node, then hook it to repr. This order is important, to not set off listeners to repr before the new node is complete. - Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); + Inkscape::XML::Document *xml_doc = doc->getReprDoc(); Inkscape::XML::Node *newnode; newnode = xml_doc->createElement("inkscape:grid"); newnode->setAttribute("type", getSVGName(gridtype)); repr->appendChild(newnode); -// Inkscape::GC::release(repr); FIX THIS. THIS SHOULD BE HERE!!! + Inkscape::GC::release(newnode); - sp_document_done(doc, SP_VERB_DIALOG_NAMEDVIEW, _("Create new grid")); + DocumentUndo::done(doc, SP_VERB_DIALOG_NAMEDVIEW, _("Create new grid")); } /* @@ -325,6 +309,55 @@ CanvasGrid::createCanvasItem(SPDesktop * desktop) return item; } +Gtk::Widget * +CanvasGrid::newWidget() +{ + Gtk::VBox * vbox = Gtk::manage( new Gtk::VBox() ); + Gtk::Label * namelabel = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_CENTER) ); + + Glib::ustring str(""); + str += getName(); + str += ""; + namelabel->set_markup(str); + vbox->pack_start(*namelabel, true, true); + + Inkscape::UI::Widget::RegisteredCheckButton * _rcb_enabled = Gtk::manage( + new Inkscape::UI::Widget::RegisteredCheckButton( _("_Enabled"), + _("Determines whether to snap to this grid or not. Can be 'on' for invisible grids."), + "enabled", _wr, false, repr, doc) ); + + Inkscape::UI::Widget::RegisteredCheckButton * _rcb_snap_visible_only = Gtk::manage( + new Inkscape::UI::Widget::RegisteredCheckButton( _("Snap to visible _grid lines only"), + _("When zoomed out, not all grid lines will be displayed. Only the visible ones will be snapped to"), + "snapvisiblegridlinesonly", _wr, true, repr, doc) ); + + Inkscape::UI::Widget::RegisteredCheckButton * _rcb_visible = Gtk::manage( + new Inkscape::UI::Widget::RegisteredCheckButton( _("_Visible"), + _("Determines whether the grid is displayed or not. Objects are still snapped to invisible grids."), + "visible", _wr, true, repr, doc) ); + + vbox->pack_start(*_rcb_enabled, true, true); + vbox->pack_start(*_rcb_visible, true, true); + vbox->pack_start(*_rcb_snap_visible_only, true, true); + Gtk::Widget * gridwdg = newSpecificWidget(); + vbox->pack_start(*gridwdg, true, true); + + std::list slaves; + slaves.push_back(_rcb_visible); + slaves.push_back(_rcb_snap_visible_only); + slaves.push_back(gridwdg); + _rcb_enabled->setSlaveWidgets(slaves); + + // set widget values + _rcb_visible->setActive(visible); + if (snapper != NULL) { + _rcb_enabled->setActive(snapper->getEnabled()); + _rcb_snap_visible_only->setActive(snapper->getSnapVisibleOnly()); + } + + return dynamic_cast (vbox); +} + void CanvasGrid::on_repr_attr_changed(Inkscape::XML::Node *repr, gchar const *key, gchar const *oldval, gchar const *newval, bool is_interactive, void *data) { @@ -334,13 +367,13 @@ CanvasGrid::on_repr_attr_changed(Inkscape::XML::Node *repr, gchar const *key, gc ((CanvasGrid*) data)->onReprAttrChanged(repr, key, oldval, newval, is_interactive); } -bool CanvasGrid::isSnapEnabled() -{ +bool CanvasGrid::isEnabled() +{ if (snapper == NULL) { return false; - } - - return snapper->getEnabled(); + } + + return snapper->getEnabled(); } // ########################################################## @@ -389,76 +422,24 @@ attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int } CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc) - : CanvasGrid(nv, in_repr, in_doc, GRID_RECTANGULAR), table(1, 1) -{ - origin[NR::X] = prefs_get_double_attribute ("options.grids.xy", "origin_x", 0.0); - origin[NR::Y] = prefs_get_double_attribute ("options.grids.xy", "origin_y", 0.0); - color = prefs_get_int_attribute("options.grids.xy", "color", 0x0000ff20); - empcolor = prefs_get_int_attribute("options.grids.xy", "empcolor", 0x0000ff40); - empspacing = prefs_get_int_attribute("options.grids.xy", "empspacing", 5); - spacing[NR::X] = prefs_get_double_attribute ("options.grids.xy", "spacing_x", 0.0); - spacing[NR::Y] = prefs_get_double_attribute ("options.grids.xy", "spacing_y", 0.0); - gridunit = sp_unit_get_by_abbreviation( prefs_get_string_attribute("options.grids.xy", "units") ); - render_dotted = prefs_get_int_attribute ("options.grids.xy", "dotted", 0) == 1; - - snapper = new CanvasXYGridSnapper(this, namedview, 0); - - // initialize widgets: - vbox.set_border_width(2); - table.set_spacings(2); - vbox.pack_start(table, false, false, 0); - - Inkscape::UI::Widget::ScalarUnit * sutemp; - _rumg.init (_("Grid _units:"), "units", _wr, repr, doc); - _rsu_ox.init (_("_Origin X:"), _("X coordinate of grid origin"), - "originx", _rumg, _wr, repr, doc); - sutemp = _rsu_ox.getSU(); - sutemp->setDigits(4); - sutemp->setIncrements(0.1, 1.0); - _rsu_oy.init (_("O_rigin Y:"), _("Y coordinate of grid origin"), - "originy", _rumg, _wr, repr, doc); - sutemp = _rsu_oy.getSU(); - sutemp->setDigits(4); - sutemp->setIncrements(0.1, 1.0); - _rsu_sx.init (_("Spacing _X:"), _("Distance between vertical grid lines"), - "spacingx", _rumg, _wr, repr, doc); - sutemp = _rsu_sx.getSU(); - sutemp->setDigits(4); - sutemp->setIncrements(0.1, 1.0); - _rsu_sy.init (_("Spacing _Y:"), _("Distance between horizontal grid lines"), - "spacingy", _rumg, _wr, repr, doc); - sutemp = _rsu_sy.getSU(); - sutemp->setDigits(4); - sutemp->setIncrements(0.1, 1.0); - _rcp_gcol.init (_("Grid line _color:"), _("Grid line color"), - _("Color of grid lines"), "color", "opacity", _wr, repr, doc); - _rcp_gmcol.init (_("Ma_jor grid line color:"), _("Major grid line color"), - _("Color of the major (highlighted) grid lines"), - "empcolor", "empopacity", _wr, repr, doc); - _rsi.init (_("_Major grid line every:"), _("lines"), "empspacing", _wr, repr, doc); - _rcb_dotted.init ( _("_Show dots instead of lines"), - _("If set, displays dots at gridpoints instead of gridlines"), - "dotted", _wr, false, repr, doc); - - Gtk::Widget const *const widget_array[] = { - _rumg._label, _rumg._sel, - 0, _rsu_ox.getSU(), - 0, _rsu_oy.getSU(), - 0, _rsu_sx.getSU(), - 0, _rsu_sy.getSU(), - _rcp_gcol._label, _rcp_gcol._cp, - 0, 0, - _rcp_gmcol._label, _rcp_gmcol._cp, - _rsi._label, &_rsi._hbox, - 0, _rcb_dotted._button, - }; - - attach_all (table, widget_array, sizeof(widget_array)); - - vbox.show(); + : CanvasGrid(nv, in_repr, in_doc, GRID_RECTANGULAR) +{ + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + gridunit = sp_unit_get_by_abbreviation( prefs->getString("/options/grids/xy/units").data() ); + if (!gridunit) + gridunit = &sp_unit_get_by_id(SP_UNIT_PX); + origin[Geom::X] = sp_units_get_pixels(prefs->getDouble("/options/grids/xy/origin_x", 0.0), *gridunit); + origin[Geom::Y] = sp_units_get_pixels(prefs->getDouble("/options/grids/xy/origin_y", 0.0), *gridunit); + color = prefs->getInt("/options/grids/xy/color", 0x0000ff20); + empcolor = prefs->getInt("/options/grids/xy/empcolor", 0x0000ff40); + empspacing = prefs->getInt("/options/grids/xy/empspacing", 5); + spacing[Geom::X] = sp_units_get_pixels(prefs->getDouble("/options/grids/xy/spacing_x", 0.0), *gridunit); + spacing[Geom::Y] = sp_units_get_pixels(prefs->getDouble("/options/grids/xy/spacing_y", 0.0), *gridunit); + render_dotted = prefs->getBool("/options/grids/xy/dotted", false); + + snapper = new CanvasXYGridSnapper(this, &namedview->snap_manager, 0); if (repr) readRepr(); - updateWidgets(); } CanvasXYGrid::~CanvasXYGrid () @@ -546,8 +527,7 @@ static gboolean sp_nv_read_opacity(gchar const *str, guint32 *color) @param widget Widget associated with the scalar. */ static void validateScalar(double oldVal, - double* pTarget, - Inkscape::UI::Widget::RegisteredScalarUnit& widget) + double* pTarget) { // Avoid nullness. if ( pTarget == NULL ) @@ -561,7 +541,6 @@ static void validateScalar(double oldVal, // Reset the scalar and associated widget to the old value. *pTarget = oldVal; - widget.setValue( *pTarget); } //if } //validateScalar @@ -575,8 +554,7 @@ static void validateScalar(double oldVal, @param widget Widget associated with the int. */ static void validateInt(gint oldVal, - gint* pTarget, - Inkscape::UI::Widget::RegisteredSuffixedInteger& widget) + gint* pTarget) { // Avoid nullness. if ( pTarget == NULL ) @@ -590,7 +568,6 @@ static void validateInt(gint oldVal, // Reset the int and associated widget to the old value. *pTarget = oldVal; - widget.setValue( *pTarget); } //if } //validateInt @@ -600,27 +577,27 @@ CanvasXYGrid::readRepr() { gchar const *value; if ( (value = repr->attribute("originx")) ) { - sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[NR::X], &gridunit); - origin[NR::X] = sp_units_get_pixels(origin[NR::X], *(gridunit)); + sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[Geom::X], &gridunit); + origin[Geom::X] = sp_units_get_pixels(origin[Geom::X], *(gridunit)); } if ( (value = repr->attribute("originy")) ) { - sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[NR::Y], &gridunit); - origin[NR::Y] = sp_units_get_pixels(origin[NR::Y], *(gridunit)); + sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[Geom::Y], &gridunit); + origin[Geom::Y] = sp_units_get_pixels(origin[Geom::Y], *(gridunit)); } if ( (value = repr->attribute("spacingx")) ) { - double oldVal = spacing[NR::X]; - sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &spacing[NR::X], &gridunit); - validateScalar( oldVal, &spacing[NR::X], _rsu_sx ); - spacing[NR::X] = sp_units_get_pixels(spacing[NR::X], *(gridunit)); + double oldVal = spacing[Geom::X]; + sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &spacing[Geom::X], &gridunit); + validateScalar( oldVal, &spacing[Geom::X]); + spacing[Geom::X] = sp_units_get_pixels(spacing[Geom::X], *(gridunit)); } if ( (value = repr->attribute("spacingy")) ) { - double oldVal = spacing[NR::Y]; - sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &spacing[NR::Y], &gridunit); - validateScalar( oldVal, &spacing[NR::Y], _rsu_sy ); - spacing[NR::Y] = sp_units_get_pixels(spacing[NR::Y], *(gridunit)); + double oldVal = spacing[Geom::Y]; + sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &spacing[Geom::Y], &gridunit); + validateScalar( oldVal, &spacing[Geom::Y]); + spacing[Geom::Y] = sp_units_get_pixels(spacing[Geom::Y], *(gridunit)); } @@ -642,20 +619,25 @@ CanvasXYGrid::readRepr() if ( (value = repr->attribute("empspacing")) ) { gint oldVal = empspacing; empspacing = atoi(value); - validateInt( oldVal, &empspacing, _rsi ); + validateInt( oldVal, &empspacing); } if ( (value = repr->attribute("dotted")) ) { - render_dotted = (strcmp(value,"true") == 0); + render_dotted = (strcmp(value,"false") != 0 && strcmp(value, "0") != 0); } if ( (value = repr->attribute("visible")) ) { - visible = (strcmp(value,"true") == 0); + visible = (strcmp(value,"false") != 0 && strcmp(value, "0") != 0); + } + + if ( (value = repr->attribute("enabled")) ) { + g_assert(snapper != NULL); + snapper->setEnabled(strcmp(value,"false") != 0 && strcmp(value, "0") != 0); } - - if ( (value = repr->attribute("snap_enabled")) ) { + + if ( (value = repr->attribute("snapvisiblegridlinesonly")) ) { g_assert(snapper != NULL); - snapper->setEnabled(strcmp(value,"true") == 0); + snapper->setSnapVisibleOnly(strcmp(value,"false") != 0 && strcmp(value, "0") != 0); } for (GSList *l = canvasitems; l != NULL; l = l->next) { @@ -680,10 +662,97 @@ CanvasXYGrid::onReprAttrChanged(Inkscape::XML::Node */*repr*/, gchar const */*ke -Gtk::Widget & -CanvasXYGrid::getWidget() +Gtk::Widget * +CanvasXYGrid::newSpecificWidget() { - return vbox; + Gtk::Table * table = Gtk::manage( new Gtk::Table(1,1) ); + + Inkscape::UI::Widget::RegisteredUnitMenu *_rumg = Gtk::manage( new Inkscape::UI::Widget::RegisteredUnitMenu( + _("Grid _units:"), "units", _wr, repr, doc) ); + Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_ox = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalarUnit( + _("_Origin X:"), _("X coordinate of grid origin"), "originx", *_rumg, _wr, repr, doc) ); + Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_oy = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalarUnit( + _("O_rigin Y:"), _("Y coordinate of grid origin"), "originy", *_rumg, _wr, repr, doc) ); + Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_sx = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalarUnit( + _("Spacing _X:"), _("Distance between vertical grid lines"), "spacingx", *_rumg, _wr, repr, doc) ); + Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_sy = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalarUnit( + _("Spacing _Y:"), _("Distance between horizontal grid lines"), "spacingy", *_rumg, _wr, repr, doc) ); + + Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gcol = Gtk::manage( + new Inkscape::UI::Widget::RegisteredColorPicker( + _("Grid line _color:"), _("Grid line color"), _("Color of grid lines"), + "color", "opacity", _wr, repr, doc)); + + Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gmcol = Gtk::manage( + new Inkscape::UI::Widget::RegisteredColorPicker( + _("Ma_jor grid line color:"), _("Major grid line color"), + _("Color of the major (highlighted) grid lines"), "empcolor", "empopacity", + _wr, repr, doc)); + + Inkscape::UI::Widget::RegisteredSuffixedInteger *_rsi = Gtk::manage( new Inkscape::UI::Widget::RegisteredSuffixedInteger( + _("_Major grid line every:"), "", _("lines"), "empspacing", _wr, repr, doc) ); + + table->set_spacings(2); + +_wr.setUpdating (true); + + _rsu_ox->setDigits(4); + _rsu_ox->setIncrements(0.1, 1.0); + + _rsu_oy->setDigits(4); + _rsu_oy->setIncrements(0.1, 1.0); + + _rsu_sx->setDigits(4); + _rsu_sx->setIncrements(0.1, 1.0); + + _rsu_sy->setDigits(4); + _rsu_sy->setIncrements(0.1, 1.0); + + Inkscape::UI::Widget::RegisteredCheckButton * _rcb_dotted = Gtk::manage( + new Inkscape::UI::Widget::RegisteredCheckButton( _("_Show dots instead of lines"), + _("If set, displays dots at gridpoints instead of gridlines"), + "dotted", _wr, false, repr, doc) ); +_wr.setUpdating (false); + + Gtk::Widget const *const widget_array[] = { + 0, _rumg, + 0, _rsu_ox, + 0, _rsu_oy, + 0, _rsu_sx, + 0, _rsu_sy, + _rcp_gcol->_label, _rcp_gcol, + 0, 0, + _rcp_gmcol->_label, _rcp_gmcol, + 0, _rsi, + 0, _rcb_dotted, + }; + + attach_all (*table, widget_array, sizeof(widget_array)); + + // set widget values + _rumg->setUnit (gridunit); + + gdouble val; + val = origin[Geom::X]; + val = sp_pixels_get_units (val, *(gridunit)); + _rsu_ox->setValue (val); + val = origin[Geom::Y]; + val = sp_pixels_get_units (val, *(gridunit)); + _rsu_oy->setValue (val); + val = spacing[Geom::X]; + double gridx = sp_pixels_get_units (val, *(gridunit)); + _rsu_sx->setValue (gridx); + val = spacing[Geom::Y]; + double gridy = sp_pixels_get_units (val, *(gridunit)); + _rsu_sy->setValue (gridy); + + _rcp_gcol->setRgba32 (color); + _rcp_gmcol->setRgba32 (empcolor); + _rsi->setValue (empspacing); + + _rcb_dotted->setActive(render_dotted); + + return table; } @@ -693,28 +762,29 @@ CanvasXYGrid::getWidget() void CanvasXYGrid::updateWidgets() { +/* if (_wr.isUpdating()) return; _wr.setUpdating (true); _rcb_visible.setActive(visible); if (snapper != NULL) { - _rcb_snap_enabled.setActive(snapper->getEnabled()); + _rcb_enabled.setActive(snapper->getEnabled()); } _rumg.setUnit (gridunit); gdouble val; - val = origin[NR::X]; + val = origin[Geom::X]; val = sp_pixels_get_units (val, *(gridunit)); _rsu_ox.setValue (val); - val = origin[NR::Y]; + val = origin[Geom::Y]; val = sp_pixels_get_units (val, *(gridunit)); _rsu_oy.setValue (val); - val = spacing[NR::X]; + val = spacing[Geom::X]; double gridx = sp_pixels_get_units (val, *(gridunit)); _rsu_sx.setValue (gridx); - val = spacing[NR::Y]; + val = spacing[Geom::Y]; double gridy = sp_pixels_get_units (val, *(gridunit)); _rsu_sy.setValue (gridy); @@ -727,16 +797,17 @@ CanvasXYGrid::updateWidgets() _wr.setUpdating (false); return; +*/ } void -CanvasXYGrid::Update (NR::Matrix const &affine, unsigned int /*flags*/) +CanvasXYGrid::Update (Geom::Matrix const &affine, unsigned int /*flags*/) { ow = origin * affine; sw = spacing * affine; - sw -= NR::Point(affine[4], affine[5]); + sw -= Geom::Point(affine[4], affine[5]); for(int dim = 0; dim < 2; dim++) { gint scaling_factor = empspacing; @@ -770,12 +841,12 @@ grid_hline (SPCanvasBuf *buf, gint y, gint xs, gint xe, guint32 rgba) a = NR_RGBA32_A (rgba); x0 = MAX (buf->rect.x0, xs); x1 = MIN (buf->rect.x1, xe + 1); - p = buf->buf + (y - buf->rect.y0) * buf->buf_rowstride + (x0 - buf->rect.x0) * 3; + p = buf->buf + (y - buf->rect.y0) * buf->buf_rowstride + (x0 - buf->rect.x0) * 4; for (x = x0; x < x1; x++) { p[0] = NR_COMPOSEN11_1111 (r, a, p[0]); p[1] = NR_COMPOSEN11_1111 (g, a, p[1]); p[2] = NR_COMPOSEN11_1111 (b, a, p[2]); - p += 3; + p += 4; } } } @@ -793,7 +864,7 @@ grid_vline (SPCanvasBuf *buf, gint x, gint ys, gint ye, guint32 rgba) a = NR_RGBA32_A (rgba); y0 = MAX (buf->rect.y0, ys); y1 = MIN (buf->rect.y1, ye + 1); - p = buf->buf + (y0 - buf->rect.y0) * buf->buf_rowstride + (x - buf->rect.x0) * 3; + p = buf->buf + (y0 - buf->rect.y0) * buf->buf_rowstride + (x - buf->rect.x0) * 4; for (y = y0; y < y1; y++) { p[0] = NR_COMPOSEN11_1111 (r, a, p[0]); p[1] = NR_COMPOSEN11_1111 (g, a, p[1]); @@ -814,7 +885,7 @@ grid_dot (SPCanvasBuf *buf, gint x, gint y, guint32 rgba) g = NR_RGBA32_G (rgba); b = NR_RGBA32_B (rgba); a = NR_RGBA32_A (rgba); - p = buf->buf + (y - buf->rect.y0) * buf->buf_rowstride + (x - buf->rect.x0) * 3; + p = buf->buf + (y - buf->rect.y0) * buf->buf_rowstride + (x - buf->rect.x0) * 4; p[0] = NR_COMPOSEN11_1111 (r, a, p[0]); p[1] = NR_COMPOSEN11_1111 (g, a, p[1]); p[2] = NR_COMPOSEN11_1111 (b, a, p[2]); @@ -824,50 +895,67 @@ grid_dot (SPCanvasBuf *buf, gint x, gint y, guint32 rgba) void CanvasXYGrid::Render (SPCanvasBuf *buf) { - gdouble const sxg = floor ((buf->rect.x0 - ow[NR::X]) / sw[NR::X]) * sw[NR::X] + ow[NR::X]; - gint const xlinestart = (gint) Inkscape::round((sxg - ow[NR::X]) / sw[NR::X]); - gdouble const syg = floor ((buf->rect.y0 - ow[NR::Y]) / sw[NR::Y]) * sw[NR::Y] + ow[NR::Y]; - gint const ylinestart = (gint) Inkscape::round((syg - ow[NR::Y]) / sw[NR::Y]); + gdouble const sxg = floor ((buf->rect.x0 - ow[Geom::X]) / sw[Geom::X]) * sw[Geom::X] + ow[Geom::X]; + gint const xlinestart = (gint) Inkscape::round((sxg - ow[Geom::X]) / sw[Geom::X]); + gdouble const syg = floor ((buf->rect.y0 - ow[Geom::Y]) / sw[Geom::Y]) * sw[Geom::Y] + ow[Geom::Y]; + gint const ylinestart = (gint) Inkscape::round((syg - ow[Geom::Y]) / sw[Geom::Y]); + + //set correct coloring, depending preference (when zoomed out, always major coloring or minor coloring) + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + guint32 _empcolor; + bool no_emp_when_zoomed_out = prefs->getBool("/options/grids/no_emphasize_when_zoomedout", false); + if( (scaled[Geom::X] || scaled[Geom::Y]) && no_emp_when_zoomed_out ) { + _empcolor = color; + } else { + _empcolor = empcolor; + } if (!render_dotted) { gint ylinenum; gdouble y; - for (y = syg, ylinenum = ylinestart; y < buf->rect.y1; y += sw[NR::Y], ylinenum++) { + for (y = syg, ylinenum = ylinestart; y < buf->rect.y1; y += sw[Geom::Y], ylinenum++) { gint const y0 = (gint) Inkscape::round(y); - - if (!scaled[NR::Y] && (ylinenum % empspacing) == 0) { - grid_hline (buf, y0, buf->rect.x0, buf->rect.x1 - 1, empcolor); - } else { + if (!scaled[Geom::Y] && (ylinenum % empspacing) != 0) { grid_hline (buf, y0, buf->rect.x0, buf->rect.x1 - 1, color); + } else { + grid_hline (buf, y0, buf->rect.x0, buf->rect.x1 - 1, _empcolor); } } gint xlinenum; gdouble x; - for (x = sxg, xlinenum = xlinestart; x < buf->rect.x1; x += sw[NR::X], xlinenum++) { + for (x = sxg, xlinenum = xlinestart; x < buf->rect.x1; x += sw[Geom::X], xlinenum++) { gint const ix = (gint) Inkscape::round(x); - if (!scaled[NR::X] && (xlinenum % empspacing) == 0) { - grid_vline (buf, ix, buf->rect.y0, buf->rect.y1, empcolor); - } else { + if (!scaled[Geom::X] && (xlinenum % empspacing) != 0) { grid_vline (buf, ix, buf->rect.y0, buf->rect.y1, color); + } else { + grid_vline (buf, ix, buf->rect.y0, buf->rect.y1, _empcolor); } } } else { gint ylinenum; gdouble y; - for (y = syg, ylinenum = ylinestart; y < buf->rect.y1; y += sw[NR::Y], ylinenum++) { + for (y = syg, ylinenum = ylinestart; y < buf->rect.y1; y += sw[Geom::Y], ylinenum++) { gint const iy = (gint) Inkscape::round(y); gint xlinenum; gdouble x; - for (x = sxg, xlinenum = xlinestart; x < buf->rect.x1; x += sw[NR::X], xlinenum++) { + for (x = sxg, xlinenum = xlinestart; x < buf->rect.x1; x += sw[Geom::X], xlinenum++) { gint const ix = (gint) Inkscape::round(x); - if ( (!scaled[NR::X] && (xlinenum % empspacing) == 0) - || (!scaled[NR::Y] && (ylinenum % empspacing) == 0) ) + if ( (!scaled[Geom::X] && (xlinenum % empspacing) != 0) + || (!scaled[Geom::Y] && (ylinenum % empspacing) != 0) + || ((scaled[Geom::X] || scaled[Geom::Y]) && no_emp_when_zoomed_out) ) { - grid_dot (buf, ix, iy, empcolor | (guint32)0x000000FF); // put alpha to max value + grid_dot (buf, ix, iy, color | (guint32)0x000000FF); // put alpha to max value } else { - grid_dot (buf, ix, iy, color | (guint32)0x000000FF); // put alpha to max value + gint const pitch = 1; + grid_dot (buf, ix-pitch, iy, _empcolor); + grid_dot (buf, ix+pitch, iy, _empcolor); + + grid_dot (buf, ix, iy, _empcolor | (guint32)0x000000FF); // put alpha to max value + + grid_dot (buf, ix, iy-pitch, _empcolor); + grid_dot (buf, ix, iy+pitch, _empcolor); } } @@ -875,13 +963,28 @@ CanvasXYGrid::Render (SPCanvasBuf *buf) } } -CanvasXYGridSnapper::CanvasXYGridSnapper(CanvasXYGrid *grid, SPNamedView const *nv, NR::Coord const d) : LineSnapper(nv, d) +CanvasXYGridSnapper::CanvasXYGridSnapper(CanvasXYGrid *grid, SnapManager *sm, Geom::Coord const d) : LineSnapper(sm, d) { this->grid = grid; } +/** + * \return Snap tolerance (desktop coordinates); depends on current zoom so that it's always the same in screen pixels + */ +Geom::Coord CanvasXYGridSnapper::getSnapperTolerance() const +{ + SPDesktop const *dt = _snapmanager->getDesktop(); + double const zoom = dt ? dt->current_zoom() : 1; + return _snapmanager->snapprefs.getGridTolerance() / zoom; +} + +bool CanvasXYGridSnapper::getSnapperAlwaysSnap() const +{ + return _snapmanager->snapprefs.getGridTolerance() == 10000; //TODO: Replace this threshold of 10000 by a constant; see also tolerance-slider.cpp +} + LineSnapper::LineList -CanvasXYGridSnapper::_getSnapLines(NR::Point const &p) const +CanvasXYGridSnapper::_getSnapLines(Geom::Point const &p) const { LineList s; @@ -891,49 +994,58 @@ CanvasXYGridSnapper::_getSnapLines(NR::Point const &p) const for (unsigned int i = 0; i < 2; ++i) { - /* This is to make sure we snap to only visible grid lines */ - double scaled_spacing = grid->sw[i]; // this is spacing of visible lines if screen pixels + double spacing; - // convert screen pixels to px - // FIXME: after we switch to snapping dist in screen pixels, this will be unnecessary - if (SP_ACTIVE_DESKTOP) { - scaled_spacing /= SP_ACTIVE_DESKTOP->current_zoom(); + if (getSnapVisibleOnly()) { + // Only snapping to visible grid lines + spacing = grid->sw[i]; // this is the spacing of the visible grid lines measured in screen pixels + // convert screen pixels to px + // FIXME: after we switch to snapping dist in screen pixels, this will be unnecessary + SPDesktop const *dt = _snapmanager->getDesktop(); + if (dt) { + spacing /= dt->current_zoom(); + } + } else { + // Snapping to any grid line, whether it's visible or not + spacing = grid->spacing[i]; } - NR::Coord rounded; - NR::Point point_on_line; - - rounded = Inkscape::Util::round_to_upper_multiple_plus(p[i], scaled_spacing, grid->origin[i]); - point_on_line = i ? NR::Point(0, rounded) : NR::Point(rounded, 0); + Geom::Coord rounded; + Geom::Point point_on_line; + + rounded = Inkscape::Util::round_to_upper_multiple_plus(p[i], spacing, grid->origin[i]); + point_on_line = i ? Geom::Point(0, rounded) : Geom::Point(rounded, 0); s.push_back(std::make_pair(component_vectors[i], point_on_line)); - - rounded = Inkscape::Util::round_to_lower_multiple_plus(p[i], scaled_spacing, grid->origin[i]); - point_on_line = i ? NR::Point(0, rounded) : NR::Point(rounded, 0); + + rounded = Inkscape::Util::round_to_lower_multiple_plus(p[i], spacing, grid->origin[i]); + point_on_line = i ? Geom::Point(0, rounded) : Geom::Point(rounded, 0); s.push_back(std::make_pair(component_vectors[i], point_on_line)); } return s; } -void CanvasXYGridSnapper::_addSnappedLine(SnappedConstraints &sc, NR::Point const snapped_point, NR::Coord const snapped_distance, NR::Point const normal_to_line, NR::Point const point_on_line) const +void CanvasXYGridSnapper::_addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num, Geom::Point const normal_to_line, Geom::Point const point_on_line) const { - SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, normal_to_line, point_on_line); + SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, source, source_num, Inkscape::SNAPTARGET_GRID, getSnapperTolerance(), getSnapperAlwaysSnap(), normal_to_line, point_on_line); sc.grid_lines.push_back(dummy); } +void CanvasXYGridSnapper::_addSnappedPoint(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const +{ + SnappedPoint dummy = SnappedPoint(snapped_point, source, source_num, Inkscape::SNAPTARGET_GRID, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), constrained_snap, true); + sc.points.push_back(dummy); +} + /** * \return true if this Snapper will snap at least one kind of point. */ bool CanvasXYGridSnapper::ThisSnapperMightSnap() const { - return _named_view == NULL ? false : (_snap_enabled && _snap_from != 0); + return _snap_enabled && _snapmanager->snapprefs.getSnapToGrids() && _snapmanager->snapprefs.getSnapModeBBoxOrNodes(); } - - - - -}; /* namespace Inkscape */ +} // namespace Inkscape /* @@ -945,4 +1057,4 @@ bool CanvasXYGridSnapper::ThisSnapperMightSnap() const 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 :