Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 13264 → Rev 13283

/branches/Version133x/Scribus/scribus/pageitem_line.cpp
85,7 → 85,7
}
}
}
if (m_startArrowIndex != 0)
if ((m_startArrowIndex != 0) && (m_lineWidth != 0.0) && (lineColor() != CommonStrings::None))
{
QWMatrix arrowTrans;
FPointArray arrow = (*m_Doc->arrowStyles.at(m_startArrowIndex-1)).points.copy();
93,7 → 93,7
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrowTrans.scale(-1,1);
arrow.map(arrowTrans);
p->setBrush(p->pen());
p->setBrush(strokeQColor);
p->setBrushOpacity(1.0 - lineTransparency());
p->setLineWidth(0);
p->setFillMode(ScPainter::Solid);
100,7 → 100,7
p->setupPolygon(&arrow);
p->fillPath();
}
if (m_endArrowIndex != 0)
if ((m_endArrowIndex != 0) && (m_lineWidth != 0.0) && (lineColor() != CommonStrings::None))
{
QWMatrix arrowTrans;
FPointArray arrow = (*m_Doc->arrowStyles.at(m_endArrowIndex-1)).points.copy();
107,7 → 107,7
arrowTrans.translate(Width, 0);
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrow.map(arrowTrans);
p->setBrush(p->pen());
p->setBrush(strokeQColor);
p->setBrushOpacity(1.0 - lineTransparency());
p->setLineWidth(0);
p->setFillMode(ScPainter::Solid);
/branches/Version133x/Scribus/scribus/pdflib.cpp
1540,7 → 1540,7
}
}
}
if (ite->startArrowIndex() != 0)
if ((ite->startArrowIndex() != 0) && (ite->lineWidth() != 0.0) && (ite->lineColor() != CommonStrings::None))
{
QWMatrix arrowTrans;
FPointArray arrow = (*doc.arrowStyles.at(ite->startArrowIndex()-1)).points.copy();
1566,7 → 1566,7
PutPage(SetClipPathArray(&arrow));
PutPage("h\nf*\n");
}
if (ite->endArrowIndex() != 0)
if ((ite->endArrowIndex() != 0) && (ite->lineWidth() != 0.0) && (ite->lineColor() != CommonStrings::None))
{
QWMatrix arrowTrans;
FPointArray arrow = (*doc.arrowStyles.at(ite->endArrowIndex()-1)).points.copy();
1662,7 → 1662,7
}
}
}
if (ite->startArrowIndex() != 0)
if ((ite->startArrowIndex() != 0) && (ite->lineWidth() != 0.0) && (ite->lineColor() != CommonStrings::None))
{
FPoint Start = ite->PoLine.point(0);
for (uint xx = 1; xx < ite->PoLine.size(); xx += 2)
1698,7 → 1698,7
}
}
}
if (ite->endArrowIndex() != 0)
if ((ite->endArrowIndex() != 0) && (ite->lineWidth() != 0.0) && (ite->lineColor() != CommonStrings::None))
{
FPoint End = ite->PoLine.point(ite->PoLine.size()-2);
for (uint xx = ite->PoLine.size()-1; xx > 0; xx -= 2)
2687,7 → 2687,7
}
}
}
if (ite->startArrowIndex() != 0)
if ((ite->startArrowIndex() != 0) && (ite->lineWidth() != 0.0) && (ite->lineColor() != CommonStrings::None))
{
QWMatrix arrowTrans;
FPointArray arrow = (*doc.arrowStyles.at(ite->startArrowIndex()-1)).points.copy();
2713,7 → 2713,7
tmp += SetClipPathArray(&arrow);
tmp += "h\nf*\n";
}
if (ite->endArrowIndex() != 0)
if ((ite->endArrowIndex() != 0) && (ite->lineWidth() != 0.0) && (ite->lineColor() != CommonStrings::None))
{
QWMatrix arrowTrans;
FPointArray arrow = (*doc.arrowStyles.at(ite->endArrowIndex()-1)).points.copy();
2812,7 → 2812,7
}
}
}
if (ite->startArrowIndex() != 0)
if ((ite->startArrowIndex() != 0) && (ite->lineWidth() != 0.0) && (ite->lineColor() != CommonStrings::None))
{
FPoint Start = ite->PoLine.point(0);
for (uint xx = 1; xx < ite->PoLine.size(); xx += 2)
2848,7 → 2848,7
}
}
}
if (ite->endArrowIndex() != 0)
if ((ite->endArrowIndex() != 0) && (ite->lineWidth() != 0.0) && (ite->lineColor() != CommonStrings::None))
{
FPoint End = ite->PoLine.point(ite->PoLine.size()-2);
for (uint xx = ite->PoLine.size()-1; xx > 0; xx -= 2)
/branches/Version133x/Scribus/scribus/pageitem_polyline.cpp
124,7 → 124,7
}
}
}
if (m_startArrowIndex != 0)
if ((m_startArrowIndex != 0) && (m_lineWidth != 0.0) && (lineColor() != CommonStrings::None))
{
FPoint Start = PoLine.point(0);
for (uint xx = 1; xx < PoLine.size(); xx += 2)
139,7 → 139,7
arrowTrans.rotate(r);
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrow.map(arrowTrans);
p->setBrush(p->pen());
p->setBrush(strokeQColor);
p->setBrushOpacity(1.0 - lineTransparency());
p->setLineWidth(0);
p->setFillMode(ScPainter::Solid);
149,7 → 149,7
}
}
}
if (m_endArrowIndex != 0)
if ((m_endArrowIndex != 0) && (m_lineWidth != 0.0) && (lineColor() != CommonStrings::None))
{
FPoint End = PoLine.point(PoLine.size()-2);
for (uint xx = PoLine.size()-1; xx > 0; xx -= 2)
164,7 → 164,7
arrowTrans.rotate(r);
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrow.map(arrowTrans);
p->setBrush(p->pen());
p->setBrush(strokeQColor);
p->setBrushOpacity(1.0 - lineTransparency());
p->setLineWidth(0);
p->setFillMode(ScPainter::Solid);
/branches/Version133x/Scribus/scribus/pslib.cpp
1649,7 → 1649,7
}
}
}
if (c->startArrowIndex() != 0)
if ((c->startArrowIndex() != 0) && (c->lineWidth() != 0.0) && (c->lineColor() != CommonStrings::None))
{
QWMatrix arrowTrans;
FPointArray arrow = (*Doc->arrowStyles.at(c->startArrowIndex()-1)).points.copy();
1664,7 → 1664,7
PS_closepath();
putColor(c->lineColor(), c->lineShade(), true);
}
if (c->endArrowIndex() != 0)
if ((c->endArrowIndex() != 0) && (c->lineWidth() != 0.0) && (c->lineColor() != CommonStrings::None))
{
QWMatrix arrowTrans;
FPointArray arrow = (*Doc->arrowStyles.at(c->endArrowIndex()-1)).points.copy();
1760,7 → 1760,7
}
}
}
if (c->startArrowIndex() != 0)
if ((c->startArrowIndex() != 0) && (c->lineWidth() != 0.0) && (c->lineColor() != CommonStrings::None))
{
FPoint Start = c->PoLine.point(0);
for (uint xx = 1; xx < c->PoLine.size(); xx += 2)
1785,7 → 1785,7
}
}
}
if (c->endArrowIndex() != 0)
if ((c->endArrowIndex() != 0) && (c->lineWidth() != 0.0) && (c->lineColor() != CommonStrings::None))
{
FPoint End = c->PoLine.point(c->PoLine.size()-2);
for (uint xx = c->PoLine.size()-1; xx > 0; xx -= 2)