1737,17 → 1737,17 |
double lineWidth = def_lineWidth; |
int fillShade = def_fillTint; |
int strokeShade = def_strokeTint; |
double opacity = def_Opacity; |
double Opacity = def_Opacity; |
int blendMode = def_Blendmode; |
double Extra = def_Extra; |
double TExtra = def_TExtra; |
double BExtra = def_BExtra; |
double RExtra = def_RExtra; |
int textColumnCount = def_TextColumnCount; |
double textColumnGutter = def_TextColumnGutter; |
int TextColumnCount = def_TextColumnCount; |
double TextColumnGutter = def_TextColumnGutter; |
//double TextColumnFixedWidth = def_TextColumnFixedWidth; |
QString leftLineEnd = def_LeftLineEnd; |
QString rightLineEnd = def_RightLineEnd; |
QString LeftLineEnd = def_LeftLineEnd; |
QString RightLineEnd = def_RightLineEnd; |
QString imageFit = "None"; |
PageItem::TextFlowMode textFlow = def_TextFlow; |
if (itElem.hasAttribute("AppliedObjectStyle")) |
1804,18 → 1804,18 |
lineWidth = nstyle.lineWidth; |
fillShade = nstyle.fillTint; |
strokeShade = nstyle.strokeTint; |
opacity = nstyle.Opacity; |
Opacity = nstyle.Opacity; |
blendMode = nstyle.blendMode; |
Extra = nstyle.Extra; |
TExtra = nstyle.TExtra; |
BExtra = nstyle.BExtra; |
RExtra = nstyle.RExtra; |
textColumnCount = nstyle.TextColumnCount; |
textColumnGutter = nstyle.TextColumnGutter; |
TextColumnCount = nstyle.TextColumnCount; |
TextColumnGutter = nstyle.TextColumnGutter; |
// TextColumnFixedWidth = nstyle.TextColumnFixedWidth; |
textFlow = nstyle.TextFlow; |
leftLineEnd = nstyle.LeftLineEnd; |
rightLineEnd = nstyle.RightLineEnd; |
LeftLineEnd = nstyle.LeftLineEnd; |
RightLineEnd = nstyle.RightLineEnd; |
} |
} |
if (itElem.hasAttribute("FillColor")) |
1879,9 → 1879,9 |
if (strokeShade < 0) |
strokeShade = 100; |
if (itElem.hasAttribute("RightLineEnd")) |
rightLineEnd = itElem.attribute("RightLineEnd"); |
RightLineEnd = itElem.attribute("RightLineEnd"); |
if (itElem.hasAttribute("LeftLineEnd")) |
leftLineEnd = itElem.attribute("LeftLineEnd"); |
LeftLineEnd = itElem.attribute("LeftLineEnd"); |
QString forLayer = itElem.attribute("ItemLayer"); |
if (layerTranslate.contains(forLayer)) |
forLayer = layerTranslate[forLayer]; |
2050,7 → 2050,7 |
QDomElement itpg = itp.toElement(); |
if (itpg.tagName() == "BlendingSetting") |
{ |
opacity = 1.0 - (itpg.attribute("Opacity", "100").toDouble() / 100.0); |
Opacity = 1.0 - (itpg.attribute("Opacity", "100").toDouble() / 100.0); |
blendMode = convertBlendMode(itpg.attribute("BlendMode", "Normal")); |
} |
} |
2067,9 → 2067,9 |
else if (ite.tagName() == "TextFramePreference") |
{ |
if (ite.hasAttribute("TextColumnCount")) |
textColumnCount = ite.attribute("TextColumnCount").toInt(); |
TextColumnCount = ite.attribute("TextColumnCount").toInt(); |
if (ite.hasAttribute("TextColumnGutter")) |
textColumnGutter = ite.attribute("TextColumnGutter").toDouble(); |
TextColumnGutter = ite.attribute("TextColumnGutter").toDouble(); |
// if (ite.hasAttribute("TextColumnFixedWidth")) |
// TextColumnFixedWidth = ite.attribute("TextColumnFixedWidth").toDouble(); |
for (QDomNode itpp = ite.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling()) |
2205,8 → 2205,8 |
item->setTextToFrameDistTop(TExtra); |
item->setTextToFrameDistRight(RExtra); |
item->setTextToFrameDistBottom(BExtra); |
item->setColumns(textColumnCount); |
item->setColumnGap(textColumnGutter); |
item->setColumns(TextColumnCount); |
item->setColumnGap(TextColumnGutter); |
} |
else if (isPathText) |
{ |
2306,54 → 2306,54 |
item->OldH2 = item->height(); |
if (item->isPolyLine()) |
{ |
if (leftLineEnd != "None") |
if (LeftLineEnd != "None") |
{ |
if (leftLineEnd == "SimpleArrowHead") |
if (LeftLineEnd == "SimpleArrowHead") |
item->setStartArrowIndex(2); |
else if (leftLineEnd == "SimpleWideArrowHead") |
else if (LeftLineEnd == "SimpleWideArrowHead") |
item->setStartArrowIndex(2); |
else if (leftLineEnd == "TriangleArrowHead") |
else if (LeftLineEnd == "TriangleArrowHead") |
item->setStartArrowIndex(8); |
else if (leftLineEnd == "TriangleWideArrowHead") |
else if (LeftLineEnd == "TriangleWideArrowHead") |
item->setStartArrowIndex(8); |
else if (leftLineEnd == "BarbedArrowHead") |
else if (LeftLineEnd == "BarbedArrowHead") |
item->setStartArrowIndex(23); |
else if (leftLineEnd == "CurvedArrowHead") |
else if (LeftLineEnd == "CurvedArrowHead") |
item->setStartArrowIndex(26); |
else if (leftLineEnd == "CircleArrowHead") |
else if (LeftLineEnd == "CircleArrowHead") |
item->setStartArrowIndex(17); |
else if (leftLineEnd == "CircleSolidArrowHead") |
else if (LeftLineEnd == "CircleSolidArrowHead") |
item->setStartArrowIndex(17); |
else if (leftLineEnd == "Square-ArrowHead") |
else if (LeftLineEnd == "Square-ArrowHead") |
item->setStartArrowIndex(5); |
else if (leftLineEnd == "SquareSolid-ArrowHead") |
else if (LeftLineEnd == "SquareSolid-ArrowHead") |
item->setStartArrowIndex(5); |
else if (leftLineEnd == "BarArrowHead") |
else if (LeftLineEnd == "BarArrowHead") |
item->setStartArrowIndex(35); |
} |
if (rightLineEnd != "None") |
if (RightLineEnd != "None") |
{ |
if (rightLineEnd == "SimpleArrowHead") |
if (RightLineEnd == "SimpleArrowHead") |
item->setEndArrowIndex(2); |
else if (rightLineEnd == "SimpleWideArrowHead") |
else if (RightLineEnd == "SimpleWideArrowHead") |
item->setEndArrowIndex(2); |
else if (rightLineEnd == "TriangleArrowHead") |
else if (RightLineEnd == "TriangleArrowHead") |
item->setEndArrowIndex(8); |
else if (rightLineEnd == "TriangleWideArrowHead") |
else if (RightLineEnd == "TriangleWideArrowHead") |
item->setEndArrowIndex(8); |
else if (rightLineEnd == "BarbedArrowHead") |
else if (RightLineEnd == "BarbedArrowHead") |
item->setEndArrowIndex(23); |
else if (rightLineEnd == "CurvedArrowHead") |
else if (RightLineEnd == "CurvedArrowHead") |
item->setEndArrowIndex(26); |
else if (rightLineEnd == "CircleArrowHead") |
else if (RightLineEnd == "CircleArrowHead") |
item->setEndArrowIndex(17); |
else if (rightLineEnd == "CircleSolidArrowHead") |
else if (RightLineEnd == "CircleSolidArrowHead") |
item->setEndArrowIndex(17); |
else if (rightLineEnd == "Square-ArrowHead") |
else if (RightLineEnd == "Square-ArrowHead") |
item->setEndArrowIndex(7); |
else if (rightLineEnd == "SquareSolid-ArrowHead") |
else if (RightLineEnd == "SquareSolid-ArrowHead") |
item->setEndArrowIndex(7); |
else if (rightLineEnd == "BarArrowHead") |
else if (RightLineEnd == "BarArrowHead") |
item->setEndArrowIndex(35); |
} |
} |
2403,8 → 2403,8 |
itemg->PoLine = gClip.copy(); |
itemg->updateClip(); |
itemg->setItemName(pre+itemName); |
itemg->setFillTransparency(opacity); |
itemg->setLineTransparency(opacity); |
itemg->setFillTransparency(Opacity); |
itemg->setLineTransparency(Opacity); |
itemg->setLineBlendmode(blendMode); |
itemg->setFillBlendmode(blendMode); |
itemg->setFillEvenOdd(false); |
2437,8 → 2437,8 |
item->setTextToFrameDistTop(TExtra); |
item->setTextToFrameDistRight(RExtra); |
item->setTextToFrameDistBottom(BExtra); |
item->setColumns(textColumnCount); |
item->setColumnGap(textColumnGutter); |
item->setColumns(TextColumnCount); |
item->setColumnGap(TextColumnGutter); |
} |
else if (isPathText) |
{ |
2482,8 → 2482,8 |
item->setLineColor(strokeColor); |
item->setFillShade(fillShade); |
item->setLineShade(strokeShade); |
item->setFillTransparency(opacity); |
item->setLineTransparency(opacity); |
item->setFillTransparency(Opacity); |
item->setLineTransparency(Opacity); |
item->setLineBlendmode(blendMode); |
item->setFillBlendmode(blendMode); |
item->setFillEvenOdd(false); |
2547,54 → 2547,54 |
item->OldH2 = item->height(); |
if (item->isPolyLine()) |
{ |
if (leftLineEnd != "None") |
if (LeftLineEnd != "None") |
{ |
if (leftLineEnd == "SimpleArrowHead") |
if (LeftLineEnd == "SimpleArrowHead") |
item->setStartArrowIndex(2); |
else if (leftLineEnd == "SimpleWideArrowHead") |
else if (LeftLineEnd == "SimpleWideArrowHead") |
item->setStartArrowIndex(2); |
else if (leftLineEnd == "TriangleArrowHead") |
else if (LeftLineEnd == "TriangleArrowHead") |
item->setStartArrowIndex(8); |
else if (leftLineEnd == "TriangleWideArrowHead") |
else if (LeftLineEnd == "TriangleWideArrowHead") |
item->setStartArrowIndex(8); |
else if (leftLineEnd == "BarbedArrowHead") |
else if (LeftLineEnd == "BarbedArrowHead") |
item->setStartArrowIndex(23); |
else if (leftLineEnd == "CurvedArrowHead") |
else if (LeftLineEnd == "CurvedArrowHead") |
item->setStartArrowIndex(26); |
else if (leftLineEnd == "CircleArrowHead") |
else if (LeftLineEnd == "CircleArrowHead") |
item->setStartArrowIndex(17); |
else if (leftLineEnd == "CircleSolidArrowHead") |
else if (LeftLineEnd == "CircleSolidArrowHead") |
item->setStartArrowIndex(17); |
else if (leftLineEnd == "Square-ArrowHead") |
else if (LeftLineEnd == "Square-ArrowHead") |
item->setStartArrowIndex(5); |
else if (leftLineEnd == "SquareSolid-ArrowHead") |
else if (LeftLineEnd == "SquareSolid-ArrowHead") |
item->setStartArrowIndex(5); |
else if (leftLineEnd == "BarArrowHead") |
else if (LeftLineEnd == "BarArrowHead") |
item->setStartArrowIndex(35); |
} |
if (rightLineEnd != "None") |
if (RightLineEnd != "None") |
{ |
if (rightLineEnd == "SimpleArrowHead") |
if (RightLineEnd == "SimpleArrowHead") |
item->setEndArrowIndex(2); |
else if (rightLineEnd == "SimpleWideArrowHead") |
else if (RightLineEnd == "SimpleWideArrowHead") |
item->setEndArrowIndex(2); |
else if (rightLineEnd == "TriangleArrowHead") |
else if (RightLineEnd == "TriangleArrowHead") |
item->setEndArrowIndex(8); |
else if (rightLineEnd == "TriangleWideArrowHead") |
else if (RightLineEnd == "TriangleWideArrowHead") |
item->setEndArrowIndex(8); |
else if (rightLineEnd == "BarbedArrowHead") |
else if (RightLineEnd == "BarbedArrowHead") |
item->setEndArrowIndex(23); |
else if (rightLineEnd == "CurvedArrowHead") |
else if (RightLineEnd == "CurvedArrowHead") |
item->setEndArrowIndex(26); |
else if (rightLineEnd == "CircleArrowHead") |
else if (RightLineEnd == "CircleArrowHead") |
item->setEndArrowIndex(17); |
else if (rightLineEnd == "CircleSolidArrowHead") |
else if (RightLineEnd == "CircleSolidArrowHead") |
item->setEndArrowIndex(17); |
else if (rightLineEnd == "Square-ArrowHead") |
else if (RightLineEnd == "Square-ArrowHead") |
item->setEndArrowIndex(7); |
else if (rightLineEnd == "SquareSolid-ArrowHead") |
else if (RightLineEnd == "SquareSolid-ArrowHead") |
item->setEndArrowIndex(7); |
else if (rightLineEnd == "BarArrowHead") |
else if (RightLineEnd == "BarArrowHead") |
item->setEndArrowIndex(35); |
} |
} |
2732,8 → 2732,8 |
item->OldH2 = item->height(); |
item->updateClip(); |
item->setItemName(itemName); |
item->setFillTransparency(opacity); |
item->setLineTransparency(opacity); |
item->setFillTransparency(Opacity); |
item->setLineTransparency(Opacity); |
item->setLineBlendmode(blendMode); |
item->setFillBlendmode(blendMode); |
item->setFillEvenOdd(false); |