X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdisplay%2Fcanvas-axonomgrid.cpp;h=2bfac655e39904d5e76e5a80642a091173352592;hb=274f6d25a9facdc5bfbe8b4df42e6173e4328775;hp=79e301b7350d707b2106d1ced3cd75bfbb021c7e;hpb=1b9ffafb34ae318f35758f017fa89e913ecb29d2;p=inkscape.git diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 79e301b73..2bfac655e 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -70,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]); @@ -137,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]); @@ -212,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 () @@ -384,10 +386,14 @@ 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( @@ -404,45 +410,35 @@ _wr.setUpdating (true); _("Color of the major (highlighted) grid lines"), "empcolor", "empopacity", _wr, repr, doc)); - 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); - _rsi->init (_("_Major grid line every:"), _("lines"), "empspacing", _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, 0, 0, _rcp_gmcol->_label, _rcp_gmcol, - _rsi->_label, &_rsi->_hbox, + 0, _rsi, }; attach_all (*table, widget_array, sizeof(widget_array)); - if (repr) readRepr(); - // set widget values _rumg->setUnit (gridunit); @@ -627,7 +623,7 @@ CanvasAxonomGrid::Render (SPCanvasBuf *buf) // 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++) {