summaryrefslogtreecommitdiffstats
path: root/src/display/canvas-grid.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2013-10-05 03:54:43 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2013-10-05 03:54:43 +0000
commit706294ff1fa82c86089221d8ee4a0d5bd032925a (patch)
tree4f57389a922f2cb3fdcec99cb21599580e954867 /src/display/canvas-grid.cpp
parentC++ (diff)
downloadinkscape-706294ff1fa82c86089221d8ee4a0d5bd032925a.tar.gz
inkscape-706294ff1fa82c86089221d8ee4a0d5bd032925a.zip
Rewrite the internals of the unit code for somewhat better performance
(bzr r12661)
Diffstat (limited to 'src/display/canvas-grid.cpp')
-rw-r--r--src/display/canvas-grid.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index ef32c113b..5701b91a1 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -588,20 +588,20 @@ CanvasXYGrid::readRepr()
{
gchar const *value;
if ( (value = repr->attribute("originx")) ) {
- Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+ Inkscape::Util::Quantity q = unit_table.parseQuantity(value);
gridunit = q.unit;
- origin[Geom::X] = unit_table.getQuantity(value).value("px");
+ origin[Geom::X] = q.value("px");
}
if ( (value = repr->attribute("originy")) ) {
- Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+ Inkscape::Util::Quantity q = unit_table.parseQuantity(value);
gridunit = q.unit;
- origin[Geom::Y] = unit_table.getQuantity(value).value("px");
+ origin[Geom::Y] = q.value("px");
}
if ( (value = repr->attribute("spacingx")) ) {
double oldVal = spacing[Geom::X];
- Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+ Inkscape::Util::Quantity q = unit_table.parseQuantity(value);
gridunit = q.unit;
spacing[Geom::X] = q.quantity;
validateScalar(oldVal, &spacing[Geom::X]);
@@ -609,7 +609,7 @@ CanvasXYGrid::readRepr()
}
if ( (value = repr->attribute("spacingy")) ) {
double oldVal = spacing[Geom::Y];
- Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+ Inkscape::Util::Quantity q = unit_table.parseQuantity(value);
gridunit = q.unit;
spacing[Geom::Y] = q.quantity;
validateScalar(oldVal, &spacing[Geom::Y]);