X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdisplay%2Fcanvas-axonomgrid.cpp;h=49ca07ca7d511e0c73da32ab06a380bb4ddfa24f;hb=77eda576f455eeb23c7b92510f38bc60738473ab;hp=51aa4378313b31ad88569d2821ce32e648eb7f31;hpb=c2057a738f9ea8cb7acdeb1feb69cef5b0d4bc56;p=inkscape.git diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 51aa43783..49ca07ca7 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -1,7 +1,7 @@ #define CANVAS_AXONOMGRID_C /* - * Copyright (C) 2006-2007 Johan Engelen + * Copyright (C) 2006-2008 Johan Engelen */ /* @@ -9,8 +9,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. */ /* @@ -72,7 +70,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 +137,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]); @@ -214,6 +212,8 @@ CanvasAxonomGrid::CanvasAxonomGrid (SPNamedView * nv, Inkscape::XML::Node * in_r tan_angle[Z] = tan(angle_rad[Z]); snapper = new CanvasAxonomGridSnapper(this, namedview, 0); + + if (repr) readRepr(); } CanvasAxonomGrid::~CanvasAxonomGrid () @@ -386,60 +386,80 @@ CanvasAxonomGrid::newSpecificWidget() _wr.setUpdating (true); - Inkscape::UI::Widget::RegisteredUnitMenu *_rumg = new Inkscape::UI::Widget::RegisteredUnitMenu(); - Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_ox = new Inkscape::UI::Widget::RegisteredScalarUnit(); - Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_oy = new Inkscape::UI::Widget::RegisteredScalarUnit(); - Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_sy = new Inkscape::UI::Widget::RegisteredScalarUnit(); + 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 = new Inkscape::UI::Widget::RegisteredColorPicker(); - Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gmcol = new Inkscape::UI::Widget::RegisteredColorPicker(); - Inkscape::UI::Widget::RegisteredSuffixedInteger *_rsi = new Inkscape::UI::Widget::RegisteredSuffixedInteger(); - - Inkscape::UI::Widget::ScalarUnit * sutemp = NULL; - _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); - _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); + + 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[] = { - _rumg->_label, _rumg->_sel, - 0, _rsu_ox->getSU(), - 0, _rsu_oy->getSU(), - 0, _rsu_sy->getSU(), + 0, _rumg, + 0, _rsu_ox, + 0, _rsu_oy, + 0, _rsu_sy, 0, _rsu_ax, 0, _rsu_az, - _rcp_gcol->_label, _rcp_gcol->_cp, + _rcp_gcol->_label, _rcp_gcol, 0, 0, - _rcp_gmcol->_label, _rcp_gmcol->_cp, - _rsi->_label, &_rsi->_hbox, + _rcp_gmcol->_label, _rcp_gmcol, + 0, _rsi, }; attach_all (*table, widget_array, sizeof(widget_array)); - if (repr) readRepr(); - updateWidgets(); + // set widget values + _rumg->setUnit (gridunit); + + gdouble val; + val = origin[NR::X]; + val = sp_pixels_get_units (val, *(gridunit)); + _rsu_ox->setValue (val); + val = origin[NR::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; } @@ -526,6 +546,15 @@ 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) + guint32 _empcolor; + bool preference = prefs_get_int_attribute ("options.grids", "no_emphasize_when_zoomedout", 0) == 1; + 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 @@ -555,10 +584,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 @@ -570,10 +599,10 @@ 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); } } @@ -584,17 +613,17 @@ CanvasAxonomGrid::Render (SPCanvasBuf *buf) 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 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[NR::Y]) / lyw ); gint zlinenum = zlinestart; // lines starting from left side for (y = zstart_y_sc; y < buf->rect.y1; y += lyw, zlinenum++) { @@ -603,10 +632,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 @@ -617,10 +646,10 @@ 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); } } } @@ -679,8 +708,8 @@ CanvasAxonomGridSnapper::_getSnapLines(NR::Point const &p) const // 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, + Geom::IntersectorKind is = line_intersection(norm_x, norm_x[NR::Y]*y_proj_along_x_max, + norm_z, norm_z[NR::Y]*y_proj_along_z_max, result); // Determine which half of the parallellogram to use