Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5581 → Rev 5582

/branches/Version13x/Scribus/scribus/pageitem_line.cpp
86,33 → 86,43
p->drawLine(FPoint(0, 0), FPoint(Width, 0));
}
}
if (m_startArrowIndex != 0)
}
if (m_startArrowIndex != 0)
{
QWMatrix arrowTrans;
FPointArray arrow = (*m_Doc->arrowStyles.at(m_startArrowIndex-1)).points.copy();
arrowTrans.translate(0, 0);
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrowTrans.scale(-1,1);
arrow.map(arrowTrans);
p->setupPolygon(&arrow);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
p->strokePath();
else
{
QWMatrix arrowTrans;
FPointArray arrow = (*m_Doc->arrowStyles.at(m_startArrowIndex-1)).points.copy();
arrowTrans.translate(0, 0);
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrowTrans.scale(-1,1);
arrow.map(arrowTrans);
p->setBrush(p->pen());
p->setBrushOpacity(1.0 - lineTransparency());
p->setLineWidth(0);
p->setFillMode(ScPainter::Solid);
p->setupPolygon(&arrow);
p->fillPath();
}
if (m_endArrowIndex != 0)
}
if (m_endArrowIndex != 0)
{
QWMatrix arrowTrans;
FPointArray arrow = (*m_Doc->arrowStyles.at(m_endArrowIndex-1)).points.copy();
arrowTrans.translate(Width, 0);
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrow.map(arrowTrans);
p->setupPolygon(&arrow);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
p->strokePath();
else
{
QWMatrix arrowTrans;
FPointArray arrow = (*m_Doc->arrowStyles.at(m_endArrowIndex-1)).points.copy();
arrowTrans.translate(Width, 0);
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrow.map(arrowTrans);
p->setBrush(p->pen());
p->setBrushOpacity(1.0 - lineTransparency());
p->setLineWidth(0);
p->setFillMode(ScPainter::Solid);
p->setupPolygon(&arrow);
p->fillPath();
}
}
/branches/Version13x/Scribus/scribus/pageitem_polyline.cpp
66,61 → 66,64
{
if (!m_Doc->RePos && PoLine.size()>=4)
{
if ((fillColor() != CommonStrings::None) || (GrType != 0))
if (!m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
{
FPointArray cli;
FPoint Start;
bool firstp = true;
for (uint n = 0; n < PoLine.size()-3; n += 4)
if ((fillColor() != CommonStrings::None) || (GrType != 0))
{
if (firstp)
FPointArray cli;
FPoint Start;
bool firstp = true;
for (uint n = 0; n < PoLine.size()-3; n += 4)
{
Start = PoLine.point(n);
firstp = false;
if (firstp)
{
Start = PoLine.point(n);
firstp = false;
}
if (PoLine.point(n).x() > 900000)
{
cli.addPoint(PoLine.point(n-2));
cli.addPoint(PoLine.point(n-2));
cli.addPoint(Start);
cli.addPoint(Start);
cli.setMarker();
firstp = true;
continue;
}
cli.addPoint(PoLine.point(n));
cli.addPoint(PoLine.point(n+1));
cli.addPoint(PoLine.point(n+2));
cli.addPoint(PoLine.point(n+3));
}
if (PoLine.point(n).x() > 900000)
if (cli.size() > 2)
{
cli.addPoint(PoLine.point(n-2));
cli.addPoint(PoLine.point(n-2));
FPoint l1 = cli.point(cli.size()-2);
cli.addPoint(l1);
cli.addPoint(l1);
cli.addPoint(Start);
cli.addPoint(Start);
cli.setMarker();
firstp = true;
continue;
}
cli.addPoint(PoLine.point(n));
cli.addPoint(PoLine.point(n+1));
cli.addPoint(PoLine.point(n+2));
cli.addPoint(PoLine.point(n+3));
p->setupPolygon(&cli);
p->fillPath();
}
if (cli.size() > 2)
p->setupPolygon(&PoLine, false);
if (NamedLStyle.isEmpty())
p->strokePath();
else
{
FPoint l1 = cli.point(cli.size()-2);
cli.addPoint(l1);
cli.addPoint(l1);
cli.addPoint(Start);
cli.addPoint(Start);
multiLine ml = m_Doc->MLineStyles[NamedLStyle];
QColor tmp;
for (int it = ml.size()-1; it > -1; it--)
{
SetFarbe(&tmp, ml[it].Color, ml[it].Shade);
p->setPen(tmp, ml[it].Width,
static_cast<PenStyle>(ml[it].Dash),
static_cast<PenCapStyle>(ml[it].LineEnd),
static_cast<PenJoinStyle>(ml[it].LineJoin));
p->strokePath();
}
}
p->setupPolygon(&cli);
p->fillPath();
}
p->setupPolygon(&PoLine, false);
if (NamedLStyle.isEmpty())
p->strokePath();
else
{
multiLine ml = m_Doc->MLineStyles[NamedLStyle];
QColor tmp;
for (int it = ml.size()-1; it > -1; it--)
{
SetFarbe(&tmp, ml[it].Color, ml[it].Shade);
p->setPen(tmp, ml[it].Width,
static_cast<PenStyle>(ml[it].Dash),
static_cast<PenCapStyle>(ml[it].LineEnd),
static_cast<PenJoinStyle>(ml[it].LineJoin));
p->strokePath();
}
}
if (m_startArrowIndex != 0)
{
FPoint Start = PoLine.point(0);
136,12 → 139,17
arrowTrans.rotate(r);
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrow.map(arrowTrans);
p->setBrush(p->pen());
p->setBrushOpacity(1.0 - lineTransparency());
p->setLineWidth(0);
p->setFillMode(ScPainter::Solid);
p->setupPolygon(&arrow);
p->fillPath();
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
p->strokePath();
else
{
p->setBrush(p->pen());
p->setBrushOpacity(1.0 - lineTransparency());
p->setLineWidth(0);
p->setFillMode(ScPainter::Solid);
p->fillPath();
}
break;
}
}
161,12 → 169,17
arrowTrans.rotate(r);
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrow.map(arrowTrans);
p->setBrush(p->pen());
p->setBrushOpacity(1.0 - lineTransparency());
p->setLineWidth(0);
p->setFillMode(ScPainter::Solid);
p->setupPolygon(&arrow);
p->fillPath();
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
p->strokePath();
else
{
p->setBrush(p->pen());
p->setBrushOpacity(1.0 - lineTransparency());
p->setLineWidth(0);
p->setFillMode(ScPainter::Solid);
p->fillPath();
}
break;
}
}
/branches/Version13x/Scribus/scribus/pageitem_pathtext.cpp
87,7 → 87,7
double segLen = 0;
double distCurX;
CurX = Extra;
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (!m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
{
if (lineColor() != CommonStrings::None && PoShow)
{
/branches/Version13x/Scribus/scribus/pageitem.cpp
737,7 → 737,7
DrawObj_Pre(p, sc);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
{
if (itemType()==TextFrame || itemType()==ImageFrame || itemType()==PathText || itemType()==Line)
if (itemType()==TextFrame || itemType()==ImageFrame || itemType()==PathText || itemType()==Line || itemType()==PolyLine)
DrawObj_Item(p, e, sc);
}
else
836,9 → 836,17
p->setPenOpacity(1.0);
if (itemType()==PolyLine)
p->setupPolygon(&PoLine, false);
else if (itemType() == PathText)
{
if (PoShow)
p->setupPolygon(&PoLine, false);
else
doStroke = false;
}
else
p->setupPolygon(&PoLine);
p->strokePath();
if (doStroke)
p->strokePath();
}
}
else
925,7 → 933,7
p->setBrush(m_Doc->layerMarker(m_Doc->layerLevelFromNumber(LayerNr)));
p->setFillMode(ScPainter::Solid);
p->setLineWidth(0);
p->drawRect(6, 6, 6, 6);
p->drawRect(3, 3, 10, 10);
}
//CB disabled for now
//if (m_Doc->m_Selection->findItem(this)!=-1)
1365,6 → 1373,18
bool fr = p->fillRule();
p->setFillRule(false);
p->setupTextPolygon(&gly);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
{
p->save();
p->setPen(m_Doc->layerMarker(m_Doc->layerLevelFromNumber(LayerNr)), 0.5, SolidLine, FlatCap, MiterJoin);
p->setFillMode(ScPainter::None);
p->setBrushOpacity(1.0);
p->setPenOpacity(1.0);
p->strokePath();
p->restore();
p->setFillRule(fr);
return;
}
if ((hl->ZFo->isStroked()) && ((hl->Siz * hl->outline / 10000.0) != 0))
{
QColor tmp = p->brush();