X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdisplay%2Fcanvas-axonomgrid.cpp;h=550fd35593fd97bf782f338c286cf054087392de;hb=0dc33d4ce43e0bb49c63aa53b826ec4a1ff68e28;hp=febab42e4e4c8cefdc0a1e4034df55e89a61a1b3;hpb=1f8c5954acb3f152aeb1411b098ebc5fed99e6b0;p=inkscape.git diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index febab42e4..550fd3559 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -1,7 +1,5 @@ -#define CANVAS_AXONOMGRID_C - /* - * Copyright (C) 2006-2007 Johan Engelen + * Copyright (C) 2006-2008 Johan Engelen */ /* @@ -9,8 +7,6 @@ * axes are bound to a certain range of angles. The z-axis always has an angle * smaller than 90 degrees (measured from horizontal, 0 degrees being a line extending * to the right). The x-axis will always have an angle between 0 and 90 degrees. - * When I quickly think about it: all possibilities are probably covered this way. Eg. - * a z-axis with negative angle can be replaced with an x-axis, etc. */ /* @@ -21,9 +17,8 @@ #include "sp-canvas-util.h" #include "canvas-axonomgrid.h" -#include "util/mathfns.h" -#include "2geom/geom.h" -#include "display-forward.h" +#include "util/mathfns.h" +#include "2geom/line.h" #include #include "canvas-grid.h" @@ -38,7 +33,7 @@ #include "desktop.h" #include "document.h" -#include "prefs-utils.h" +#include "preferences.h" #define SAFE_SETPIXEL //undefine this when it is certain that setpixel is never called with invalid params @@ -72,7 +67,7 @@ sp_caxonomgrid_setpixel (SPCanvasBuf *buf, gint x, gint y, guint32 rgba) g = NR_RGBA32_G (rgba); b = NR_RGBA32_B (rgba); a = NR_RGBA32_A (rgba); - guchar * p = buf->buf + (y - buf->rect.y0) * buf->buf_rowstride + (x - buf->rect.x0) * 3; + guchar * 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]); @@ -139,7 +134,7 @@ sp_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]); @@ -193,79 +188,30 @@ attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int } CanvasAxonomGrid::CanvasAxonomGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc) - : CanvasGrid(nv, in_repr, in_doc, GRID_AXONOMETRIC), table(1, 1) + : CanvasGrid(nv, in_repr, in_doc, GRID_AXONOMETRIC) { - origin[NR::X] = prefs_get_double_attribute ("options.grids.axonom", "origin_x", 0.0); - origin[NR::Y] = prefs_get_double_attribute ("options.grids.axonom", "origin_y", 0.0); - color = prefs_get_int_attribute("options.grids.axonom", "color", 0x0000ff20); - empcolor = prefs_get_int_attribute("options.grids.axonom", "empcolor", 0x0000ff40); - empspacing = prefs_get_int_attribute("options.grids.axonom", "empspacing", 5); - gridunit = sp_unit_get_by_abbreviation( prefs_get_string_attribute("options.grids.axonom", "units") ); - lengthy = prefs_get_double_attribute ("options.grids.axonom", "spacing_y", 1.0); - angle_deg[X] = prefs_get_double_attribute ("options.grids.axonom", "angle_x", 30.0); - angle_deg[Z] = prefs_get_double_attribute ("options.grids.axonom", "angle_z", 30.0); - angle_deg[Y] =0; + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + gridunit = sp_unit_get_by_abbreviation( prefs->getString("/options/grids/axonom/units").data() ); + if (!gridunit) + gridunit = &sp_unit_get_by_id(SP_UNIT_PX); + origin[Geom::X] = sp_units_get_pixels( prefs->getDouble("/options/grids/axonom/origin_x", 0.0), *gridunit ); + origin[Geom::Y] = sp_units_get_pixels( prefs->getDouble("/options/grids/axonom/origin_y", 0.0), *gridunit ); + color = prefs->getInt("/options/grids/axonom/color", 0x0000ff20); + empcolor = prefs->getInt("/options/grids/axonom/empcolor", 0x0000ff40); + empspacing = prefs->getInt("/options/grids/axonom/empspacing", 5); + lengthy = sp_units_get_pixels( prefs->getDouble("/options/grids/axonom/spacing_y", 1.0), *gridunit ); + angle_deg[X] = prefs->getDouble("/options/grids/axonom/angle_x", 30.0); + angle_deg[Z] = prefs->getDouble("/options/grids/axonom/angle_z", 30.0); + angle_deg[Y] = 0; angle_rad[X] = deg_to_rad(angle_deg[X]); tan_angle[X] = tan(angle_rad[X]); angle_rad[Z] = deg_to_rad(angle_deg[Z]); tan_angle[Z] = tan(angle_rad[Z]); - snapper = new CanvasAxonomGridSnapper(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_sy.init (_("Spacing _Y:"), _("Base length of z-axis"), - "spacingy", _rumg, _wr, repr, doc); - sutemp = _rsu_sy.getSU(); - sutemp->setDigits(4); - sutemp->setIncrements(0.1, 1.0); - _rsu_ax.init (_("Angle X:"), _("Angle of x-axis"), - "gridanglex", _rumg, _wr, repr, doc); - _rsu_az.init (_("Angle Z:"), _("Angle of z-axis"), - "gridanglez", _rumg, _wr, repr, doc); - _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); - - Gtk::Widget const *const widget_array[] = { - 0, _rcbgrid._button, - _rumg._label, _rumg._sel, - 0, _rsu_ox.getSU(), - 0, _rsu_oy.getSU(), - 0, _rsu_sy.getSU(), - 0, _rsu_ax.getSU(), - 0, _rsu_az.getSU(), - _rcp_gcol._label, _rcp_gcol._cp, - 0, 0, - _rcp_gmcol._label, _rcp_gmcol._cp, - _rsi._label, &_rsi._hbox, - }; - - attach_all (table, widget_array, sizeof(widget_array)); - - vbox.show(); + snapper = new CanvasAxonomGridSnapper(this, &namedview->snap_manager, 0); if (repr) readRepr(); - updateWidgets(); } CanvasAxonomGrid::~CanvasAxonomGrid () @@ -351,18 +297,18 @@ CanvasAxonomGrid::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("spacingy")) ) { sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &lengthy, &gridunit); lengthy = sp_units_get_pixels(lengthy, *(gridunit)); - if (lengthy < 1.0) lengthy = 1.0; + if (lengthy < 0.0500) lengthy = 0.0500; } if ( (value = repr->attribute("gridanglex")) ) { @@ -401,12 +347,17 @@ CanvasAxonomGrid::readRepr() } 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) { @@ -430,10 +381,89 @@ CanvasAxonomGrid::onReprAttrChanged(Inkscape::XML::Node */*repr*/, gchar const * -Gtk::Widget & -CanvasAxonomGrid::getWidget() +Gtk::Widget * +CanvasAxonomGrid::newSpecificWidget() { - return vbox; + Gtk::Table * table = Gtk::manage( new Gtk::Table(1,1) ); + table->set_spacings(2); + +_wr.setUpdating (true); + + 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_sy = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalarUnit( + _("Spacing _Y:"), _("Base length of z-axis"), "spacingy", *_rumg, _wr, repr, doc) ); + Inkscape::UI::Widget::RegisteredScalar *_rsu_ax = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalar( + _("Angle X:"), _("Angle of x-axis"), "gridanglex", _wr, repr, doc ) ); + Inkscape::UI::Widget::RegisteredScalar *_rsu_az = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalar( + _("Angle Z:"), _("Angle of z-axis"), "gridanglez", _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 ) ); + + _rsu_ox->setDigits(4); + _rsu_ox->setIncrements(0.1, 1.0); + + _rsu_oy->setDigits(4); + _rsu_oy->setIncrements(0.1, 1.0); + + _rsu_sy->setDigits(4); + _rsu_sy->setIncrements(0.1, 1.0); + +_wr.setUpdating (false); + + Gtk::Widget const *const widget_array[] = { + 0, _rumg, + 0, _rsu_ox, + 0, _rsu_oy, + 0, _rsu_sy, + 0, _rsu_ax, + 0, _rsu_az, + _rcp_gcol->_label, _rcp_gcol, + 0, 0, + _rcp_gmcol->_label, _rcp_gmcol, + 0, _rsi, + }; + + 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 = lengthy; + double gridy = sp_pixels_get_units (val, *(gridunit)); + _rsu_sy->setValue (gridy); + + _rsu_ax->setValue(angle_deg[X]); + _rsu_az->setValue(angle_deg[Z]); + + _rcp_gcol->setRgba32 (color); + _rcp_gmcol->setRgba32 (empcolor); + _rsi->setValue (empspacing); + + return table; } @@ -443,22 +473,22 @@ CanvasAxonomGrid::getWidget() void CanvasAxonomGrid::updateWidgets() { - if (_wr.isUpdating()) return; +/* 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 = lengthy; @@ -475,15 +505,19 @@ CanvasAxonomGrid::updateWidgets() _wr.setUpdating (false); return; + */ } void -CanvasAxonomGrid::Update (NR::Matrix const &affine, unsigned int /*flags*/) +CanvasAxonomGrid::Update (Geom::Matrix const &affine, unsigned int /*flags*/) { ow = origin * affine; - sw = NR::Point(fabs(affine[0]),fabs(affine[3])); + sw = Geom::Point(fabs(affine[0]),fabs(affine[3])); + sw *= lengthy; + + scaled = false; for(int dim = 0; dim < 2; dim++) { gint scaling_factor = empspacing; @@ -491,10 +525,9 @@ CanvasAxonomGrid::Update (NR::Matrix const &affine, unsigned int /*flags*/) if (scaling_factor <= 1) scaling_factor = 5; - scaled = FALSE; int watchdog = 0; while ( (sw[dim] < 8.0) & (watchdog < 100) ) { - scaled = TRUE; + scaled = true; sw[dim] *= scaling_factor; // First pass, go up to the major line spacing, then // keep increasing by two. @@ -504,13 +537,13 @@ CanvasAxonomGrid::Update (NR::Matrix const &affine, unsigned int /*flags*/) } - spacing_ylines = sw[NR::X] * lengthy /(tan_angle[X] + tan_angle[Z]); - lyw = sw[NR::Y] * lengthy; - lxw_x = (lengthy / tan_angle[X]) * sw[NR::X]; - lxw_z = (lengthy / tan_angle[Z]) * sw[NR::X]; + spacing_ylines = sw[Geom::X] /(tan_angle[X] + tan_angle[Z]); + lyw = sw[Geom::Y]; + lxw_x = sw[Geom::X] / tan_angle[X]; + lxw_z = sw[Geom::X] / tan_angle[Z]; if (empspacing == 0) { - scaled = TRUE; + scaled = true; } } @@ -518,17 +551,27 @@ CanvasAxonomGrid::Update (NR::Matrix const &affine, unsigned int /*flags*/) void CanvasAxonomGrid::Render (SPCanvasBuf *buf) { + //set correct coloring, depending preference (when zoomed out, always major coloring or minor coloring) + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + guint32 _empcolor; + bool preference = prefs->getBool("/options/grids/no_emphasize_when_zoomedout", false); + if( scaled && preference ) { + _empcolor = color; + } else { + _empcolor = empcolor; + } + // gc = gridcoordinates (the coordinates calculated from the grids origin 'grid->ow'. // sc = screencoordinates ( for example "buf->rect.x0" is in screencoordinates ) // bc = buffer patch coordinates // tl = topleft ; br = bottomright - NR::Point buf_tl_gc; - NR::Point buf_br_gc; - buf_tl_gc[NR::X] = buf->rect.x0 - ow[NR::X]; - buf_tl_gc[NR::Y] = buf->rect.y0 - ow[NR::Y]; - buf_br_gc[NR::X] = buf->rect.x1 - ow[NR::X]; - buf_br_gc[NR::Y] = buf->rect.y1 - ow[NR::Y]; + Geom::Point buf_tl_gc; + Geom::Point buf_br_gc; + buf_tl_gc[Geom::X] = buf->rect.x0 - ow[Geom::X]; + buf_tl_gc[Geom::Y] = buf->rect.y0 - ow[Geom::Y]; + buf_br_gc[Geom::X] = buf->rect.x1 - ow[Geom::X]; + buf_br_gc[Geom::Y] = buf->rect.y1 - ow[Geom::Y]; gdouble x; gdouble y; @@ -536,9 +579,9 @@ CanvasAxonomGrid::Render (SPCanvasBuf *buf) // render the three separate line groups representing the main-axes // x-axis always goes from topleft to bottomright. (0,0) - (1,1) - gdouble const xintercept_y_bc = (buf_tl_gc[NR::X] * tan_angle[X]) - buf_tl_gc[NR::Y] ; + gdouble const xintercept_y_bc = (buf_tl_gc[Geom::X] * tan_angle[X]) - buf_tl_gc[Geom::Y] ; gdouble const xstart_y_sc = ( xintercept_y_bc - floor(xintercept_y_bc/lyw)*lyw ) + buf->rect.y0; - gint const xlinestart = (gint) Inkscape::round( (xstart_y_sc - buf->rect.x0*tan_angle[X] -ow[NR::Y]) / lyw ); + gint const xlinestart = (gint) Inkscape::round( (xstart_y_sc - buf->rect.x0*tan_angle[X] -ow[Geom::Y]) / lyw ); gint xlinenum = xlinestart; // lines starting on left side. for (y = xstart_y_sc; y < buf->rect.y1; y += lyw, xlinenum++) { @@ -547,10 +590,10 @@ CanvasAxonomGrid::Render (SPCanvasBuf *buf) gint const x1 = x0 + (gint) Inkscape::round( (buf->rect.y1 - y) / tan_angle[X] ); gint const y1 = buf->rect.y1; - if (!scaled && (xlinenum % empspacing) == 0) { - sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, empcolor); - } else { + if (!scaled && (xlinenum % empspacing) != 0) { sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, color); + } else { + sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, _empcolor); } } // lines starting from top side @@ -562,31 +605,31 @@ CanvasAxonomGrid::Render (SPCanvasBuf *buf) gint const x0 = (gint) Inkscape::round(x); gint const x1 = x0 + (gint) Inkscape::round( (y1 - y0) / tan_angle[X] ); - if (!scaled && (xlinenum % empspacing) == 0) { - sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, empcolor); - } else { + if (!scaled && (xlinenum % empspacing) != 0) { sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, color); + } else { + sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, _empcolor); } } // y-axis lines (vertical) - gdouble const ystart_x_sc = floor (buf_tl_gc[NR::X] / spacing_ylines) * spacing_ylines + ow[NR::X]; - gint const ylinestart = (gint) Inkscape::round((ystart_x_sc - ow[NR::X]) / spacing_ylines); + gdouble const ystart_x_sc = floor (buf_tl_gc[Geom::X] / spacing_ylines) * spacing_ylines + ow[Geom::X]; + gint const ylinestart = (gint) Inkscape::round((ystart_x_sc - ow[Geom::X]) / spacing_ylines); gint ylinenum = ylinestart; for (x = ystart_x_sc; x < buf->rect.x1; x += spacing_ylines, ylinenum++) { gint const x0 = (gint) Inkscape::round(x); - if (!scaled && (ylinenum % empspacing) == 0) { - sp_grid_vline (buf, x0, buf->rect.y0, buf->rect.y1 - 1, empcolor); - } else { + if (!scaled && (ylinenum % empspacing) != 0) { sp_grid_vline (buf, x0, buf->rect.y0, buf->rect.y1 - 1, color); + } else { + sp_grid_vline (buf, x0, buf->rect.y0, buf->rect.y1 - 1, _empcolor); } } // z-axis always goes from bottomleft to topright. (0,1) - (1,0) - gdouble const zintercept_y_bc = (buf_tl_gc[NR::X] * -tan_angle[Z]) - buf_tl_gc[NR::Y] ; + gdouble const zintercept_y_bc = (buf_tl_gc[Geom::X] * -tan_angle[Z]) - buf_tl_gc[Geom::Y] ; gdouble const zstart_y_sc = ( zintercept_y_bc - floor(zintercept_y_bc/lyw)*lyw ) + buf->rect.y0; - gint const zlinestart = (gint) Inkscape::round( (zstart_y_sc + buf->rect.x0*tan_angle[X] - ow[NR::Y]) / lyw ); + gint const zlinestart = (gint) Inkscape::round( (zstart_y_sc + buf->rect.x0*tan_angle[Z] - ow[Geom::Y]) / lyw ); gint zlinenum = zlinestart; // lines starting from left side for (y = zstart_y_sc; y < buf->rect.y1; y += lyw, zlinenum++) { @@ -595,10 +638,10 @@ CanvasAxonomGrid::Render (SPCanvasBuf *buf) gint const x1 = x0 + (gint) Inkscape::round( (y - buf->rect.y0 ) / tan_angle[Z] ); gint const y1 = buf->rect.y0; - if (!scaled && (zlinenum % empspacing) == 0) { - sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, empcolor); - } else { + if (!scaled && (zlinenum % empspacing) != 0) { sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, color); + } else { + sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, _empcolor); } } // draw lines from bottom-up @@ -609,21 +652,36 @@ CanvasAxonomGrid::Render (SPCanvasBuf *buf) gint const x0 = (gint) Inkscape::round(x); gint const x1 = x0 + (gint) Inkscape::round( (buf->rect.y1 - buf->rect.y0) / tan_angle[Z] ); - if (!scaled && (zlinenum % empspacing) == 0) { - sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, empcolor); - } else { + if (!scaled && (zlinenum % empspacing) != 0) { sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, color); + } else { + sp_caxonomgrid_drawline (buf, x0, y0, x1, y1, _empcolor); } } } -CanvasAxonomGridSnapper::CanvasAxonomGridSnapper(CanvasAxonomGrid *grid, SPNamedView const *nv, NR::Coord const d) : LineSnapper(nv, d) +CanvasAxonomGridSnapper::CanvasAxonomGridSnapper(CanvasAxonomGrid *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 CanvasAxonomGridSnapper::getSnapperTolerance() const +{ + SPDesktop const *dt = _snapmanager->getDesktop(); + double const zoom = dt ? dt->current_zoom() : 1; + return _snapmanager->snapprefs.getGridTolerance() / zoom; +} + +bool CanvasAxonomGridSnapper::getSnapperAlwaysSnap() const +{ + return _snapmanager->snapprefs.getGridTolerance() == 10000; //TODO: Replace this threshold of 10000 by a constant; see also tolerance-slider.cpp +} + LineSnapper::LineList -CanvasAxonomGridSnapper::_getSnapLines(NR::Point const &p) const +CanvasAxonomGridSnapper::_getSnapLines(Geom::Point const &p) const { LineList s; @@ -631,84 +689,118 @@ CanvasAxonomGridSnapper::_getSnapLines(NR::Point const &p) const return s; } - /* This is to make sure we snap to only visible grid lines */ - double scaled_spacing_h = grid->spacing_ylines; // this is spacing of visible lines if screen pixels - double scaled_spacing_v = grid->lyw; // vertical + double spacing_h; + double spacing_v; + + if (getSnapVisibleOnly()) { + // Only snapping to visible grid lines + spacing_h = grid->spacing_ylines; // this is the spacing of the visible grid lines measured in screen pixels + spacing_v = grid->lyw; // vertical + // 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_h /= dt->current_zoom(); + spacing_v /= dt->current_zoom(); + } + } else { + // Snapping to any grid line, whether it's visible or not + spacing_h = grid->lengthy /(grid->tan_angle[X] + grid->tan_angle[Z]); + spacing_v = grid->lengthy; - // 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_h /= SP_ACTIVE_DESKTOP->current_zoom(); - scaled_spacing_v /= SP_ACTIVE_DESKTOP->current_zoom(); } // In an axonometric grid, any point will be surrounded by 6 grid lines: // - 2 vertical grid lines, one left and one right from the point // - 2 angled z grid lines, one above and one below the point // - 2 angled x grid lines, one above and one below the point - + // Calculate the x coordinate of the vertical grid lines - NR::Coord x_max = Inkscape::Util::round_to_upper_multiple_plus(p[NR::X], scaled_spacing_h, grid->origin[NR::X]); - NR::Coord x_min = Inkscape::Util::round_to_lower_multiple_plus(p[NR::X], scaled_spacing_h, grid->origin[NR::X]); - + Geom::Coord x_max = Inkscape::Util::round_to_upper_multiple_plus(p[Geom::X], spacing_h, grid->origin[Geom::X]); + Geom::Coord x_min = Inkscape::Util::round_to_lower_multiple_plus(p[Geom::X], spacing_h, grid->origin[Geom::X]); + // Calculate the y coordinate of the intersection of the angled grid lines with the y-axis - double y_proj_along_z = p[NR::Y] - grid->tan_angle[Z]*(p[NR::X] - grid->origin[NR::X]); - double y_proj_along_x = p[NR::Y] + grid->tan_angle[X]*(p[NR::X] - grid->origin[NR::X]); - double y_proj_along_z_max = Inkscape::Util::round_to_upper_multiple_plus(y_proj_along_z, scaled_spacing_v, grid->origin[NR::Y]); - double y_proj_along_z_min = Inkscape::Util::round_to_lower_multiple_plus(y_proj_along_z, scaled_spacing_v, grid->origin[NR::Y]); - double y_proj_along_x_max = Inkscape::Util::round_to_upper_multiple_plus(y_proj_along_x, scaled_spacing_v, grid->origin[NR::Y]); - double y_proj_along_x_min = Inkscape::Util::round_to_lower_multiple_plus(y_proj_along_x, scaled_spacing_v, grid->origin[NR::Y]); - + double y_proj_along_z = p[Geom::Y] - grid->tan_angle[Z]*(p[Geom::X] - grid->origin[Geom::X]); + double y_proj_along_x = p[Geom::Y] + grid->tan_angle[X]*(p[Geom::X] - grid->origin[Geom::X]); + double y_proj_along_z_max = Inkscape::Util::round_to_upper_multiple_plus(y_proj_along_z, spacing_v, grid->origin[Geom::Y]); + double y_proj_along_z_min = Inkscape::Util::round_to_lower_multiple_plus(y_proj_along_z, spacing_v, grid->origin[Geom::Y]); + double y_proj_along_x_max = Inkscape::Util::round_to_upper_multiple_plus(y_proj_along_x, spacing_v, grid->origin[Geom::Y]); + double y_proj_along_x_min = Inkscape::Util::round_to_lower_multiple_plus(y_proj_along_x, spacing_v, grid->origin[Geom::Y]); + + // Calculate the versor for the angled grid lines + Geom::Point vers_x = Geom::Point(1, -grid->tan_angle[X]); + Geom::Point vers_z = Geom::Point(1, grid->tan_angle[Z]); + // Calculate the normal for the angled grid lines - NR::Point norm_x = NR::rot90(NR::Point(1, -grid->tan_angle[X])); - NR::Point norm_z = NR::rot90(NR::Point(1, grid->tan_angle[Z])); - - // The four angled grid lines form a parallellogram, enclosing the point - // One of the two vertical grid lines divides this parallellogram in two triangles - // We will now try to find out in which half (i.e. triangle) our point is, and return - // only the three grid lines defining that triangle - - // The vertical grid line is at the intersection of two angled grid lines. + Geom::Point norm_x = Geom::rot90(vers_x); + Geom::Point norm_z = Geom::rot90(vers_z); + + // The four angled grid lines form a parallelogram, enclosing the point + // One of the two vertical grid lines divides this parallelogram in two triangles + // We will now try to find out in which half (i.e. triangle) our point is, and return + // only the three grid lines defining that triangle + + // The vertical grid line is at the intersection of two angled grid lines. // Now go find that intersection! - Geom::Point result; - Geom::IntersectorKind is = line_intersection(norm_x.to_2geom(), norm_x[NR::Y]*y_proj_along_x_max, - norm_z.to_2geom(), norm_z[NR::Y]*y_proj_along_z_max, - result); - - // Determine which half of the parallellogram to use + Geom::Point p_x(0, y_proj_along_x_max); + Geom::Line line_x(p_x, p_x + vers_x); + Geom::Point p_z(0, y_proj_along_z_max); + Geom::Line line_z(p_z, p_z + vers_z); + + Geom::OptCrossing inters = Geom::OptCrossing(); // empty by default + try + { + inters = Geom::intersection(line_x, line_z); + } + catch (Geom::InfiniteSolutions e) + { + // We're probably dealing with parallel lines; this is useless! + return s; + } + + // Determine which half of the parallelogram to use bool use_left_half = true; bool use_right_half = true; - - if (is == Geom::intersects) { - use_left_half = (p[NR::X] - grid->origin[NR::X]) < result[Geom::X]; - use_right_half = !use_left_half; - } - - //std::cout << "intersection at " << result << " leads to use_left_half = " << use_left_half << " and use_right_half = " << use_right_half << std::endl; - + + if (inters) { + Geom::Point inters_pt = line_x.pointAt((*inters).ta); + use_left_half = (p[Geom::X] - grid->origin[Geom::X]) < inters_pt[Geom::X]; + use_right_half = !use_left_half; + } + // Return the three grid lines which define the triangle that encloses our point // If we didn't find an intersection above, all 6 grid lines will be returned if (use_left_half) { - s.push_back(std::make_pair(norm_z, NR::Point(grid->origin[NR::X], y_proj_along_z_max))); - s.push_back(std::make_pair(norm_x, NR::Point(grid->origin[NR::X], y_proj_along_x_min))); - s.push_back(std::make_pair(component_vectors[NR::X], NR::Point(x_max, 0))); + s.push_back(std::make_pair(norm_z, Geom::Point(grid->origin[Geom::X], y_proj_along_z_max))); + s.push_back(std::make_pair(norm_x, Geom::Point(grid->origin[Geom::X], y_proj_along_x_min))); + s.push_back(std::make_pair(component_vectors[Geom::X], Geom::Point(x_max, 0))); } - + if (use_right_half) { - s.push_back(std::make_pair(norm_z, NR::Point(grid->origin[NR::X], y_proj_along_z_min))); - s.push_back(std::make_pair(norm_x, NR::Point(grid->origin[NR::X], y_proj_along_x_max))); - s.push_back(std::make_pair(component_vectors[NR::X], NR::Point(x_min, 0))); - } - + s.push_back(std::make_pair(norm_z, Geom::Point(grid->origin[Geom::X], y_proj_along_z_min))); + s.push_back(std::make_pair(norm_x, Geom::Point(grid->origin[Geom::X], y_proj_along_x_max))); + s.push_back(std::make_pair(component_vectors[Geom::X], Geom::Point(x_min, 0))); + } + return s; } -void CanvasAxonomGridSnapper::_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 CanvasAxonomGridSnapper::_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 CanvasAxonomGridSnapper::_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); +} + +bool CanvasAxonomGridSnapper::ThisSnapperMightSnap() const +{ + return _snap_enabled && _snapmanager->snapprefs.getSnapToGrids() && _snapmanager->snapprefs.getSnapModeBBoxOrNodes(); +} }; // namespace Inkscape @@ -723,4 +815,4 @@ void CanvasAxonomGridSnapper::_addSnappedLine(SnappedConstraints &sc, NR::Point 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 :