Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 20693 → Rev 20694

/trunk/Scribus/scribus/canvasmode.cpp
1487,11 → 1487,11
{
if (!resizingsmaller)
{
m_doc->MoveItem(-resizeBy, 0, currItem);
m_doc->moveItem(-resizeBy, 0, currItem);
currItem->moveImageXYOffsetBy(resizeBy / currItem->imageXScale(), 0);
}
currItem->Sizing = false;
m_doc->SizeItem(currItem->width()+resizeBy, currItem->height(), currItem);
m_doc->sizeItem(currItem->width()+resizeBy, currItem->height(), currItem);
}
}
currItem->update();
1561,11 → 1561,11
{
if (resizingsmaller)
{
m_doc->MoveItem(-resizeBy, 0, currItem);
m_doc->moveItem(-resizeBy, 0, currItem);
currItem->moveImageXYOffsetBy(resizeBy / currItem->imageXScale(), 0);
}
currItem->Sizing = false;
m_doc->SizeItem(currItem->width() + resizeBy, currItem->height(), currItem);
m_doc->sizeItem(currItem->width() + resizeBy, currItem->height(), currItem);
}
}
currItem->update();
1635,11 → 1635,11
{
if (!resizingsmaller)
{
m_doc->MoveItem(0, -resizeBy, currItem);
m_doc->moveItem(0, -resizeBy, currItem);
currItem->moveImageXYOffsetBy(0, resizeBy / currItem->imageYScale());
}
currItem->Sizing = false;
m_doc->SizeItem(currItem->width(), currItem->height() + resizeBy, currItem);
m_doc->sizeItem(currItem->width(), currItem->height() + resizeBy, currItem);
}
}
currItem->update();
1709,11 → 1709,11
{
if (resizingsmaller)
{
m_doc->MoveItem(0, -resizeBy, currItem);
m_doc->moveItem(0, -resizeBy, currItem);
currItem->moveImageXYOffsetBy(0, resizeBy / currItem->imageYScale());
}
currItem->Sizing = false;
m_doc->SizeItem(currItem->width(), currItem->height() + resizeBy, currItem);
m_doc->sizeItem(currItem->width(), currItem->height() + resizeBy, currItem);
}
}
currItem->update();
1760,7 → 1760,7
PageItem *currItem = m_doc->m_Selection->itemAt(0);
double xposOrig = currItem->xPos();
double yposOrig = currItem->yPos();
m_doc->AdjustItemSize(currItem, true, true);
m_doc->adjustItemSize(currItem, true, true);
if (!m_doc->nodeEdit.isContourLine())
currItem->ContourLine.translate(xposOrig - currItem->xPos(),yposOrig - currItem->yPos());
currItem->update();
/trunk/Scribus/scribus/canvasmode_create.cpp
664,7 → 664,7
else
z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, m_doc->itemToolPrefs().shapeFillColor, m_doc->itemToolPrefs().shapeLineColor);
m_doc->Items->at(z)->SetFrameShape(m_doc->ValCount, m_doc->ShapeValues);
m_doc->AdjustItemSize(m_doc->Items->at(z));
m_doc->adjustItemSize(m_doc->Items->at(z));
m_doc->setRedrawBounding(m_doc->Items->at(z));
m_doc->Items->at(z)->FrameType = createObjectSubMode + 2;
break;
719,7 → 719,7
z = m_doc->itemAddArea(PageItem::Spiral, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor);
else
z = m_doc->itemAdd(PageItem::Spiral, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs().shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs().lineColor);
m_doc->AdjustItemSize(m_doc->Items->at(z));
m_doc->adjustItemSize(m_doc->Items->at(z));
m_doc->setRedrawBounding(m_doc->Items->at(z));
break;
case modeInsertPDFButton:
/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
94,9 → 94,9
}
else
{
m_doc->SizeItem(currItem->PoLine.WidthHeight().x(), currItem->PoLine.WidthHeight().y(), currItem, false, false);
m_doc->sizeItem(currItem->PoLine.WidthHeight().x(), currItem->PoLine.WidthHeight().y(), currItem, false, false);
// currItem->setPolyClip(qRound(qMax(currItem->lineWidth() / 2.0, 1)));
m_doc->AdjustItemSize(currItem);
m_doc->adjustItemSize(currItem);
currItem->ContourLine = currItem->PoLine.copy();
}
m_view->resetMousePressed();
170,9 → 170,9
if (!currItem)
return;
 
m_doc->SizeItem(currItem->PoLine.WidthHeight().x(), currItem->PoLine.WidthHeight().y(), currItem, false, false);
m_doc->sizeItem(currItem->PoLine.WidthHeight().x(), currItem->PoLine.WidthHeight().y(), currItem, false, false);
currItem->setPolyClip(qRound(qMax(currItem->lineWidth() / 2.0, 1.0)));
m_doc->AdjustItemSize(currItem);
m_doc->adjustItemSize(currItem);
currItem->ContourLine = currItem->PoLine.copy();
currItem->ClipEdited = true;
currItem->FrameType = 3;
329,14 → 329,14
if (npf2.x() < 0)
{
currItem->PoLine.translate(-npf2.x(), 0);
m_doc->MoveItem(npf2.x(), 0, currItem);
m_doc->moveItem(npf2.x(), 0, currItem);
}
if (npf2.y() < 0)
{
currItem->PoLine.translate(0, -npf2.y());
m_doc->MoveItem(0, npf2.y(), currItem);
m_doc->moveItem(0, npf2.y(), currItem);
}
m_doc->SizeItem(currItem->PoLine.WidthHeight().x(), currItem->PoLine.WidthHeight().y(), currItem, false, false, false);
m_doc->sizeItem(currItem->PoLine.WidthHeight().x(), currItem->PoLine.WidthHeight().y(), currItem, false, false, false);
currItem->setPolyClip(qRound(qMax(currItem->lineWidth() / 2, 1.0)));
m_canvas->newRedrawPolygon();
undoManager->setUndoEnabled(false);
382,12 → 382,12
if (np2.x() < 0)
{
currItem->PoLine.translate(-np2.x(), 0);
m_doc->MoveItem(np2.x(), 0, currItem);
m_doc->moveItem(np2.x(), 0, currItem);
}
if (np2.y() < 0)
{
currItem->PoLine.translate(0, -np2.y());
m_doc->MoveItem(0, np2.y(), currItem);
m_doc->moveItem(0, np2.y(), currItem);
}
if (FirstPoly)
{
396,8 → 396,8
}
else
{
m_doc->SizeItem(currItem->PoLine.WidthHeight().x(), currItem->PoLine.WidthHeight().y(), currItem, false, false, false);
m_doc->AdjustItemSize(currItem);
m_doc->sizeItem(currItem->PoLine.WidthHeight().x(), currItem->PoLine.WidthHeight().y(), currItem, false, false, false);
m_doc->adjustItemSize(currItem);
currItem->Sizing = ssiz;
currItem->ContourLine = currItem->PoLine.copy();
m_canvas->setRenderModeUseBuffer(false);
/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
270,8 → 270,8
currItem->setXYPos(tp2.x(), tp2.y(), true);
currItem->PoLine.translate(-tp2.x(), -tp2.y());
FPoint tp(getMaxClipF(&currItem->PoLine));
m_doc->SizeItem(tp.x(), tp.y(), currItem, false, false, false);
m_doc->AdjustItemSize(currItem);
m_doc->sizeItem(tp.x(), tp.y(), currItem, false, false, false);
m_doc->adjustItemSize(currItem);
m_doc->m_Selection->clear();
m_doc->m_Selection->addItem(currItem);
currItem->ClipEdited = true;
/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
261,8 → 261,8
currItem->setXYPos(tp2.x(), tp2.y(), true);
currItem->PoLine.translate(-tp2.x(), -tp2.y());
FPoint tp(getMaxClipF(&currItem->PoLine));
m_doc->SizeItem(tp.x(), tp.y(), currItem, false, false, false);
m_doc->AdjustItemSize(currItem);
m_doc->sizeItem(tp.x(), tp.y(), currItem, false, false, false);
m_doc->adjustItemSize(currItem);
m_doc->m_Selection->clear();
m_doc->m_Selection->addItem(currItem);
currItem->ClipEdited = true;
/trunk/Scribus/scribus/canvasmode_edit.cpp
813,10 → 813,10
else
ny = npx.y();
}
m_doc->MoveItem(nx-currItem->xPos(), ny-currItem->yPos(), currItem);
m_doc->moveItem(nx-currItem->xPos(), ny-currItem->yPos(), currItem);
}
else
m_doc->MoveItem(0, 0, currItem);
m_doc->moveItem(0, 0, currItem);
}
m_canvas->m_viewMode.operItemMoving = false;
if (m_doc->m_Selection->isMultipleSelection())
/trunk/Scribus/scribus/canvasmode_editarc.cpp
246,7 → 246,7
currItem->PoLine.fromQPainterPath(ppr, true);
FPoint wh = getMaxClipF(&currItem->PoLine);
currItem->setWidthHeight(wh.x(),wh.y());
m_doc->AdjustItemSize(currItem);
m_doc->adjustItemSize(currItem);
currItem->OldB2 = currItem->width();
currItem->OldH2 = currItem->height();
QPainterPath pp;
/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
458,7 → 458,7
}
m_doc->nodeEdit.moveClipPoint(currItem, npf);
}
m_doc->AdjustItemSize(currItem, true, true);
m_doc->adjustItemSize(currItem, true, true);
if (!m_doc->nodeEdit.isContourLine())
currItem->ContourLine.translate(xposOrig - currItem->xPos(), yposOrig - currItem->yPos());
m_doc->regionsChanged()->update(QRectF());
732,7 → 732,7
bb->setRotation(currItem->rotation());
bb->ClipEdited = true;
m_doc->Items->insert(m_doc->Items->indexOf(currItem), bb);
m_doc->AdjustItemSize(bb, true, true);
m_doc->adjustItemSize(bb, true, true);
}
currItem->PoLine = cli.copy();
}
759,7 → 759,7
else
bb->PoLine.putPoints(0, Clip.size()-(m_doc->nodeEdit.clre()+2), Clip, m_doc->nodeEdit.clre()+2);
bb->setRotation(currItem->rotation());
m_doc->AdjustItemSize(bb, true, true);
m_doc->adjustItemSize(bb, true, true);
bb->ClipEdited = true;
bb->setFrameType(currItem->frameType());
cli.resize(0);
942,7 → 942,7
yp = currItem->yPos();
w = currItem->width();
h = currItem->height();
m_doc->AdjustItemSize(currItem, true, true);
m_doc->adjustItemSize(currItem, true, true);
xp2 = currItem->xPos();
yp2 = currItem->yPos();
w2 = currItem->width();
/trunk/Scribus/scribus/canvasmode_normal.cpp
1112,7 → 1112,7
else
{
currItem = m_doc->m_Selection->itemAt(0);
m_doc->MoveItem(m_objectDeltaPos.x(), m_objectDeltaPos.y(), currItem);
m_doc->moveItem(m_objectDeltaPos.x(), m_objectDeltaPos.y(), currItem);
if (m_doc->SnapGrid)
{
double nx = currItem->xPos();
1140,7 → 1140,7
ny += (gy - gyo);
}
}
m_doc->MoveItem(nx-currItem->xPos(), ny-currItem->yPos(), currItem);
m_doc->moveItem(nx-currItem->xPos(), ny-currItem->yPos(), currItem);
}
}
m_canvas->m_viewMode.operItemMoving = false;
/trunk/Scribus/scribus/nodeeditcontext.cpp
205,14 → 205,14
{
if ((np.x() < 0) && (!m_isContourLine) && (!(currItem->isGroup() || currItem->isSymbol())))
{
Doc->SizeItem(currItem->width() - np.x(), currItem->height(), currItem, false, false, false);
Doc->sizeItem(currItem->width() - np.x(), currItem->height(), currItem, false, false, false);
if (currItem->rotation() != 0)
{
FPoint npv(np.x(), 0);
Doc->MoveRotated(currItem, npv);
Doc->moveRotated(currItem, npv);
}
else
Doc->MoveItem(np.x(), 0, currItem);
Doc->moveItem(np.x(), 0, currItem);
Clip.translate(-np.x(), 0);
if (!currItem->imageFlippedH())
currItem->moveImageInFrame(-np.x()/currItem->imageXScale(), 0);
220,14 → 220,14
}
if ((np.y() < 0) && (!m_isContourLine) && (!(currItem->isGroup() || currItem->isSymbol())))
{
Doc->SizeItem(currItem->width(), currItem->height() - np.y(), currItem, false, false, false);
Doc->sizeItem(currItem->width(), currItem->height() - np.y(), currItem, false, false, false);
if (currItem->rotation() != 0)
{
FPoint npv(0, np.y());
Doc->MoveRotated(currItem, npv);
Doc->moveRotated(currItem, npv);
}
else
Doc->MoveItem(0, np.y(), currItem);
Doc->moveItem(0, np.y(), currItem);
Clip.translate(0, -np.y());
if (!currItem->imageFlippedV())
currItem->moveImageInFrame(0, -np.y()/currItem->imageYScale());
366,7 → 366,7
{
currItem->PoLine.setPoint(Doc->nodeEdit.m_ClRe, np);
// if (!(currItem->isGroup() || currItem->isSymbol()))
Doc->AdjustItemSize(currItem, true, true);
Doc->adjustItemSize(currItem, true, true);
Doc->regionsChanged()->update(QRectF());
}
undoManager->setUndoEnabled(true);
459,7 → 459,7
{
currItem->PoLine = Clip.copy();
// if (!(currItem->isGroup() || currItem->isSymbol()))
Doc->AdjustItemSize(currItem, true, true);
Doc->adjustItemSize(currItem, true, true);
Doc->regionsChanged()->update(QRectF());
}
else
/trunk/Scribus/scribus/pageitem.cpp
3637,7 → 3637,7
FrameType = 3;
FPoint wh = getMaxClipF(&PoLine);
setWidthHeight(wh.x(),wh.y());
m_Doc->AdjustItemSize(this);
m_Doc->adjustItemSize(this);
OldB2 = width();
OldH2 = height();
updateClip();
5516,13 → 5516,13
if (isUndo)
{
PoLine = is->getItem().first;
doc()->AdjustItemSize(this);
doc()->adjustItemSize(this);
moveBy(is->getDouble("OLDX") - xPos(),is->getDouble("OLDY") - yPos());
}
else
{
PoLine = is->getItem().second;
doc()->AdjustItemSize(this);
doc()->adjustItemSize(this);
moveBy(is->getDouble("NEWX") - xPos(),is->getDouble("NEWY") - yPos());
}
OldB2 = width();
6047,7 → 6047,7
item->arcStartAngle = ss->getDouble("OLD_START");
item->arcSweepAngle = ss->getDouble("OLD_SWEEP");
item->PoLine = ss->getItem().first;
doc()->AdjustItemSize(item);
doc()->adjustItemSize(item);
moveBy(ss->getDouble("OLD_XPOS") - xPos(),ss->getDouble("OLD_YPOS") - yPos());
}
else
6057,7 → 6057,7
item->arcStartAngle = ss->getDouble("NEW_START");
item->arcSweepAngle = ss->getDouble("NEW_SWEEP");
item->PoLine = ss->getItem().second;
doc()->AdjustItemSize(item);
doc()->adjustItemSize(item);
moveBy(ss->getDouble("NEW_XPOS") - xPos(),ss->getDouble("NEW_YPOS") - yPos());
}
update();
6091,7 → 6091,7
ContourLine.map(is->getItem().at(1).inverted());
ContourLine.map(is->getItem().at(0).inverted());
ContourLine.translate(-x,-y);
doc()->AdjustItemSize(this);
doc()->adjustItemSize(this);
moveBy(is->getDouble("POSX") - xPos(),is->getDouble("POSY") - yPos());
}
else
6106,7 → 6106,7
ContourLine.map(is->getItem().at(1));
ContourLine.map(is->getItem().at(2));
ContourLine.translate(-x,-y);
doc()->AdjustItemSize(this);
doc()->adjustItemSize(this);
}
}
 
6355,7 → 6355,7
FrameType = is->getInt("FRAME_TYPE");
FPoint wh = getMaxClipF(&PoLine);
setWidthHeight(wh.x(),wh.y());
m_Doc->AdjustItemSize(this);
m_Doc->adjustItemSize(this);
OldB2 = is->getInt("OLDB");
OldH2 = is->getInt("OLDH");
updateClip();
7012,7 → 7012,7
mx = -mx;
my = -my;
}
m_Doc->MoveItem(mx, my, this);
m_Doc->moveItem(mx, my, this);
oldXpos = m_xPos;
oldYpos = m_yPos;
oldOwnPage = OwnPage;
7036,17 → 7036,17
bool redraw = ((stateCode != 1) && (stateCode != 3));
if (isUndo)
{
m_Doc->SizeItem(ow, oh, this, false, true, redraw);
m_Doc->MoveItem(mx, my, this);
m_Doc->RotateItem(ort, this);
m_Doc->sizeItem(ow, oh, this, false, true, redraw);
m_Doc->moveItem(mx, my, this);
m_Doc->rotateItem(ort, this);
}
else
{
mx = -mx;
my = -my;
m_Doc->SizeItem(w, h, this, false, true, redraw);
m_Doc->MoveItem(mx, my, this);
m_Doc->RotateItem(rt, this);
m_Doc->sizeItem(w, h, this, false, true, redraw);
m_Doc->moveItem(mx, my, this);
m_Doc->rotateItem(rt, this);
}
oldWidth = m_width;
oldHeight = m_height;
7072,15 → 7072,15
bool redraw = ((stateCode != 1) && (stateCode != 3));
if (isUndo)
{
m_Doc->RotateItem(ort, this);
m_Doc->MoveItem(ox - m_xPos, oy - m_yPos, this);
m_Doc->SizeItem(ow, oh, this, false, true, redraw);
m_Doc->rotateItem(ort, this);
m_Doc->moveItem(ox - m_xPos, oy - m_yPos, this);
m_Doc->sizeItem(ow, oh, this, false, true, redraw);
}
else
{
m_Doc->RotateItem(rt, this);
m_Doc->MoveItem(x - m_xPos, y - m_yPos, this);
m_Doc->SizeItem(w, h, this, false, true, redraw);
m_Doc->rotateItem(rt, this);
m_Doc->moveItem(x - m_xPos, y - m_yPos, this);
m_Doc->sizeItem(w, h, this, false, true, redraw);
}
oldRot = m_rotation;
oldXpos = m_xPos;
7616,7 → 7616,7
Segments.clear();
FrameType = is->getInt("FRAMETYPE");
ClipEdited = is->getBool("CLIPEDITED");
doc()->AdjustItemSize(this);
doc()->adjustItemSize(this);
} else {
select();
for (int i = 0; i < is->getItem().first.size(); ++i)
7753,8 → 7753,8
ContourLine = oldClip;
else
PoLine = oldClip;
m_Doc->AdjustItemSize(this);
m_Doc->MoveItem(oldX - xPos(), oldY - yPos(), this);
m_Doc->adjustItemSize(this);
m_Doc->moveItem(oldX - xPos(), oldY - yPos(), this);
}
else
{
7762,8 → 7762,8
ContourLine = newClip;
else
PoLine = newClip;
m_Doc->AdjustItemSize(this);
m_Doc->MoveItem(newX - xPos(), newY - yPos(), this);
m_Doc->adjustItemSize(this);
m_Doc->moveItem(newX - xPos(), newY - yPos(), this);
}
if (oldClip.count() != newClip.count())
m_Doc->nodeEdit.deselect();
/trunk/Scribus/scribus/pageitem_table.cpp
712,7 → 712,7
if (!m_Doc)
return;
 
m_Doc->SizeItem(effectiveWidth(), effectiveHeight(), this);
m_Doc->sizeItem(effectiveWidth(), effectiveHeight(), this);
}
 
void PageItem_Table::setFillColor(const QString& color)
/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
1432,7 → 1432,7
wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_ai_XXXXXX.pdf");
tempFile->setAutoRemove(false);
tempFile->open();
1525,7 → 1525,7
b->setXPos(xp + xoffset);
b->setYPos(yp + yoffset);
m_Doc->RotMode(3);
m_Doc->RotateItem(rotation * 180 / M_PI, b);
m_Doc->rotateItem(rotation * 180 / M_PI, b);
m_Doc->RotMode(0);
// b->setRotation(rotation * 180 / M_PI);
b->setTextFlowMode(PageItem::TextFlowDisabled);
1644,7 → 1644,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
}
if (patternMode)
PatternElements.append(ite);
1684,7 → 1684,7
ite = m_Doc->Items->last();
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
}
}
else if ((command == "u") || (command == "q"))
/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
641,7 → 641,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
2403,7 → 2403,7
PageItem* ite = m_Doc->Items->at(z);
ite->SetRectFrame();
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_cgm_XXXXXX.png");
3457,7 → 3457,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
if (line)
/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
462,7 → 462,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
2012,7 → 2012,7
}
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
1991,7 → 1991,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->moveBy(-docX, -docY, true);
ite->moveBy(-currentDC.winOrigin.x(), -currentDC.winOrigin.y());
ite->OldB2 = ite->width();
2355,7 → 2355,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite, true);
m_Doc->adjustItemSize(ite, true);
ite->moveBy(-docX, -docY, true);
ite->moveBy(-currentDC.winOrigin.x(), -currentDC.winOrigin.y());
ite->OldB2 = ite->width();
2949,7 → 2949,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
5711,7 → 5711,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
2229,7 → 2229,7
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(),wh.y());
item->setTextFlowMode(textFlow);
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
item->setRotation(-rot, true);
item->moveBy(dx, dy, true);
if (isPathText)
2347,7 → 2347,7
FPoint wh = getMaxClipF(&itemg->PoLine);
itemg->setWidthHeight(wh.x(),wh.y());
itemg->setTextFlowMode(textFlow);
m_Doc->AdjustItemSize(itemg, true);
m_Doc->adjustItemSize(itemg, true);
itemg->moveBy(dx, dy, true);
itemg->setRotation(-rot, true);
itemg->OldB2 = itemg->width();
2465,7 → 2465,7
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(),wh.y());
item->setTextFlowMode(textFlow);
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
item->moveBy(dx, dy, true);
if (isPathText)
{
2680,7 → 2680,7
int z = m_Doc->itemAdd(PageItem::Group, PageItem::Rectangle, gx, gy, gw, gh, 0, CommonStrings::None, CommonStrings::None);
PageItem *item = m_Doc->Items->at(z);
item->setTextFlowMode(textFlow);
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
item->OldB2 = item->width();
item->OldH2 = item->height();
item->updateClip();
/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
3422,7 → 3422,7
iteS->FrameType = 3;
FPoint wh = getMaxClipF(&iteS->PoLine);
iteS->setWidthHeight(wh.x(), wh.y());
m_Doc->AdjustItemSize(iteS, true);
m_Doc->adjustItemSize(iteS, true);
iteS->setFillEvenOdd(false);
iteS->OldB2 = iteS->width();
iteS->OldH2 = iteS->height();
3489,7 → 3489,7
iteS->FrameType = 3;
FPoint wh = getMaxClipF(&iteS->PoLine);
iteS->setWidthHeight(wh.x(), wh.y());
m_Doc->AdjustItemSize(iteS, true);
m_Doc->adjustItemSize(iteS, true);
iteS->setFillEvenOdd(false);
iteS->OldB2 = iteS->width();
iteS->OldH2 = iteS->height();
3512,7 → 3512,7
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(), wh.y());
item->Clip = FlattenPath(item->PoLine, item->Segments);
m_Doc->AdjustItemSize(item, true);
m_Doc->adjustItemSize(item, true);
item->OldB2 = item->width();
item->OldH2 = item->height();
item->updateClip();
/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
751,7 → 751,7
if (!e.hasAttribute("draw:transform"))
{
ite->Clip = FlattenPath(ite->PoLine, ite->Segments);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
}
ite = finishNodeParsing(e, ite, style);
elements.append(ite);
777,7 → 777,7
if (!e.hasAttribute("draw:transform"))
{
ite->Clip = FlattenPath(ite->PoLine, ite->Segments);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
}
ite = finishNodeParsing(e, ite, style);
elements.append(ite);
803,7 → 803,7
if (!e.hasAttribute("draw:transform"))
{
ite->Clip = FlattenPath(ite->PoLine, ite->Segments);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
}
ite = finishNodeParsing(e, ite, style);
elements.append(ite);
855,7 → 855,7
if (!e.hasAttribute("draw:transform"))
{
ite->Clip = FlattenPath(ite->PoLine, ite->Segments);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
}
ite = finishNodeParsing(e, ite, style);
elements.append(ite);
1152,7 → 1152,7
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(), wh.y());
item->Clip = FlattenPath(item->PoLine, item->Segments);
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
}
item->OwnPage = m_Doc->OnPage(item);
//ite->setTextFlowMode(PageItem::TextFlowUsesFrameShape);
/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
1934,7 → 1934,7
itemg->PoLine.fromQPainterPath(obState.clipPath);
FPoint wh = getMaxClipF(&itemg->PoLine);
itemg->setWidthHeight(wh.x(),wh.y());
m_Doc->AdjustItemSize(itemg, true);
m_Doc->adjustItemSize(itemg, true);
itemg->ClipEdited = true;
itemg->FrameType = 3;
itemg->setFillEvenOdd(false);
/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
2259,7 → 2259,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
1286,7 → 1286,7
out.translate(-ite->xPos(), -ite->yPos());
ite->PoLine = out.copy();
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_doc->AdjustItemSize(ite, true);
m_doc->adjustItemSize(ite, true);
m_doc->resizeGroupToContents(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
1409,7 → 1409,7
out.translate(-ite->xPos(), -ite->yPos());
ite->PoLine = out.copy();
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_doc->AdjustItemSize(ite, true);
m_doc->adjustItemSize(ite, true);
m_doc->resizeGroupToContents(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
1583,7 → 1583,7
ite->ClipEdited = true;
ite->FrameType = 3;
ite->setWidthHeight(wh.x(),wh.y());
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
if (m_Elements->count() != 0)
{
PageItem* lItem = m_Elements->last();
1669,7 → 1669,7
ite->setLineJoin(PLineJoin);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
m_Elements->append(ite);
if (m_groupStack.count() != 0)
{
1714,7 → 1714,7
ite->setLineJoin(PLineJoin);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
m_Elements->append(ite);
if (m_groupStack.count() != 0)
{
1825,7 → 1825,7
}
ite->fill_gradient = FillGradient;
ite->setGradientVector(GrStartX, GrStartY, GrEndX, GrEndY, 0, 0, 1, 0);
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
m_Elements->append(ite);
if (m_groupStack.count() != 0)
{
1944,7 → 1944,7
}
ite->fill_gradient = FillGradient;
ite->setGradientVector(GrStartX, GrStartY, GrEndX, GrEndY, GrFocalX, GrFocalY, 1, 0);
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
m_Elements->append(ite);
if (m_groupStack.count() != 0)
{
1986,7 → 1986,7
ite->setLineEnd(PLineEnd);
ite->setLineJoin(PLineJoin);
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
m_Elements->append(ite);
if (m_groupStack.count() != 0)
{
2067,7 → 2067,7
ite->setLineEnd(PLineEnd);
ite->setLineJoin(PLineJoin);
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
m_Elements->append(ite);
if (m_groupStack.count() != 0)
{
2296,7 → 2296,7
ite->GrType = 8;
ite->setPattern(id);
ite->setPatternTransform(fabs(pmat[0]) * 100, fabs(pmat[3]) * 100, mmx.dx() - ctm[4], mmx.dy() - ctm[5], 0, -1 * pmat[1], pmat[2]);
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
m_Elements->append(ite);
if (m_groupStack.count() != 0)
{
2425,7 → 2425,7
ite->setFillShade(100);
ite->setLineShade(100);
ite->setFillEvenOdd(false);
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_pdf_XXXXXX.png");
tempFile->setAutoRemove(false);
if (tempFile->open())
2455,7 → 2455,7
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
ite->ScaleType = true;
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
2565,7 → 2565,7
ite->setFillEvenOdd(false);
ite->setFillTransparency(1.0 - state->getFillOpacity());
ite->setFillBlendmode(getBlendMode(state));
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_pdf_XXXXXX.png");
tempFile->setAutoRemove(false);
if (tempFile->open())
2595,7 → 2595,7
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
ite->ScaleType = true;
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
2712,7 → 2712,7
ite->setFillEvenOdd(false);
ite->setFillTransparency(1.0 - state->getFillOpacity());
ite->setFillBlendmode(getBlendMode(state));
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_pdf_XXXXXX.png");
tempFile->setAutoRemove(false);
if (tempFile->open())
2742,7 → 2742,7
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
ite->ScaleType = true;
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
2859,7 → 2859,7
ite->setFillEvenOdd(false);
ite->setFillTransparency(1.0 - state->getFillOpacity());
ite->setFillBlendmode(getBlendMode(state));
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
if ((mm.type() == QTransform::TxShear) || (mm.type() == QTransform::TxRotate))
{
ite->setImageRotation(-tline.angle());
2955,7 → 2955,7
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
ite->ScaleType = true;
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
3627,7 → 3627,7
ite->setLineEnd(PLineEnd);
ite->setLineJoin(PLineJoin);
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_doc->AdjustItemSize(ite);
m_doc->adjustItemSize(ite);
if ((render & 3) == 1 || (render & 3) == 2)
{
ite->setLineColor(CurrColorStroke);
/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
1020,7 → 1020,7
ite->PoLine = Coords.copy();
int rm = m_Doc->RotMode();
m_Doc->RotMode(2);
m_Doc->RotateItem(-rot, ite);
m_Doc->rotateItem(-rot, ite);
m_Doc->RotMode(rm);
}
else
1171,7 → 1171,7
ite->PoLine = Coords.copy();
int rm = m_Doc->RotMode();
m_Doc->RotMode(2);
m_Doc->RotateItem(-rot, ite);
m_Doc->rotateItem(-rot, ite);
m_Doc->RotMode(rm);
}
else
1308,7 → 1308,7
ite->updateClip();
int rm = m_Doc->RotMode();
m_Doc->RotMode(2);
m_Doc->RotateItem(-rot, ite);
m_Doc->rotateItem(-rot, ite);
m_Doc->RotMode(rm);
}
else
1375,7 → 1375,7
{
int rm = m_Doc->RotMode();
m_Doc->RotMode(2);
m_Doc->RotateItem(rot, ite);
m_Doc->rotateItem(rot, ite);
m_Doc->RotMode(rm);
}
if (propList["draw-mirror-horizontal"])
3755,7 → 3755,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y(), true);
ite->setTextFlowMode(PageItem::TextFlowUsesBoundingBox);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->setFillTransparency(CurrFillTrans);
/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
396,7 → 396,7
ite->setLineShade(100);
ite->setTextFlowMode(PageItem::TextFlowDisabled);
ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
/trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
404,7 → 404,7
ite->setLineEnd(LineEnd);
ite->setTextFlowMode(PageItem::TextFlowDisabled);
ite->PoLine.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
616,7 → 616,7
item->setLineWidth(item->lineWidth() * (coeff1 + coeff2) / 2.0);
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(), wh.y());
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
// item->moveBy(mm.dx(), mm.dy());
// item->setWidthHeight(item->width() * mm.m11(), item->height() * mm.m22());
// item->setLineWidth(item->lineWidth() * (coeff1 + coeff2) / 2.0);
659,7 → 659,7
FPoint wx = getMinClipF(&item->PoLine);
inGroupXOrigin = qMin(inGroupXOrigin, wx.x());
inGroupYOrigin = qMin(inGroupYOrigin, wx.y());
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
break;
}
}
/trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
1221,7 → 1221,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->moveBy(-docX, -docY, true);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
4610,7 → 4610,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
950,7 → 950,7
m_Doc->groupObjectsToItem(retObj, GElements);
retObj->setGroupClipping(groupClip);
retObj->moveBy(ob_xpos, ob_ypos, true);
m_Doc->AdjustItemSize(retObj);
m_Doc->adjustItemSize(retObj);
retObj->OwnPage = m_Doc->OnPage(retObj);
m_Doc->GroupOnPage(retObj);
m_Doc->Items->removeLast();
1474,7 → 1474,7
item->PoLine = Path.copy();
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(),wh.y());
m_Doc->AdjustItemSize(item, true);
m_Doc->adjustItemSize(item, true);
}
item->ClipEdited = true;
if ((cornerRadius != 0) && (item->frameType() == PageItem::Rectangle))
/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
775,7 → 775,7
item->setLineWidth(qMax(item->lineWidth() * (coeff1 + coeff2) / 2.0, 0.25));
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(), wh.y());
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
}
item->setRedrawBounding();
item->OwnPage = m_Doc->OnPage(item);
/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
357,7 → 357,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
if (isGradient)
/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
1339,7 → 1339,7
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(),wh.y());
item->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
Elements.append(item);
item->setFillColor(txDat.FillCol);
item->setFillTransparency(txDat.FillOpacity);
1446,7 → 1446,7
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(),wh.y());
item->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
Elements.append(item);
item->setFillColor(txDat.FillCol);
item->setFillTransparency(txDat.FillOpacity);
3038,7 → 3038,7
FPoint wh = getMaxClipF(&newItem->PoLine);
newItem->setWidthHeight(wh.x(),wh.y());
newItem->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(newItem);
m_Doc->adjustItemSize(newItem);
Elements.append(newItem);
XarStyle *gc = m_gc.top();
gc->Elements.append(newItem);
3177,7 → 3177,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
if (groupStack.count() > 0)
{
XarGroup gg = groupStack.top();
3680,7 → 3680,7
groupItem->PoLine.translate(-minx + baseX, -miny + baseY);
FPoint wh = getMaxClipF(&groupItem->PoLine);
groupItem->setWidthHeight(wh.x(),wh.y());
m_Doc->AdjustItemSize(groupItem);
m_Doc->adjustItemSize(groupItem);
}
groupItem->AutoName = false;
groupItem->setFillTransparency(0);
/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
701,7 → 701,7
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(),wh.y());
item->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
item->setWidthHeight(qMax(item->width(), 1.0), qMax(item->height(), 1.0));
depthMap.insert(999 - depth, currentItemNr);
currentItemNr++;
761,7 → 761,7
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(),wh.y());
item->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(item);
m_Doc->adjustItemSize(item);
item->setWidthHeight(qMax(item->width(), 1.0), qMax(item->height(), 1.0));
depthMap.insert(999 - depth, currentItemNr);
currentItemNr++;
883,7 → 883,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->setWidthHeight(qMax(ite->width(), 1.0), qMax(ite->height(), 1.0));
if (subtype == 4)
{
1015,7 → 1015,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->setWidthHeight(qMax(ite->width(), 1.0), qMax(ite->height(), 1.0));
depthMap.insert(999 - depth, currentItemNr);
currentItemNr++;
1132,7 → 1132,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->setWidthHeight(qMax(ite->width(), 1.0), qMax(ite->height(), 1.0));
depthMap.insert(999 - depth, currentItemNr);
currentItemNr++;
1199,7 → 1199,7
ite->setTextFlowMode(PageItem::TextFlowDisabled);
int rot = m_Doc->RotMode();
m_Doc->RotMode ( 2);
m_Doc->RotateItem(-angle * 180.0 / M_PI, ite);
m_Doc->rotateItem(-angle * 180.0 / M_PI, ite);
m_Doc->RotMode( rot);
depthMap.insert(999 - depth, currentItemNr);
currentItemNr++;
1511,12 → 1511,12
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->setWidthHeight(qMax(ite->width(), 1.0), qMax(ite->height(), 1.0));
if (subtype == 1)
m_Doc->MoveRotated(ite, FPoint(-br.width() / 2.0, 0.0));
m_Doc->moveRotated(ite, FPoint(-br.width() / 2.0, 0.0));
else if (subtype == 2)
m_Doc->MoveRotated(ite, FPoint(-br.width(), 0.0));
m_Doc->moveRotated(ite, FPoint(-br.width(), 0.0));
depthMap.insert(999 - depth, currentItemNr);
currentItemNr++;
}
/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
1240,7 → 1240,7
retObj->PoLine.scale(scX, scY);
FPoint wh = getMaxClipF(&retObj->PoLine);
retObj->setWidthHeight(wh.x(),wh.y());
m_Doc->AdjustItemSize(retObj, true);
m_Doc->adjustItemSize(retObj, true);
retObj->OldB2 = retObj->width();
retObj->OldH2 = retObj->height();
if (obState.maskTyp != 0)
1469,7 → 1469,7
PageItem* item = parseObjectXML(eo, path);
if (item != NULL)
{
m_Doc->SizeItem((item->width() / conversionFactor) * vw, (item->height() / conversionFactor) * vh, item, false, true, false);
m_Doc->sizeItem((item->width() / conversionFactor) * vw, (item->height() / conversionFactor) * vh, item, false, true, false);
ScPattern pat = ScPattern();
pat.setDoc(m_Doc);
m_Doc->DoDrawing = true;
1659,7 → 1659,7
itemg->PoLine.fromQPainterPath(obState.clipPath);
FPoint wh = getMaxClipF(&itemg->PoLine);
itemg->setWidthHeight(wh.x(),wh.y());
m_Doc->AdjustItemSize(itemg, true);
m_Doc->adjustItemSize(itemg, true);
itemg->ClipEdited = true;
itemg->FrameType = 3;
itemg->setFillEvenOdd(false);
1742,7 → 1742,7
item->PoLine.fromQPainterPath(obState.currentPath, !obState.currentPathClosed);
FPoint wh = getMaxClipF(&item->PoLine);
item->setWidthHeight(wh.x(),wh.y());
m_Doc->AdjustItemSize(item, true);
m_Doc->adjustItemSize(item, true);
item->ClipEdited = true;
item->FrameType = 3;
item->setFillEvenOdd(false);
/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
255,7 → 255,7
ScCore->primaryMainWindow()->view->endGroupTransaction();
}
else {
ScCore->primaryMainWindow()->doc->MoveItem(ValueToPoint(x), ValueToPoint(y), item);
ScCore->primaryMainWindow()->doc->moveItem(ValueToPoint(x), ValueToPoint(y), item);
}
// Now restore the selection.
ScCore->primaryMainWindow()->view->Deselect();
294,7 → 294,7
ScCore->primaryMainWindow()->view->endGroupTransaction();
}
else
ScCore->primaryMainWindow()->doc->MoveItem(pageUnitXToDocX(x) - item->xPos(), pageUnitYToDocY(y) - item->yPos(), item);
ScCore->primaryMainWindow()->doc->moveItem(pageUnitXToDocX(x) - item->xPos(), pageUnitYToDocY(y) - item->yPos(), item);
// Now restore the selection.
ScCore->primaryMainWindow()->view->Deselect();
if (hadOrigSelection)
314,7 → 314,7
PageItem *item = GetUniqueItem(QString::fromUtf8(Name));
if (item == NULL)
return NULL;
ScCore->primaryMainWindow()->doc->RotateItem(item->rotation() - x, item);
ScCore->primaryMainWindow()->doc->rotateItem(item->rotation() - x, item);
// Py_INCREF(Py_None);
// return Py_None;
Py_RETURN_NONE;
331,7 → 331,7
PageItem *item = GetUniqueItem(QString::fromUtf8(Name));
if (item == NULL)
return NULL;
ScCore->primaryMainWindow()->doc->RotateItem(x * -1.0, item);
ScCore->primaryMainWindow()->doc->rotateItem(x * -1.0, item);
// Py_INCREF(Py_None);
// return Py_None;
Py_RETURN_NONE;
348,7 → 348,7
PageItem *item = GetUniqueItem(QString::fromUtf8(Name));
if (item == NULL)
return NULL;
ScCore->primaryMainWindow()->doc->SizeItem(ValueToPoint(x), ValueToPoint(y), item);
ScCore->primaryMainWindow()->doc->sizeItem(ValueToPoint(x), ValueToPoint(y), item);
// Py_INCREF(Py_None);
// return Py_None;
Py_RETURN_NONE;
/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
277,15 → 277,15
if (np2.x() < 0)
{
it->PoLine.translate(-np2.x(), 0);
ScCore->primaryMainWindow()->doc->MoveItem(np2.x(), 0, it);
ScCore->primaryMainWindow()->doc->moveItem(np2.x(), 0, it);
}
if (np2.y() < 0)
{
it->PoLine.translate(0, -np2.y());
ScCore->primaryMainWindow()->doc->MoveItem(0, np2.y(), it);
ScCore->primaryMainWindow()->doc->moveItem(0, np2.y(), it);
}
ScCore->primaryMainWindow()->doc->SizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), it, false, false, false);
ScCore->primaryMainWindow()->doc->AdjustItemSize(it);
ScCore->primaryMainWindow()->doc->sizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), it, false, false, false);
ScCore->primaryMainWindow()->doc->adjustItemSize(it);
if (Name != EMPTY_STRING)
{
QString objName = QString::fromUtf8(Name);
359,15 → 359,15
if (np2.x() < 0)
{
it->PoLine.translate(-np2.x(), 0);
ScCore->primaryMainWindow()->doc->MoveItem(np2.x(), 0, it);
ScCore->primaryMainWindow()->doc->moveItem(np2.x(), 0, it);
}
if (np2.y() < 0)
{
it->PoLine.translate(0, -np2.y());
ScCore->primaryMainWindow()->doc->MoveItem(0, np2.y(), it);
ScCore->primaryMainWindow()->doc->moveItem(0, np2.y(), it);
}
ScCore->primaryMainWindow()->doc->SizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), it, false, false, false);
ScCore->primaryMainWindow()->doc->AdjustItemSize(it);
ScCore->primaryMainWindow()->doc->sizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), it, false, false, false);
ScCore->primaryMainWindow()->doc->adjustItemSize(it);
if (Name != EMPTY_STRING)
{
QString objName = QString::fromUtf8(Name);
450,15 → 450,15
if (np2.x() < 0)
{
it->PoLine.translate(-np2.x(), 0);
ScCore->primaryMainWindow()->doc->MoveItem(np2.x(), 0, it);
ScCore->primaryMainWindow()->doc->moveItem(np2.x(), 0, it);
}
if (np2.y() < 0)
{
it->PoLine.translate(0, -np2.y());
ScCore->primaryMainWindow()->doc->MoveItem(0, np2.y(), it);
ScCore->primaryMainWindow()->doc->moveItem(0, np2.y(), it);
}
ScCore->primaryMainWindow()->doc->SizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), it, false, false, false);
ScCore->primaryMainWindow()->doc->AdjustItemSize(it);
ScCore->primaryMainWindow()->doc->sizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), it, false, false, false);
ScCore->primaryMainWindow()->doc->adjustItemSize(it);
if (Name != EMPTY_STRING)
{
QString objName = QString::fromUtf8(Name);
499,7 → 499,7
ScCore->primaryMainWindow()->doc->m_Selection->addItem(i);
ScCore->primaryMainWindow()->doc->m_Selection->addItem(ii);
ScCore->primaryMainWindow()->view->ToPathText();
ScCore->primaryMainWindow()->doc->MoveItem(pageUnitXToDocX(x) - i->xPos(), pageUnitYToDocY(y) - i->yPos(), i);
ScCore->primaryMainWindow()->doc->moveItem(pageUnitXToDocX(x) - i->xPos(), pageUnitYToDocY(y) - i->yPos(), i);
if (Name != EMPTY_STRING)
{
QString objName = QString::fromUtf8(Name);
/trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
221,7 → 221,7
FPoint wh = getMaxClipF(&ite->PoLine);
ite->setWidthHeight(wh.x(),wh.y());
ite->setTextFlowMode(PageItem::TextFlowDisabled);
m_Doc->AdjustItemSize(ite);
m_Doc->adjustItemSize(ite);
ite->OldB2 = ite->width();
ite->OldH2 = ite->height();
ite->updateClip();
/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
545,7 → 545,7
currItem->FrameType = 3;
double oW = currItem->width();
double oH = currItem->height();
m_doc->AdjustItemSize(currItem, true);
m_doc->adjustItemSize(currItem, true);
currItem->OldB2 = currItem->width();
currItem->OldH2 = currItem->height();
if (currItem->isGroup())
/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
256,7 → 256,7
patternItem->FrameType = 3;
patternItem->setXYPos(originalXPos, originalYPos);
patternItem->setRotation(originalRot);
m_doc->AdjustItemSize(patternItem);
m_doc->adjustItemSize(patternItem);
patternItem->OldB2 = patternItem->width();
patternItem->OldH2 = patternItem->height();
patternItem->updateClip();
328,7 → 328,7
bxi->setXYPos(pathItem->xPos()+deltaX, pathItem->yPos()+deltaY, true);
double oW = bxi->width();
double oH = bxi->height();
m_doc->AdjustItemSize(bxi, true);
m_doc->adjustItemSize(bxi, true);
bxi->OldB2 = bxi->width();
bxi->OldH2 = bxi->height();
if (bxi->isGroup())
381,7 → 381,7
patternItem->setXYPos(pathItem->xPos(), pathItem->yPos());
patternItem->setRotation(0);
}
m_doc->AdjustItemSize(patternItem, true);
m_doc->adjustItemSize(patternItem, true);
patternItem->OldB2 = patternItem->width();
patternItem->OldH2 = patternItem->height();
patternItem->updateClip();
/trunk/Scribus/scribus/plugins/tools/flattenpath/flattenpath.cpp
135,7 → 135,7
currItem->PoLine.fromQPainterPath(result);
currItem->ClipEdited = true;
currItem->FrameType = 3;
currDoc->AdjustItemSize(currItem);
currDoc->adjustItemSize(currItem);
currItem->OldB2 = currItem->width();
currItem->OldH2 = currItem->height();
currItem->updateClip();
/trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp
130,7 → 130,7
currItem->FrameType = 3;
double oW = currItem->width();
double oH = currItem->height();
currDoc->AdjustItemSize(currItem, true);
currDoc->adjustItemSize(currItem, true);
currItem->OldB2 = currItem->width();
currItem->OldH2 = currItem->height();
if (currItem->isGroup())
/trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
139,7 → 139,7
m_item1->PoLine = computePath(pointOne, pointTwo, mode, originalPath1, originalPath2);
m_item1->ClipEdited = true;
m_item1->FrameType = 3;
m_doc->AdjustItemSize(m_item1);
m_doc->adjustItemSize(m_item1);
m_item1->OldB2 = m_item1->width();
m_item1->OldH2 = m_item1->height();
if (UndoManager::undoEnabled())
167,7 → 167,7
m_item1->ClipEdited = true;
m_item1->FrameType = 3;
m_item1->setXYPos(originalXPos, originalYPos);
m_doc->AdjustItemSize(m_item1);
m_doc->adjustItemSize(m_item1);
m_item1->OldB2 = m_item1->width();
m_item1->OldH2 = m_item1->height();
m_item1->updateClip();
198,7 → 198,7
m_item1->ClipEdited = true;
m_item1->FrameType = 3;
}
m_doc->AdjustItemSize(m_item1);
m_doc->adjustItemSize(m_item1);
m_item1->OldB2 = m_item1->width();
m_item1->OldH2 = m_item1->height();
m_item1->updateClip();
/trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
164,7 → 164,7
Item2->PoLine = points;
Item2->ClipEdited = true;
Item2->FrameType = 3;
currDoc->AdjustItemSize(Item2);
currDoc->adjustItemSize(Item2);
Item2->OldB2 = Item2->width();
Item2->OldH2 = Item2->height();
Item2->updateClip();
/trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
243,7 → 243,7
currItem->PoLine = points;
currItem->ClipEdited = true;
currItem->FrameType = 3;
currDoc->AdjustItemSize(currItem);
currDoc->adjustItemSize(currItem);
currItem->OldB2 = currItem->width();
currItem->OldH2 = currItem->height();
currItem->updateClip();
293,7 → 293,7
Item1->PoLine = points;
Item1->ClipEdited = true;
Item1->FrameType = 3;
currDoc->AdjustItemSize(Item1);
currDoc->adjustItemSize(Item1);
Item1->OldB2 = Item1->width();
Item1->OldH2 = Item1->height();
Item1->updateClip();
336,7 → 336,7
Item2->PoLine = points;
Item2->ClipEdited = true;
Item2->FrameType = 3;
currDoc->AdjustItemSize(Item2);
currDoc->adjustItemSize(Item2);
Item2->OldB2 = Item2->width();
Item2->OldH2 = Item2->height();
Item2->updateClip();
373,7 → 373,7
newItem->PoLine = points;
newItem->ClipEdited = true;
newItem->FrameType = 3;
currDoc->AdjustItemSize(newItem);
currDoc->adjustItemSize(newItem);
newItem->OldB2 = newItem->width();
newItem->OldH2 = newItem->height();
newItem->updateClip();
/trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
205,7 → 205,7
newItem->PoLine = points;
newItem->ClipEdited = true;
newItem->FrameType = 3;
currDoc->AdjustItemSize(newItem);
currDoc->adjustItemSize(newItem);
newItem->OldB2 = newItem->width();
newItem->OldH2 = newItem->height();
newItem->updateClip();
258,7 → 258,7
newItem->PoLine = points;
newItem->ClipEdited = true;
newItem->FrameType = 3;
currDoc->AdjustItemSize(newItem);
currDoc->adjustItemSize(newItem);
newItem->OldB2 = newItem->width();
newItem->OldH2 = newItem->height();
newItem->updateClip();
295,7 → 295,7
newItem->PoLine = arrow;
newItem->ClipEdited = true;
newItem->FrameType = 3;
currDoc->AdjustItemSize(newItem);
currDoc->adjustItemSize(newItem);
newItem->OldB2 = newItem->width();
newItem->OldH2 = newItem->height();
newItem->updateClip();
334,7 → 334,7
newItem->PoLine = arrow;
newItem->ClipEdited = true;
newItem->FrameType = 3;
currDoc->AdjustItemSize(newItem);
currDoc->adjustItemSize(newItem);
newItem->OldB2 = newItem->width();
newItem->OldH2 = newItem->height();
newItem->updateClip();
/trunk/Scribus/scribus/plugins/tools/smoothpath/smoothpath.cpp
141,7 → 141,7
currItem->PoLine.fromQPainterPath(result);
currItem->ClipEdited = true;
currItem->FrameType = 3;
currDoc->AdjustItemSize(currItem);
currDoc->adjustItemSize(currItem);
currItem->OldB2 = currItem->width();
currItem->OldH2 = currItem->height();
currItem->updateClip();
/trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp
205,7 → 205,7
currItem->PoLine = points;
currItem->ClipEdited = true;
currItem->FrameType = 3;
currDoc->AdjustItemSize(currItem);
currDoc->adjustItemSize(currItem);
currItem->OldB2 = currItem->width();
currItem->OldH2 = currItem->height();
currItem->updateClip();
/trunk/Scribus/scribus/scpage.cpp
415,7 → 415,7
{
m_Doc->Items->replace(m_Doc->Items->indexOf(newItem), oldItem);
oldItem->updatePolyClip();
m_Doc->AdjustItemSize(oldItem);
m_Doc->adjustItemSize(oldItem);
}
else
{
439,7 → 439,7
{
m_Doc->Items->replace(m_Doc->Items->indexOf(newItem), oldItem);
oldItem->updatePolyClip();
m_Doc->AdjustItemSize(oldItem);
m_Doc->adjustItemSize(oldItem);
if (m_Doc->docPatterns.contains(patternName))
m_Doc->removePattern(patternName);
}
/trunk/Scribus/scribus/scribus.cpp
1869,7 → 1869,7
PageItem *currItem = doc->m_Selection->itemAt(0);
double xposOrig = currItem->xPos();
double yposOrig = currItem->yPos();
doc->AdjustItemSize(currItem);
doc->adjustItemSize(currItem);
if (!doc->nodeEdit.isContourLine())
currItem->ContourLine.translate(xposOrig - currItem->xPos(),yposOrig - currItem->yPos());
currItem->update();
/trunk/Scribus/scribus/scribusdoc.cpp
6428,7 → 6428,7
polyLineItem->ClipEdited = true;
polyLineItem->FrameType = 3;
polyLineItem->setRotation(currItem->rotation());
AdjustItemSize(polyLineItem);
adjustItemSize(polyLineItem);
 
newItem->setLineColor(CommonStrings::None);
newItem->SetRectFrame();
6469,7 → 6469,7
newItem->PoLine.map(ma);
newItem->setRotation(0.0);
}
AdjustItemSize(newItem);
adjustItemSize(newItem);
break;
case PageItem::PathText:
{
6482,10 → 6482,10
newItem->PLineEnd = secondaryItem->PLineEnd;
newItem->PLineJoin = secondaryItem->PLineJoin;
//FIXME: Stop using the view here
AdjustItemSize(newItem);
adjustItemSize(newItem);
double dx = secondaryItem->xPos() - newItem->xPos();
double dy = secondaryItem->yPos() - newItem->yPos();
MoveItem(dx, dy, newItem);
moveItem(dx, dy, newItem);
newItem->setRotation(secondaryItem->rotation());
newItem->FrameType = 3;
}
10741,7 → 10741,7
currItem->ClipEdited = true;
// currItem->FrameType = 3;
m_undoManager->setUndoEnabled(false);
AdjustItemSize(currItem);
adjustItemSize(currItem);
m_undoManager->setUndoEnabled(true);
}
}
10839,7 → 10839,7
currItem->ContourLine.translate(-deltaX, -deltaY);
currItem->ClipEdited = true;
m_undoManager->setUndoEnabled(false);
AdjustItemSize(currItem);
adjustItemSize(currItem);
m_undoManager->setUndoEnabled(true);
Elements.append(currItem);
}
10908,7 → 10908,7
else if (ar->arcStartAngle > 360)
ar->arcStartAngle -= 360;
ar->recalcPath();
AdjustItemSize(currItem);
adjustItemSize(currItem);
emit updateEditItem();
}
else if (currItem->isRegularPolygon())
10952,7 → 10952,7
else if (ar->arcStartAngle > 360)
ar->arcStartAngle -= 360;
ar->recalcPath();
AdjustItemSize(currItem);
adjustItemSize(currItem);
emit updateEditItem();
}
else if (currItem->isRegularPolygon())
11017,7 → 11017,7
else if (ar->arcStartAngle > 360)
ar->arcStartAngle -= 360;
ar->recalcPath();
AdjustItemSize(currItem);
adjustItemSize(currItem);
emit updateEditItem();
}
else if (currItem->isRegularPolygon())
11064,7 → 11064,7
else if (ar->arcStartAngle > 360)
ar->arcStartAngle -= 360;
ar->recalcPath();
AdjustItemSize(currItem);
adjustItemSize(currItem);
emit updateEditItem();
}
else if (currItem->isRegularPolygon())
11099,7 → 11099,7
}
else if (itemSelection->count() == 1)
{
RotateItem(angle, itemSelection->itemAt(0));
rotateItem(angle, itemSelection->itemAt(0));
}
changed();
}
13530,7 → 13530,7
if (m_Selection->count() > 1)
rotateGroup(dR2, FPoint(0,0)); //FIXME:av
else
RotateItem(dR2, m_Selection->itemAt(0));
rotateItem(dR2, m_Selection->itemAt(0));
}
dH2 += dH;
dV2 += dV;
14034,7 → 14034,7
return ret;
}
 
bool ScribusDoc::MoveItem(double newX, double newY, PageItem* currItem)
bool ScribusDoc::moveItem(double newX, double newY, PageItem* currItem)
{
if (currItem->locked())
return false;
14049,7 → 14049,7
return retw;
}
 
void ScribusDoc::RotateItem(double angle, PageItem *currItem)
void ScribusDoc::rotateItem(double angle, PageItem *currItem)
{
if (currItem->locked())
return;
14109,7 → 14109,7
 
 
 
void ScribusDoc::MoveRotated(PageItem *currItem, FPoint npv)
void ScribusDoc::moveRotated(PageItem *currItem, FPoint npv)
{
QTransform ma;
ma.translate(currItem->xPos(), currItem->yPos());
14116,10 → 14116,10
ma.rotate(currItem->rotation());
double mxc = currItem->xPos() - (ma.m11() * npv.x() + ma.m21() * npv.y() + ma.dx());
double myc = currItem->yPos() - (ma.m22() * npv.y() + ma.m12() * npv.x() + ma.dy());
MoveItem(-mxc, -myc, currItem);
moveItem(-mxc, -myc, currItem);
}
 
bool ScribusDoc::SizeItem(double newX, double newY, PageItem *pi, bool fromMP, bool DoUpdateClip, bool redraw)
bool ScribusDoc::sizeItem(double newX, double newY, PageItem *pi, bool fromMP, bool DoUpdateClip, bool redraw)
{
PageItem *currItem = pi;
if (currItem->locked())
14166,7 → 14166,7
moveX=0.0;
else if (m_rotMode==1)
moveY=0.0;
MoveItem(moveX, moveY, currItem);
moveItem(moveX, moveY, currItem);
}
if ((currItem->asImageFrame()) && (!currItem->Sizing) && (appMode != modeEditClip))
{
14259,7 → 14259,7
return true;
}
 
bool ScribusDoc::MoveSizeItem(FPoint newX, FPoint newY, PageItem* currItem, bool fromMP, bool constrainRotation)
bool ScribusDoc::moveSizeItem(FPoint newX, FPoint newY, PageItem* currItem, bool fromMP, bool constrainRotation)
{
QRectF oldR(currItem->getBoundingRect());
if (currItem->asLine())
14269,7 → 14269,7
ma.rotate(currItem->rotation());
double mx = ma.m11() * currItem->width() + ma.dx();
double my = ma.m12() * currItem->width() + ma.dy();
MoveItem(newX.x(), newX.y(), currItem);
moveItem(newX.x(), newX.y(), currItem);
double newRot=xy2Deg(mx - currItem->xPos(), my - currItem->yPos());
currItem->setRotation(newRot);
currItem->setWidthHeight(sqrt(pow(mx - currItem->xPos(),2)+pow(my - currItem->yPos(),2)), 1.0);
14294,13 → 14294,13
ma3.rotate(currItem->rotation());
double mxc3 = currItem->xPos() - (ma3.m11() * npv.x() + ma3.m21() * npv.y() + ma3.dx());
double myc3 = currItem->yPos() - (ma3.m22() * npv.y() + ma3.m12() * npv.x() + ma3.dy());
SizeItem(currItem->width() - newY.x(), currItem->height() - newY.y(), currItem, fromMP, true, false);
MoveItem(-mxc3, -myc3, currItem);
sizeItem(currItem->width() - newY.x(), currItem->height() - newY.y(), currItem, fromMP, true, false);
moveItem(-mxc3, -myc3, currItem);
}
else
{
SizeItem(currItem->width() - newY.x(), currItem->height() - newY.y(), currItem, fromMP, true, false);
MoveItem(newX.x(), newX.y(), currItem);
sizeItem(currItem->width() - newY.x(), currItem->height() - newY.y(), currItem, fromMP, true, false);
moveItem(newX.x(), newX.y(), currItem);
}
}
return true;
14307,7 → 14307,7
}
 
 
void ScribusDoc::AdjustItemSize(PageItem *currItem, bool includeGroup, bool moveInGroup)
void ScribusDoc::adjustItemSize(PageItem *currItem, bool includeGroup, bool moveInGroup)
{
if (currItem->isArc())
return;
14326,15 → 14326,15
Clip = currItem->PoLine;
QRectF clipRect = Clip.toQPainterPath(false).boundingRect();
FPoint tp2(clipRect.left(), clipRect.top());
SizeItem(currItem->width() - tp2.x(), currItem->height() - tp2.y(), currItem, true, false, false);
sizeItem(currItem->width() - tp2.x(), currItem->height() - tp2.y(), currItem, true, false, false);
Clip.translate(-tp2.x(), -tp2.y());
if (currItem->rotation() != 0)
{
FPoint npv(tp2.x(), tp2.y());
MoveRotated(currItem, npv);
moveRotated(currItem, npv);
}
else
MoveItem(tp2.x(), tp2.y(), currItem);
moveItem(tp2.x(), tp2.y(), currItem);
if (!currItem->imageFlippedH())
currItem->moveImageInFrame(-tp2.x()/currItem->imageXScale(), 0);
if (!currItem->imageFlippedV())
14344,7 → 14344,7
currItem->moveImageInFrame((currItem->width() - tp.x())/currItem->imageXScale(), 0);
if (currItem->imageFlippedV())
currItem->moveImageInFrame(0, (currItem->height() - tp.y())/currItem->imageYScale());
SizeItem(clipRect.width(), clipRect.height(), currItem, true, false, false);
sizeItem(clipRect.width(), clipRect.height(), currItem, true, false, false);
currItem->PoLine = Clip.copy();
if ((currItem->isGroup() || currItem->isSymbol()) && includeGroup)
{
14355,21 → 14355,21
for (int em = 0; em < currItem->groupItemList.count(); ++em)
{
PageItem* embedded = currItem->groupItemList.at(em);
MoveItem(-dx, -dy, embedded);
moveItem(-dx, -dy, embedded);
}
if (currItem->imageFlippedH())
{
if (oldX - currItem->xPos() == 0)
MoveItem(oldW - currItem->width(), 0, currItem);
moveItem(oldW - currItem->width(), 0, currItem);
else
MoveItem((oldX - currItem->xPos()), 0, currItem);
moveItem((oldX - currItem->xPos()), 0, currItem);
}
if (currItem->imageFlippedV())
{
if (oldY- currItem->yPos() == 0)
MoveItem(0, oldH - currItem->height(), currItem);
moveItem(0, oldH - currItem->height(), currItem);
else
MoveItem(0, oldY - currItem->yPos(), currItem);
moveItem(0, oldY - currItem->yPos(), currItem);
}
}
}
14411,7 → 14411,7
{
if (currItem->isWelded())
weldL.append(currItem->itemsWeldedTo());
MoveItem(x, y, currItem);
moveItem(x, y, currItem);
}
}
itemSelection->setGroupRect();
14589,12 → 14589,12
{
double oldGW = bb->groupWidth;
double oldGH = bb->groupHeight;
AdjustItemSize(bb, true, false);
adjustItemSize(bb, true, false);
bb->groupWidth = oldGW;
bb->groupHeight = oldGH;
}
else
AdjustItemSize(bb, true, false);
adjustItemSize(bb, true, false);
if (bb->isArc() || bb->isSpiral() || bb->isRegularPolygon())
bb->setXYPos(b1.x() + gx, b1.y() + gy);
else
14621,12 → 14621,12
{
double oldGW = bb->groupWidth;
double oldGH = bb->groupHeight;
AdjustItemSize(bb, true, false);
adjustItemSize(bb, true, false);
bb->groupWidth = oldGW;
bb->groupHeight = oldGH;
}
else
AdjustItemSize(bb, true, false);
adjustItemSize(bb, true, false);
}
}
if (scaleText)
15082,7 → 15082,7
d = mm.map(d);
item->gXpos = d.p2().x();
item->gYpos = d.p2().y();
SizeItem(item->width() * (1.0 / grScXi), item->height() * (1.0 / grScYi), item, false, true, false);
sizeItem(item->width() * (1.0 / grScXi), item->height() * (1.0 / grScYi), item, false, true, false);
if (item->isGroupChild())
item->Parent->groupItemList.removeAll(item);
else
15136,7 → 15136,7
double grScYi = 1.0;
getScaleFromMatrix(itemTrans, grScXi, grScYi);
double gRot = getRotationDFromMatrix(groupTrans);
SizeItem(item->width() * grScXi, item->height() * grScYi, item, false, true, false);
sizeItem(item->width() * grScXi, item->height() * grScYi, item, false, true, false);
double nX = itPos.x();
double nY = itPos.y();
if (gRot != 0)
15229,7 → 15229,7
group->setWidthHeight(group->width() * scale, group->height() * scale);
group->ClipEdited = true;
group->FrameType = 3;
AdjustItemSize(group, true);
adjustItemSize(group, true);
group->OldB2 = group->width();
group->OldH2 = group->height();
if (group->isGroup())
15367,7 → 15367,7
currItem->PoLine.setMarker();
currItem->PoLine.putPoints(currItem->PoLine.size(), bb->PoLine.size(), bb->PoLine);
}
AdjustItemSize(currItem);
adjustItemSize(currItem);
currItem->ContourLine = currItem->PoLine.copy();
m_undoManager->setUndoEnabled(true);
//FIXME: stop using m_View
15426,7 → 15426,7
bb->PoLine.resize(0);
bb->PoLine.putPoints(0, EndInd - StartInd, currItem->PoLine, StartInd);
bb->setRotation(currItem->rotation());
AdjustItemSize(bb);
adjustItemSize(bb);
bb->ContourLine = bb->PoLine.copy();
bb->ClipEdited = true;
m_Selection->addItem(bb, false);
15435,7 → 15435,7
}
}
currItem->PoLine.resize(StartInd-4);
AdjustItemSize(currItem);
adjustItemSize(currItem);
currItem->ContourLine = currItem->PoLine.copy();
currItem->ClipEdited = true;
m_undoManager->setUndoEnabled(true);
15662,11 → 15662,11
y = currItem->imageYOffset() * currItem->imageYScale();
if ((x != 0.0) || (y != 0.0)) // if the image frame has an offset, its assumed that the user wants the image to stay where it is
{
SizeItem(w, h, currItem);
MoveItem(x, y, currItem);
sizeItem(w, h, currItem);
moveItem(x, y, currItem);
}
else
SizeItem(w, h, currItem, true);
sizeItem(w, h, currItem, true);
currItem->setImageXYOffset(0.0, 0.0);
}
}
/trunk/Scribus/scribus/scribusdoc.h
1145,12 → 1145,12
void SnapToGuides(PageItem *currItem);
bool ApplyGuides(double *x, double *y, bool elementSnap = false);
bool ApplyGuides(FPoint* point, bool elementSnap = false);
bool MoveItem(double newX, double newY, PageItem* ite);
void RotateItem(double win, PageItem *currItem);
void MoveRotated(PageItem *currItem, FPoint npv);
bool SizeItem(double newX, double newY, PageItem *pi, bool fromMP = false, bool DoUpdateClip = true, bool redraw = true);
bool MoveSizeItem(FPoint newX, FPoint newY, PageItem* currItem, bool fromMP = false, bool constrainRotation = false);
void AdjustItemSize(PageItem *currItem, bool includeGroup = false, bool moveInGroup = true);
bool moveItem(double newX, double newY, PageItem* ite);
void rotateItem(double win, PageItem *currItem);
void moveRotated(PageItem *currItem, FPoint npv);
bool sizeItem(double newX, double newY, PageItem *pi, bool fromMP = false, bool DoUpdateClip = true, bool redraw = true);
bool moveSizeItem(FPoint newX, FPoint newY, PageItem* currItem, bool fromMP = false, bool constrainRotation = false);
void adjustItemSize(PageItem *currItem, bool includeGroup = false, bool moveInGroup = true);
void moveGroup(double x, double y, Selection* customSelection = 0);
void rotateGroup(double angle, Selection* customSelection = 0);
void rotateGroup(double angle, FPoint RCenter, Selection* customSelection = 0);
/trunk/Scribus/scribus/scribusview.cpp
1249,7 → 1249,7
nx = npx.x();
ny = npx.y();
}
Doc->MoveItem(nx-currItem->xPos(), ny-currItem->yPos(), currItem);
Doc->moveItem(nx-currItem->xPos(), ny-currItem->yPos(), currItem);
}
}
if ((Doc->m_Selection->count() > 0) && (Doc->appMode != modeNormal))
1543,7 → 1543,7
}
currItem->PoLine.map(ma);
currItem->PoLine.translate(offsX, offsY);
Doc->AdjustItemSize(currItem);
Doc->adjustItemSize(currItem);
QTransform ma2;
ma2.translate(oldPos.x(), oldPos.y());
ma2.scale(1, 1);
1584,7 → 1584,7
}
double x = ma2.m11() * n.x() + ma2.m21() * n.y() + ma2.dx();
double y = ma2.m22() * n.y() + ma2.m12() * n.x() + ma2.dy();
Doc->MoveItem(x-oldPos.x(), y-oldPos.y(), currItem);
Doc->moveItem(x-oldPos.x(), y-oldPos.y(), currItem);
if (currItem->asPathText())
currItem->updatePolyClip();
Doc->setRedrawBounding(currItem);
1917,7 → 1917,7
nx = npx.x();
ny = npx.y();
}
Doc->MoveItem(nx-currItem->xPos(), ny-currItem->yPos(), currItem);
Doc->moveItem(nx-currItem->xPos(), ny-currItem->yPos(), currItem);
}
currItem->emitAllToGUI();
}
3211,7 → 3211,7
bb->setLineColor(charStyle.fillColor());
bb->setLineShade(charStyle.fillShade());
bb->setLineWidth(Uwid);
Doc->AdjustItemSize(bb);
Doc->adjustItemSize(bb);
bb->ContourLine = bb->PoLine.copy();
bb->ClipEdited = true;
bb->FrameType = 3;
3255,7 → 3255,7
bb->setLineShade(100);
}
bb->setLineWidth(chs * charStyle.outlineWidth() / 10000.0);
Doc->AdjustItemSize(bb);
Doc->adjustItemSize(bb);
bb->ContourLine = bb->PoLine.copy();
bb->ClipEdited = true;
bb->FrameType = 3;
3292,7 → 3292,7
bb->setLineShade(100);
}
bb->setLineWidth(chs * charStyle.outlineWidth() / 10000.0);
Doc->AdjustItemSize(bb);
Doc->adjustItemSize(bb);
bb->ContourLine = bb->PoLine.copy();
bb->ClipEdited = true;
bb->FrameType = 3;
3351,7 → 3351,7
bb->setLineColor(charStyle.fillColor());
bb->setLineShade(charStyle.fillShade());
bb->setLineWidth(Uwid);
Doc->AdjustItemSize(bb);
Doc->adjustItemSize(bb);
bb->ContourLine = bb->PoLine.copy();
bb->ClipEdited = true;
bb->FrameType = 3;
3702,7 → 3702,7
bb->OldB2 = bb->width();
bb->OldH2 = bb->height();
bb->setRotation(currItem->rotation());
Doc->AdjustItemSize(bb);
Doc->adjustItemSize(bb);
undoManager->setUndoEnabled(true);
newGroupedItems.append(Doc->Items->takeAt(z));
}
/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
578,7 → 578,7
currItem->PoLine = currItem->imageClip.copy();
currItem->ClipEdited = true;
currItem->FrameType = 3;
m_doc->AdjustItemSize(currItem);
m_doc->adjustItemSize(currItem);
if (currItem->itemType() == PageItem::PathText)
currItem->updatePolyClip();
m_doc->regionsChanged()->update(QRectF());
604,7 → 604,7
np -= zp;
}
m_doc->nodeEdit.moveClipPoint(currItem, np);
m_doc->AdjustItemSize(currItem, true, true);
m_doc->adjustItemSize(currItem, true, true);
if (currItem->itemType() == PageItem::PathText)
currItem->updatePolyClip();
m_doc->regionsChanged()->update(QRectF());
938,7 → 938,7
currItem->setXYPos(xPos, yPos, true);
currItem->ContourLine = itemContourPath.copy();
currItem->PoLine = itemPath.copy();
m_doc->AdjustItemSize(currItem);
m_doc->adjustItemSize(currItem);
if (currItem->itemType() == PageItem::PathText)
currItem->updatePolyClip();
}
964,7 → 964,7
{
currItem->setXYPos(xPos, yPos, true);
currItem->PoLine = itemPath.copy();
m_doc->AdjustItemSize(currItem);
m_doc->adjustItemSize(currItem);
}
if (currItem->itemType() == PageItem::PathText)
currItem->updatePolyClip();
/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
726,7 → 726,7
w = sqrt(pow(w-x,2)+pow(h-y,2));
m_item->setXYPos(x, m_item->yPos(), true);
m_item->setRotation(r, true);
m_doc->SizeItem(w, m_item->height(), m_item, true);
m_doc->sizeItem(w, m_item->height(), m_item, true);
}
else
{
743,7 → 743,7
base = ma.m11() * m_item->width() + ma.m21() * m_item->height() + ma.dx();
else if (bp == 3)
base = ma.m11() * 0.0 + ma.m21() * m_item->height() + ma.dx();
m_doc->MoveItem(x - base, 0, m_item);
m_doc->moveItem(x - base, 0, m_item);
}
}
m_doc->regionsChanged()->update(QRect());
803,11 → 803,11
}
double r = atan2(h-y,w-x)*(180.0/M_PI);
w = sqrt(pow(w-x,2)+pow(h-y,2));
m_doc->MoveItem(0, y - m_item->yPos(), m_item);
m_doc->moveItem(0, y - m_item->yPos(), m_item);
m_item->setXYPos(m_item->xPos(), y, true);
m_item->setRotation(r, true);
m_doc->SizeItem(w, m_item->height(), m_item, true);
m_doc->RotateItem(r, m_item);
m_doc->sizeItem(w, m_item->height(), m_item, true);
m_doc->rotateItem(r, m_item);
}
else
{
824,7 → 824,7
base = ma.m22() * m_item->height() + ma.m12() * m_item->width() + ma.dy();
else if (bp == 3)
base = ma.m22() * m_item->height() + ma.m12() * 0.0 + ma.dy();
m_doc->MoveItem(0, y - base, m_item);
m_doc->moveItem(0, y - base, m_item);
}
}
m_doc->regionsChanged()->update(QRect());
878,7 → 878,7
m_item->setRotation(r, true);
w = sqrt(pow(w-x,2)+pow(h-y,2));
}
m_doc->SizeItem(w, m_item->height(), m_item, true, true, false);
m_doc->sizeItem(w, m_item->height(), m_item, true, true, false);
}
else
{
885,10 → 885,10
if (keepFrameWHRatioButton->isChecked())
{
showWH(w, (w / oldW) * m_item->height());
m_doc->SizeItem(w, (w / oldW) * m_item->height(), m_item, true, true, false);
m_doc->sizeItem(w, (w / oldW) * m_item->height(), m_item, true, true, false);
}
else
m_doc->SizeItem(w, m_item->height(), m_item, true, true, false);
m_doc->sizeItem(w, m_item->height(), m_item, true, true, false);
}
if (m_item->isArc())
{
960,7 → 960,7
m_item->setRotation(r, true);
w = sqrt(pow(w-x,2)+pow(h-y,2));
}
m_doc->SizeItem(w, m_item->height(), m_item, true, true, false);
m_doc->sizeItem(w, m_item->height(), m_item, true, true, false);
}
else
{
967,10 → 967,10
if (keepFrameWHRatioButton->isChecked())
{
showWH((h / oldH) * m_item->width(), h);
m_doc->SizeItem((h / oldH) * m_item->width(), h, m_item, true, true, false);
m_doc->sizeItem((h / oldH) * m_item->width(), h, m_item, true, true, false);
}
else
m_doc->SizeItem(m_item->width(), h, m_item, true, true, false);
m_doc->sizeItem(m_item->width(), h, m_item, true, true, false);
}
if (m_item->isArc())
{
1011,7 → 1011,7
showXY(gx, gy);
}
else
m_doc->RotateItem(rotationSpin->value()*(-1), m_item);
m_doc->rotateItem(rotationSpin->value()*(-1), m_item);
if (!_userActionOn)
{
for (int i = 0; i < m_doc->m_Selection->count(); ++i)
/trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
158,7 → 158,7
if (!m_doc || !m_item || !m_ScMW || m_ScMW->scriptIsRunning())
return;
m_item->setTextToFrameDistLeft(startOffset->value());
m_doc->AdjustItemSize(m_item);
m_doc->adjustItemSize(m_item);
m_item->updatePolyClip();
m_item->update();
m_doc->regionsChanged()->update(QRect());
187,7 → 187,7
if (!m_doc || !m_item || !m_ScMW || m_ScMW->scriptIsRunning())
return;
m_item->BaseOffs = -distFromCurve->value();
m_doc->AdjustItemSize(m_item);
m_doc->adjustItemSize(m_item);
m_item->updatePolyClip();
m_item->update();
}