X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdisplay%2Fcanvas-grid.cpp;h=3e7295b90aea83cf2ac2b7656ead1d0495e667ca;hb=771d00baf3d15209a77dce026f7ef45a78365e62;hp=84e8bfbf9d163649261244dd519462b6d909d333;hpb=ed70cc908f7fe9d5f2d86042e3fe1f758984c03a;p=inkscape.git diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 84e8bfbf9..3e7295b90 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -1,10 +1,8 @@ -#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 - * */ /* As a general comment, I am not exactly proud of how things are done. @@ -13,9 +11,10 @@ * Don't be shy to correct things. */ +#define INKSCAPE_CANVAS_GRID_C #include "sp-canvas-util.h" -#include "util/mathfns.h" +#include "util/mathfns.h" #include "display-forward.h" #include #include "desktop-handles.h" @@ -29,7 +28,7 @@ #include "desktop.h" #include "../document.h" -#include "prefs-utils.h" +#include "preferences.h" #include "canvas-grid.h" #include "canvas-axonomgrid.h" @@ -52,7 +51,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; @@ -124,7 +123,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); @@ -358,13 +357,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::isEnabled() -{ +bool CanvasGrid::isEnabled() +{ if (snapper == NULL) { return false; - } - - return snapper->getEnabled(); + } + + return snapper->getEnabled(); } // ########################################################## @@ -415,19 +414,20 @@ 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) { - gridunit = sp_unit_get_by_abbreviation( prefs_get_string_attribute("options.grids.xy", "units") ); + 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[NR::X] = sp_units_get_pixels( prefs_get_double_attribute ("options.grids.xy", "origin_x", 0.0), *(gridunit) ); - origin[NR::Y] = sp_units_get_pixels( prefs_get_double_attribute ("options.grids.xy", "origin_y", 0.0), *(gridunit) ); - 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] = sp_units_get_pixels( prefs_get_double_attribute ("options.grids.xy", "spacing_x", 0.0), *(gridunit) ); - spacing[NR::Y] = sp_units_get_pixels( prefs_get_double_attribute ("options.grids.xy", "spacing_y", 0.0), *(gridunit) ); - render_dotted = prefs_get_int_attribute ("options.grids.xy", "dotted", 0) == 1; + 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, 0); + snapper = new CanvasXYGridSnapper(this, &namedview->snap_manager, 0); if (repr) readRepr(); } @@ -567,27 +567,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]); - 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]); - 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)); } @@ -613,16 +613,16 @@ CanvasXYGrid::readRepr() } 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,"true") == 0); + snapper->setEnabled(strcmp(value,"false") != 0 && strcmp(value, "0") != 0); } for (GSList *l = canvasitems; l != NULL; l = l->next) { @@ -665,15 +665,15 @@ CanvasXYGrid::newSpecificWidget() Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gcol = Gtk::manage( new Inkscape::UI::Widget::RegisteredColorPicker( - _("Grid line _color:"), _("Grid line color"), _("Color of grid lines"), + _("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", + _("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) ); @@ -718,16 +718,16 @@ _wr.setUpdating (false); _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); @@ -760,16 +760,16 @@ CanvasXYGrid::updateWidgets() _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); @@ -788,11 +788,11 @@ CanvasXYGrid::updateWidgets() 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; @@ -880,15 +880,16 @@ 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_get_int_attribute ("options.grids", "no_emphasize_when_zoomedout", 0) == 1; - if( (scaled[NR::X] || scaled[NR::Y]) && no_emp_when_zoomed_out ) { + 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; @@ -897,9 +898,9 @@ CanvasXYGrid::Render (SPCanvasBuf *buf) 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) { + 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); @@ -908,9 +909,9 @@ CanvasXYGrid::Render (SPCanvasBuf *buf) 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) { + 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); @@ -919,16 +920,16 @@ CanvasXYGrid::Render (SPCanvasBuf *buf) } 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) - || ((scaled[NR::X] || scaled[NR::Y]) && no_emp_when_zoomed_out) ) + 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, color | (guint32)0x000000FF); // put alpha to max value } else { @@ -947,11 +948,26 @@ 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(Geom::Point const &p) const { @@ -964,7 +980,7 @@ CanvasXYGridSnapper::_getSnapLines(Geom::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 scaled_spacing = grid->sw[i]; // this is spacing of visible lines in screen pixels // convert screen pixels to px // FIXME: after we switch to snapping dist in screen pixels, this will be unnecessary @@ -972,13 +988,13 @@ CanvasXYGridSnapper::_getSnapLines(Geom::Point const &p) const scaled_spacing /= SP_ACTIVE_DESKTOP->current_zoom(); } - Geom::Coord rounded; + Geom::Coord rounded; Geom::Point point_on_line; - + rounded = Inkscape::Util::round_to_upper_multiple_plus(p[i], scaled_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 ? Geom::Point(0, rounded) : Geom::Point(rounded, 0); s.push_back(std::make_pair(component_vectors[i], point_on_line)); @@ -987,9 +1003,9 @@ CanvasXYGridSnapper::_getSnapLines(Geom::Point const &p) const return s; } -void CanvasXYGridSnapper::_addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, Geom::Point const normal_to_line, Geom::Point const point_on_line) const +void CanvasXYGridSnapper::_addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, SnapTargetType const &target, Geom::Point const normal_to_line, Geom::Point const point_on_line) const { - SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), normal_to_line, point_on_line); + SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, source, target, getSnapperTolerance(), getSnapperAlwaysSnap(), normal_to_line, point_on_line); sc.grid_lines.push_back(dummy); } @@ -998,14 +1014,10 @@ void CanvasXYGridSnapper::_addSnappedLine(SnappedConstraints &sc, Geom::Point co */ 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 /*