~7-eric/inkscape/boolop-fix

« back to all changes in this revision

Viewing changes to src/selection-chemistry.cpp

Committer: Matthew Petroff
Date: 2013-08-06 18:54:40 UTC
mfrom: (12380.1.63 gsoc-2013-unit-refactor)
Revision ID: matthew@mpetroff.net-20130806185440-etxvnmedelj8273o

Merge Google Summer of Code unit refactor.

files added:
src/ui/widget/unit-tracker.cpp

src/ui/widget/unit-tracker.h

files removed:
src/helper/unit-menu.cpp

src/helper/unit-menu.h

src/helper/unit-tracker.cpp

src/helper/unit-tracker.h

src/helper/units-test.h

src/helper/units.cpp

src/helper/units.h

src/sp-metric.h

src/sp-metrics.cpp

src/sp-metrics.h

src/unit-constants.h

files modified:
AUTHORS

src/CMakeLists.txt

src/Makefile_insert

src/arc-context.cpp

src/box3d-context.cpp

src/desktop-events.cpp

src/desktop.cpp

src/display/canvas-axonomgrid.cpp

src/display/canvas-grid.cpp

src/display/canvas-grid.h

src/document.cpp

src/document.h

src/doxygen-main.cpp

src/extension/internal/cairo-render-context.cpp

src/extension/internal/cairo-renderer-pdf-out.cpp

src/extension/internal/cairo-renderer.cpp

src/extension/internal/emf-win32-inout.cpp

src/extension/internal/emf-win32-print.cpp

src/extension/internal/gdkpixbuf-input.cpp

src/extension/internal/latex-pstricks.cpp

src/extension/internal/latex-text-renderer.cpp

src/extension/internal/pdfinput/pdf-parser.cpp

src/extension/internal/pdfinput/svg-builder.cpp

src/flood-context.cpp

src/flood-context.h

src/helper/Makefile_insert

src/helper/pixbuf-ops.cpp

src/live_effects/lpe-path_length.cpp

src/live_effects/lpe-ruler.cpp

src/live_effects/parameter/unit.cpp

src/live_effects/parameter/unit.h

src/lpe-tool-context.cpp

src/lpe-tool-context.h

src/main.cpp

src/measure-context.cpp

src/pen-context.cpp

src/preferences.cpp

src/rect-context.cpp

src/selection-chemistry.cpp

src/seltrans.cpp

src/snap-preferences.h

src/sp-guide.cpp

src/sp-namedview.cpp

src/sp-namedview.h

src/sp-text.cpp

src/spiral-context.cpp

src/star-context.cpp

src/style.cpp

src/svg/svg-length.cpp

src/text-context.cpp

src/text-editing.cpp

src/ui/CMakeLists.txt

src/ui/clipboard.cpp

src/ui/dialog/clonetiler.cpp

src/ui/dialog/clonetiler.h

src/ui/dialog/document-properties.cpp

src/ui/dialog/export.cpp

src/ui/dialog/export.h

src/ui/dialog/guides.cpp

src/ui/dialog/inkscape-preferences.cpp

src/ui/dialog/print.cpp

src/ui/dialog/text-edit.cpp

src/ui/tool/node.cpp

src/ui/widget/Makefile_insert

src/ui/widget/page-sizer.cpp

src/ui/widget/page-sizer.h

src/ui/widget/registered-widget.cpp

src/ui/widget/registered-widget.h

src/ui/widget/rendering-options.cpp

src/ui/widget/scalar-unit.cpp

src/ui/widget/selected-style.cpp

src/ui/widget/selected-style.h

src/ui/widget/style-swatch.cpp

src/ui/widget/style-swatch.h

src/ui/widget/unit-menu.cpp

src/ui/widget/unit-menu.h

src/util/expression-evaluator.cpp

src/util/units.cpp

src/util/units.h

src/widgets/arc-toolbar.cpp

src/widgets/box3d-toolbar.cpp

src/widgets/calligraphy-toolbar.cpp

src/widgets/connector-toolbar.cpp

src/widgets/desktop-widget.cpp

src/widgets/dropper-toolbar.cpp

src/widgets/eraser-toolbar.cpp

src/widgets/font-selector.cpp

src/widgets/gradient-toolbar.cpp

src/widgets/lpe-toolbar.cpp

src/widgets/measure-toolbar.cpp

src/widgets/mesh-toolbar.cpp

src/widgets/node-toolbar.cpp

src/widgets/paintbucket-toolbar.cpp

src/widgets/pencil-toolbar.cpp

src/widgets/rect-toolbar.cpp

src/widgets/ruler.cpp

src/widgets/ruler.h

src/widgets/select-toolbar.cpp

src/widgets/spiral-toolbar.cpp

src/widgets/spray-toolbar.cpp

src/widgets/spw-utilities.cpp

src/widgets/spw-utilities.h

src/widgets/star-toolbar.cpp

src/widgets/stroke-style.cpp

src/widgets/stroke-style.h

src/widgets/text-toolbar.cpp

src/widgets/toolbox.cpp

src/widgets/toolbox.h

src/widgets/tweak-toolbar.cpp

src/widgets/zoom-toolbar.cpp

Show diffs side-by-side

added added

removed removed

src/selection-chemistry.cpp

#include <map>

#include <cstring>

#include <string>

#include "helper/units.h"

#include "sp-item.h"

#include "box3d.h"

#include "persp3d.h"

#include "unit-constants.h"

#include "util/units.h"

#include "xml/simple-document.h"

#include "sp-filter-reference.h"

#include "gradient-drag.h"

3398

3397

res = prefs_res;

3399

3398

} else if (0 < prefs_min) {

3400

3399

// If minsize is given, look up minimum bitmap size (default 250 pixels) and calculate resolution from it

3401

res = PX_PER_IN * prefs_min / MIN(bbox->width(), bbox->height());

3400

res = Inkscape::Util::Quantity::convert(1, "in", "px") * prefs_min / MIN(bbox->width(), bbox->height());

3402

3401

} else {

3403

3402

float hint_xdpi = 0, hint_ydpi = 0;

3404

3403

Glib::ustring hint_filename;

3413

3412

res = hint_xdpi;

3414

3413

} else {

3415

3414

// if all else fails, take the default 90 dpi

3416

res = PX_PER_IN;

3415

res = Inkscape::Util::Quantity::convert(1, "in", "px");

3417

3416

}

3418

3417

}

3419

3418

}

3420

3419

3421

3420

// The width and height of the bitmap in pixels

3422

unsigned width = (unsigned) floor(bbox->width() * res / PX_PER_IN);

3423

unsigned height =(unsigned) floor(bbox->height() * res / PX_PER_IN);

3421

unsigned width = (unsigned) floor(bbox->width() * res / Inkscape::Util::Quantity::convert(1, "in", "px"));

3422

unsigned height =(unsigned) floor(bbox->height() * res / Inkscape::Util::Quantity::convert(1, "in", "px"));

3424

3423

3425

3424

// Find out if we have to run an external filter

3426

3425

gchar const *run = NULL;

3452

3451

3453

3452

double shift_x = bbox->min()[Geom::X];

3454

3453

double shift_y = bbox->max()[Geom::Y];

3455

if (res == PX_PER_IN) { // for default 90 dpi, snap it to pixel grid

3454

if (res == Inkscape::Util::Quantity::convert(1, "in", "px")) { // for default 90 dpi, snap it to pixel grid

3456

3455

shift_x = round(shift_x);

3457

3456

shift_y = -round(-shift_y); // this gets correct rounding despite coordinate inversion, remove the negations when the inversion is gone

3458

3457

}

3485

3484

// Create the repr for the image

3486

3485

Inkscape::XML::Node * repr = xml_doc->createElement("svg:image");

3487

3486

sp_embed_image(repr, pb, "image/png");

3488

if (res == PX_PER_IN) { // for default 90 dpi, snap it to pixel grid

3487

if (res == Inkscape::Util::Quantity::convert(1, "in", "px")) { // for default 90 dpi, snap it to pixel grid

3489

3488

sp_repr_set_svg_double(repr, "width", width);

3490

3489

sp_repr_set_svg_double(repr, "height", height);

3491

3490

} else {

Older »