X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=4be3ee0a648c1a1a353960e798b7e7f6b2a6e974;hp=9b94ba26922a8bbdc01780143ece1abc26650cab;hb=2d12d37f1657d6aef9bb80d735b6c7022aecba6e;hpb=b29310a04a51cd7d39d0858e2dec8a75c15cf097 diff --git a/src/document.cpp b/src/document.cpp index 9b94ba2..4be3ee0 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -303,6 +303,7 @@ unsigned Document::AddPath(unsigned start_index, unsigned end_index, const Colou unsigned data_index = AddPathData(path); Rect bounds = path.SolveBounds(m_objects); unsigned result = Add(PATH, bounds,data_index); + m_objects.paths[data_index].m_index = result; //Debug("Added path %u -> %u (%u objects) colour {%u,%u,%u,%u}, stroke {%u,%u,%u,%u}", start_index, end_index, (end_index - start_index), fill.r, fill.g, fill.b, fill.a, stroke.r, stroke.g, stroke.b, stroke.a); return result; } @@ -1052,19 +1053,25 @@ void Document::TransformObjectBounds(const SVGMatrix & transform) } } -void Document::TranslateObjects(const Real & dx, const Real & dy) +void Document::TranslateObjects(const Real & dx, const Real & dy, ObjectType type) { for (unsigned i = 0; i < m_count; ++i) { - m_objects.bounds[i].x += dx; - m_objects.bounds[i].y += dy; + if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type) + { + m_objects.bounds[i].x += dx; + m_objects.bounds[i].y += dy; + } } } -void Document::ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real & scale_amount) +void Document::ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real & scale_amount, ObjectType type) { for (unsigned i = 0; i < m_count; ++i) { + if (type != NUMBER_OF_OBJECT_TYPES && m_objects.types[i] != type) + continue; + m_objects.bounds[i].w /= scale_amount; m_objects.bounds[i].h /= scale_amount; //m_objects.bounds[i].x = x + (m_objects.bounds[i].x-x)/scale_amount; @@ -1076,7 +1083,7 @@ void Document::ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real m_objects.bounds[i].y -= y; m_objects.bounds[i].y /= scale_amount; m_objects.bounds[i].y += y; - - } - + } } + +