Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 4725 → Rev 4726

/branches/Version13x/Scribus/scribus/pdflib.cpp
1093,16 → 1093,16
ite =PItems.at(a);
if (ite->LayerNr != ll.LNr)
continue;
int x = static_cast<int>(pag->xOffset());
int y = static_cast<int>(pag->yOffset());
int w = static_cast<int>(pag->width());
int h1 = static_cast<int>(pag->height());
double x = pag->xOffset();
double y = pag->yOffset();
double w = pag->width();
double h1 = pag->height();
double ilw=ite->lineWidth();
int x2 = static_cast<int>(ite->BoundingX - ilw / 2.0);
int y2 = static_cast<int>(ite->BoundingY - ilw / 2.0);
int w2 = static_cast<int>(ite->BoundingW + ilw);
int h2 = static_cast<int>(ite->BoundingH + ilw);
if (!QRect(x, y, w, h1).intersects(QRect(x2, y2, w2, h2)))
double x2 = ite->BoundingX - ilw / 2.0;
double y2 = ite->BoundingY - ilw / 2.0;
double w2 = ite->BoundingW + ilw;
double h2 = ite->BoundingH + ilw;
if (!( QMAX( x, x2 ) <= QMIN( x+w, x2+w2 ) && QMAX( y, y2 ) <= QMIN( y+h1, y2+h2 )))
continue;
if (ite->ChangedMasterItem)
continue;
2006,16 → 2006,16
continue;
if (!ite->isTableItem)
continue;
int x = qRound(pag->xOffset()*100);
int y = qRound(pag->yOffset()*100);
int w = qRound(pag->width()*100);
int h1 = qRound(pag->height()*100);
double x = pag->xOffset();
double y = pag->yOffset();
double w = pag->width();
double h1 = pag->height();
double ilw=ite->lineWidth();
int x2 = qRound((ite->BoundingX - ilw / 2.0)*100);
int y2 = qRound((ite->BoundingY - ilw / 2.0)*100);
int w2 = qRound((ite->BoundingW + ilw)*100);
int h2 = qRound((ite->BoundingH + ilw)*100);
if (!QRect(x, y, w, h1).intersects(QRect(x2, y2, w2, h2)))
double x2 = ite->BoundingX - ilw / 2.0;
double y2 = ite->BoundingY - ilw / 2.0;
double w2 = ite->BoundingW + ilw;
double h2 = ite->BoundingH + ilw;
if (!( QMAX( x, x2 ) <= QMIN( x+w, x2+w2 ) && QMAX( y, y2 ) <= QMIN( y+h1, y2+h2 )))
continue;
if (ite->ChangedMasterItem)
continue;
2138,16 → 2138,16
QString PDFlib::PDF_ProcessItem(PageItem* ite, const Page* pag, uint PNr, bool embedded)
{
QString tmp("");
int x = qRound(pag->xOffset()*100);
int y = qRound(pag->yOffset()*100);
int w = qRound(pag->width()*100);
int h1 = qRound(pag->height()*100);
double x = pag->xOffset();
double y = pag->yOffset();
double w = pag->width();
double h1 = pag->height();
double ilw=ite->lineWidth();
int x2 = qRound((ite->BoundingX - ilw / 2.0)*100);
int y2 = qRound((ite->BoundingY - ilw / 2.0)*100);
int w2 = qRound((ite->BoundingW + ilw)*100);
int h2 = qRound((ite->BoundingH + ilw)*100);
if (!QRect(x, y, w, h1).intersects(QRect(x2, y2, w2, h2)))
double x2 = ite->BoundingX - ilw / 2.0;
double y2 = ite->BoundingY - ilw / 2.0;
double w2 = ite->BoundingW + ilw;
double h2 = ite->BoundingH + ilw;
if (!( QMAX( x, x2 ) <= QMIN( x+w, x2+w2 ) && QMAX( y, y2 ) <= QMIN( y+h1, y2+h2 )))
return tmp;
if (ite->ChangedMasterItem)
return tmp;
/branches/Version13x/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
232,15 → 232,15
Item = Items.at(j);
if (Item->LayerNr != ll.LNr)
continue;
int x = static_cast<int>(Seite->xOffset());
int y = static_cast<int>(Seite->yOffset());
int w = static_cast<int>(Seite->width());
int h = static_cast<int>(Seite->height());
int x2 = static_cast<int>(Item->BoundingX);
int y2 = static_cast<int>(Item->BoundingY);
int w2 = static_cast<int>(Item->BoundingW);
int h2 = static_cast<int>(Item->BoundingH);
if (!QRect(x, y, w, h).intersects(QRect(x2, y2, w2, h2)))
double x = Seite->xOffset();
double y = Seite->yOffset();
double w = Seite->width();
double h = Seite->height();
double x2 = Item->BoundingX;
double y2 = Item->BoundingY;
double w2 = Item->BoundingW;
double h2 = Item->BoundingH;
if (!( QMAX( x, x2 ) <= QMIN( x+w, x2+w2 ) && QMAX( y, y2 ) <= QMIN( y+h, y2+h2 )))
continue;
if ((Item->fillColor() != CommonStrings::None) || (Item->GrType != 0))
{
/branches/Version13x/Scribus/scribus/pslib.cpp
1940,16 → 1940,16
//if ((!Art) && (view->SelItem.count() != 0) && (!c->Select))
if ((!Art) && (!c->isSelected()) && (Doc->selection->count() != 0))
continue;
int x = static_cast<int>(a->xOffset());
int y = static_cast<int>(a->yOffset());
int w = static_cast<int>(a->width());
int h1 = static_cast<int>(a->height());
double ilw=c->lineWidth();
int x2 = static_cast<int>(c->BoundingX - ilw / 2.0);
int y2 = static_cast<int>(c->BoundingY - ilw / 2.0);
int w2 = static_cast<int>(c->BoundingW + ilw);
int h2 = static_cast<int>(c->BoundingH + ilw);
if (!QRect(x, y, w, h1).intersects(QRect(x2, y2, w2, h2)))
double x = a->xOffset();
double y = a->yOffset();
double w = a->width();
double h1 = a->height();
double ilw = c->lineWidth();
double x2 = c->BoundingX - ilw / 2.0;
double y2 = c->BoundingY - ilw / 2.0;
double w2 = c->BoundingW + ilw;
double h2 = c->BoundingH + ilw;
if (!( QMAX( x, x2 ) <= QMIN( x+w, x2+w2 ) && QMAX( y, y2 ) <= QMIN( y+h1, y2+h2 )))
continue;
if (c->ChangedMasterItem)
continue;
1967,16 → 1967,16
continue;
if ((!a->PageNam.isEmpty()) && (c->asImageFrame()) && ((sep) || (!farb)))
continue;
int x = static_cast<int>(a->xOffset());
int y = static_cast<int>(a->yOffset());
int w = static_cast<int>(a->width());
int h1 = static_cast<int>(a->height());
double x = a->xOffset();
double y = a->yOffset();
double w = a->width();
double h1 = a->height();
double ilw=c->lineWidth();
int x2 = static_cast<int>(c->BoundingX - ilw / 2.0);
int y2 = static_cast<int>(c->BoundingY - ilw / 2.0);
int w2 = static_cast<int>(c->BoundingW + ilw);
int h2 = static_cast<int>(c->BoundingH + ilw);
if (!QRect(x, y, w, h1).intersects(QRect(x2, y2, w2, h2)))
double x2 = c->BoundingX - ilw / 2.0;
double y2 = c->BoundingY - ilw / 2.0;
double w2 = c->BoundingW + ilw;
double h2 = c->BoundingH + ilw;
if (!( QMAX( x, x2 ) <= QMIN( x+w, x2+w2 ) && QMAX( y, y2 ) <= QMIN( y+h1, y2+h2 )))
continue;
if (c->ChangedMasterItem)
continue;