Author: jghali
Date: Wed Feb 9 20:52:05 2022
New Revision: 24932
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24932
Log:
Refactor and cleanup OdgPlug and RawPainter's apply*Arrow functions
Modified:
branches/Version15x/Scribus/scribus/plugins/import/odg/importodg.cpp
branches/Version15x/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
branches/Version15x/Scribus/scribus/plugins/import/revenge/rawpainter.h
Modified: branches/Version15x/Scribus/scribus/plugins/import/odg/importodg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24932&path=/branches/Version15x/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- branches/Version15x/Scribus/scribus/plugins/import/odg/importodg.cpp
(original)
+++ branches/Version15x/Scribus/scribus/plugins/import/odg/importodg.cpp
Wed Feb 9 20:52:05 2022
@@ -3346,135 +3346,135 @@
PageItem* OdgPlug::applyStartArrow(PageItem* ite, ObjStyle &obState)
{
+ if (obState.startMarkerName.isEmpty())
+ return nullptr;
+
+ ObjStyle mStyle;
+ resovleStyle(mStyle, obState.startMarkerName);
+ QPainterPath pa = mStyle.markerPath;
+ FPointArray startArrow;
+ startArrow.fromQPainterPath(pa);
+ QRectF br = pa.boundingRect();
+ double startArrowWidth = obState.startMarkerWidth;
+ if (startArrowWidth <= 0)
+ return nullptr;
+
PageItem *iteS = nullptr;
- if (!obState.startMarkerName.isEmpty())
- {
- ObjStyle mStyle;
- resovleStyle(mStyle, obState.startMarkerName);
- QPainterPath pa = mStyle.markerPath;
- FPointArray EndArrow;
- EndArrow.fromQPainterPath(pa);
- QRectF br = pa.boundingRect();
- double EndArrowWidth = obState.startMarkerWidth;
- if (EndArrowWidth > 0)
- {
- FPoint Start = ite->PoLine.point(0);
- for (int xx = 1; xx < ite->PoLine.size(); xx += 2)
- {
- FPoint Vector = ite->PoLine.point(xx);
- if ((Start.x() != Vector.x()) || (Start.y() !=
Vector.y()))
- {
- double r =
atan2(Start.y()-Vector.y(),Start.x()-Vector.x())*(180.0/M_PI);
- QPointF refP;
- if (obState.startMarkerCentered)
- refP = QPointF(br.width() /
2.0, br.height() / 2.0);
- else
- refP = QPointF(br.width() /
2.0, 0);
- QTransform m;
- m.translate(br.width() / 2.0,
br.height() / 2.0);
- m.rotate(r + 90);
- m.translate(-br.width() / 2.0,
-br.height() / 2.0);
- m.scale(EndArrowWidth / br.width(),
EndArrowWidth / br.width());
- EndArrow.map(m);
- refP = m.map(refP);
- QPainterPath pa2 =
EndArrow.toQPainterPath(true);
- QTransform m2;
- FPoint
grOffset2(getMinClipF(&EndArrow));
- m2.translate(-grOffset2.x(),
-grOffset2.y());
- EndArrow.map(m2);
- refP = m2.map(refP);
- EndArrow.translate(-refP.x(),
-refP.y());
- QTransform arrowTrans;
-
arrowTrans.translate(-m_Doc->currentPage()->xOffset(),
-m_Doc->currentPage()->yOffset());
- arrowTrans.translate(Start.x() +
ite->xPos(), Start.y() + ite->yPos());
- EndArrow.map(arrowTrans);
- int zS =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10,
0, obState.currColorStroke, CommonStrings::None);
- iteS = m_Doc->Items->at(zS);
- iteS->PoLine = EndArrow.copy();
- iteS->ClipEdited = true;
- iteS->FrameType = 3;
- FPoint wh = getMaxClipF(&iteS->PoLine);
- iteS->setWidthHeight(wh.x(), wh.y());
- m_Doc->adjustItemSize(iteS, true);
- iteS->setFillEvenOdd(false);
- iteS->OldB2 = iteS->width();
- iteS->OldH2 = iteS->height();
- iteS->updateClip();
- iteS->OwnPage = m_Doc->OnPage(iteS);
-
iteS->setFillTransparency(obState.strokeOpacity);
- m_Doc->Items->removeLast();
- break;
- }
- }
- }
-
- }
+ FPoint startPoint = ite->PoLine.point(0);
+ for (int xx = 1; xx < ite->PoLine.size(); xx += 2)
+ {
+ FPoint point = ite->PoLine.point(xx);
+ if ((startPoint.x() == point.x()) && (startPoint.y() ==
point.y()))
+ continue;
+
+ double r = atan2(startPoint.y() - point.y(), startPoint.x() -
point.x()) * (180.0 / M_PI);
+ QPointF refP;
+ if (obState.startMarkerCentered)
+ refP = QPointF(br.width() / 2.0, br.height() / 2.0);
+ else
+ refP = QPointF(br.width() / 2.0, 0);
+ QTransform m;
+ m.translate(br.width() / 2.0, br.height() / 2.0);
+ m.rotate(r + 90);
+ m.translate(-br.width() / 2.0, -br.height() / 2.0);
+ m.scale(startArrowWidth / br.width(), startArrowWidth /
br.width());
+ startArrow.map(m);
+ refP = m.map(refP);
+ QTransform m2;
+ FPoint grOffset2(getMinClipF(&startArrow));
+ m2.translate(-grOffset2.x(), -grOffset2.y());
+ startArrow.map(m2);
+ refP = m2.map(refP);
+ startArrow.translate(-refP.x(), -refP.y());
+ QTransform arrowTrans;
+ arrowTrans.translate(-m_Doc->currentPage()->xOffset(),
-m_Doc->currentPage()->yOffset());
+ arrowTrans.translate(startPoint.x() + ite->xPos(),
startPoint.y() + ite->yPos());
+ startArrow.map(arrowTrans);
+ int zS = m_Doc->itemAdd(PageItem::Polygon,
PageItem::Unspecified, baseX, baseY, 10, 10, 0, obState.currColorStroke,
CommonStrings::None);
+ iteS = m_Doc->Items->at(zS);
+ iteS->PoLine = startArrow.copy();
+ iteS->ClipEdited = true;
+ iteS->FrameType = 3;
+ FPoint wh = getMaxClipF(&iteS->PoLine);
+ iteS->setWidthHeight(wh.x(), wh.y());
+ m_Doc->adjustItemSize(iteS, true);
+ iteS->setFillEvenOdd(false);
+ iteS->OldB2 = iteS->width();
+ iteS->OldH2 = iteS->height();
+ iteS->updateClip();
+ iteS->OwnPage = m_Doc->OnPage(iteS);
+ iteS->setFillTransparency(obState.strokeOpacity);
+ m_Doc->Items->removeLast();
+ break;
+ }
+
return iteS;
}
PageItem* OdgPlug::applyEndArrow(PageItem* ite, ObjStyle &obState)
{
+ if (obState.endMarkerName.isEmpty())
+ return nullptr;
+
+ ObjStyle mStyle;
+ resovleStyle(mStyle, obState.endMarkerName);
+ QPainterPath pa = mStyle.markerPath;
+ FPointArray endArrow;
+ endArrow.fromQPainterPath(pa);
+ QRectF br = pa.boundingRect();
+ double endArrowWidth = obState.endMarkerWidth;
+ if (endArrowWidth <= 0)
+ return nullptr;
+
PageItem *iteS = nullptr;
- if (!obState.endMarkerName.isEmpty())
- {
- ObjStyle mStyle;
- resovleStyle(mStyle, obState.endMarkerName);
- double EndArrowWidth = obState.endMarkerWidth;
- QPainterPath pa = mStyle.markerPath;
- FPointArray EndArrow;
- EndArrow.fromQPainterPath(pa);
- QRectF br = pa.boundingRect();
- if (EndArrowWidth > 0)
- {
- FPoint End = ite->PoLine.point(ite->PoLine.size()-2);
- for (uint xx = ite->PoLine.size()-1; xx > 0; xx -= 2)
- {
- FPoint Vector = ite->PoLine.point(xx);
- if ((End.x() != Vector.x()) || (End.y() !=
Vector.y()))
- {
- double r =
atan2(End.y()-Vector.y(),End.x()-Vector.x())*(180.0/M_PI);
- QPointF refP;
- if (obState.endMarkerCentered)
- refP = QPointF(br.width() /
2.0, br.height() / 2.0);
- else
- refP = QPointF(br.width() /
2.0, 0);
- QTransform m;
- m.translate(br.width() / 2.0,
br.height() / 2.0);
- m.rotate(r + 90);
- m.translate(-br.width() / 2.0,
-br.height() / 2.0);
- m.scale(EndArrowWidth / br.width(),
EndArrowWidth / br.width());
- EndArrow.map(m);
- refP = m.map(refP);
- QTransform m2;
- FPoint
grOffset2(getMinClipF(&EndArrow));
- m2.translate(-grOffset2.x(),
-grOffset2.y());
- EndArrow.map(m2);
- refP = m2.map(refP);
- EndArrow.translate(-refP.x(),
-refP.y());
- QTransform arrowTrans;
-
arrowTrans.translate(-m_Doc->currentPage()->xOffset(),
-m_Doc->currentPage()->yOffset());
- arrowTrans.translate(End.x() +
ite->xPos(), End.y() + ite->yPos());
- EndArrow.map(arrowTrans);
- int zE =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10,
0, obState.currColorStroke, CommonStrings::None);
- iteS = m_Doc->Items->at(zE);
- iteS->PoLine = EndArrow.copy();
- iteS->ClipEdited = true;
- iteS->FrameType = 3;
- FPoint wh = getMaxClipF(&iteS->PoLine);
- iteS->setWidthHeight(wh.x(), wh.y());
- m_Doc->adjustItemSize(iteS, true);
- iteS->setFillEvenOdd(false);
- iteS->OldB2 = iteS->width();
- iteS->OldH2 = iteS->height();
- iteS->updateClip();
- iteS->OwnPage = m_Doc->OnPage(iteS);
-
iteS->setFillTransparency(obState.strokeOpacity);
- m_Doc->Items->removeLast();
- break;
- }
- }
- }
- }
+ FPoint endPoint = ite->PoLine.point(ite->PoLine.size() - 2);
+ for (int xx = ite->PoLine.size() - 1; xx > 0; xx -= 2)
+ {
+ FPoint point = ite->PoLine.point(xx);
+ if ((endPoint.x() == point.x()) && (endPoint.y() == point.y()))
+ continue;
+
+ double r = atan2(endPoint.y() - point.y(), endPoint.x() -
point.x()) * (180.0 / M_PI);
+ QPointF refP;
+ if (obState.endMarkerCentered)
+ refP = QPointF(br.width() / 2.0, br.height() / 2.0);
+ else
+ refP = QPointF(br.width() / 2.0, 0);
+ QTransform m;
+ m.translate(br.width() / 2.0, br.height() / 2.0);
+ m.rotate(r + 90);
+ m.translate(-br.width() / 2.0, -br.height() / 2.0);
+ m.scale(endArrowWidth / br.width(), endArrowWidth / br.width());
+ endArrow.map(m);
+ refP = m.map(refP);
+ QTransform m2;
+ FPoint grOffset2(getMinClipF(&endArrow));
+ m2.translate(-grOffset2.x(), -grOffset2.y());
+ endArrow.map(m2);
+ refP = m2.map(refP);
+ endArrow.translate(-refP.x(), -refP.y());
+ QTransform arrowTrans;
+ arrowTrans.translate(-m_Doc->currentPage()->xOffset(),
-m_Doc->currentPage()->yOffset());
+ arrowTrans.translate(endPoint.x() + ite->xPos(), endPoint.y() +
ite->yPos());
+ endArrow.map(arrowTrans);
+ int zE = m_Doc->itemAdd(PageItem::Polygon,
PageItem::Unspecified, baseX, baseY, 10, 10, 0, obState.currColorStroke,
CommonStrings::None);
+ iteS = m_Doc->Items->at(zE);
+ iteS->PoLine = endArrow.copy();
+ iteS->ClipEdited = true;
+ iteS->FrameType = 3;
+ FPoint wh = getMaxClipF(&iteS->PoLine);
+ iteS->setWidthHeight(wh.x(), wh.y());
+ m_Doc->adjustItemSize(iteS, true);
+ iteS->setFillEvenOdd(false);
+ iteS->OldB2 = iteS->width();
+ iteS->OldH2 = iteS->height();
+ iteS->updateClip();
+ iteS->OwnPage = m_Doc->OnPage(iteS);
+ iteS->setFillTransparency(obState.strokeOpacity);
+ m_Doc->Items->removeLast();
+ break;
+ }
+
return iteS;
}
Modified:
branches/Version15x/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24932&path=/branches/Version15x/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- branches/Version15x/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
(original)
+++ branches/Version15x/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
Wed Feb 9 20:52:05 2022
@@ -3644,107 +3644,113 @@
void RawPainter::applyArrows(PageItem* ite)
{
- if (m_style["draw:marker-end-path"])
- {
- FPointArray EndArrow;
- double EndArrowWidth;
- QString params =
QString(m_style["draw:marker-end-path"]->getStr().cstr());
- EndArrowWidth = m_lineWidth;
- EndArrow.resize(0);
- EndArrow.svgInit();
- EndArrow.parseSVG(params);
- QPainterPath pa = EndArrow.toQPainterPath(true);
- QRectF br = pa.boundingRect();
- if (m_style["draw:marker-end-width"])
- EndArrowWidth =
valueAsPoint(m_style["draw:marker-end-width"]);
- if (EndArrowWidth > 0)
- {
- FPoint End = ite->PoLine.point(ite->PoLine.size()-2);
- for (uint xx = ite->PoLine.size()-1; xx > 0; xx -= 2)
- {
- FPoint Vector = ite->PoLine.point(xx);
- if ((End.x() != Vector.x()) || (End.y() !=
Vector.y()))
- {
- double r =
atan2(End.y()-Vector.y(),End.x()-Vector.x())*(180.0/M_PI);
- QPointF refP = QPointF(br.width() /
2.0, 0);
- QTransform m;
- m.translate(br.width() / 2.0,
br.height() / 2.0);
- m.rotate(r + 90);
- m.translate(-br.width() / 2.0,
-br.height() / 2.0);
- m.scale(EndArrowWidth / br.width(),
EndArrowWidth / br.width());
- EndArrow.map(m);
- refP = m.map(refP);
- QPainterPath pa2 =
EndArrow.toQPainterPath(true);
- //QRectF br2 = pa2.boundingRect();
- QTransform m2;
- FPoint
grOffset2(getMinClipF(&EndArrow));
- m2.translate(-grOffset2.x(),
-grOffset2.y());
- EndArrow.map(m2);
- refP = m2.map(refP);
- EndArrow.translate(-refP.x(),
-refP.y());
- QTransform arrowTrans;
-
arrowTrans.translate(-m_Doc->currentPage()->xOffset(),
-m_Doc->currentPage()->yOffset());
- arrowTrans.translate(End.x() +
ite->xPos(), End.y() + ite->yPos());
- EndArrow.map(arrowTrans);
- int zE =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, m_baseX, m_baseY, 10,
10, 0, m_currColorStroke, CommonStrings::None);
- PageItem *iteE = m_Doc->Items->at(zE);
- iteE->PoLine = EndArrow.copy();
- finishItem(iteE);
- break;
- }
- }
- }
- }
- if (m_style["draw:marker-start-path"])
- {
- FPointArray EndArrow;
- double EndArrowWidth;
- QString params =
QString(m_style["draw:marker-start-path"]->getStr().cstr());
- EndArrowWidth = m_lineWidth;
- EndArrow.resize(0);
- EndArrow.svgInit();
- EndArrow.parseSVG(params);
- QPainterPath pa = EndArrow.toQPainterPath(true);
- QRectF br = pa.boundingRect();
- if (m_style["draw:marker-start-width"])
- EndArrowWidth =
valueAsPoint(m_style["draw:marker-start-width"]);
- if (EndArrowWidth > 0)
- {
- FPoint Start = ite->PoLine.point(0);
- for (int xx = 1; xx < ite->PoLine.size(); xx += 2)
- {
- FPoint Vector = ite->PoLine.point(xx);
- if ((Start.x() != Vector.x()) || (Start.y() !=
Vector.y()))
- {
- double r =
atan2(Start.y()-Vector.y(),Start.x()-Vector.x())*(180.0/M_PI);
- QPointF refP = QPointF(br.width() /
2.0, 0);
- QTransform m;
- m.translate(br.width() / 2.0,
br.height() / 2.0);
- m.rotate(r + 90);
- m.translate(-br.width() / 2.0,
-br.height() / 2.0);
- m.scale(EndArrowWidth / br.width(),
EndArrowWidth / br.width());
- EndArrow.map(m);
- refP = m.map(refP);
- QPainterPath pa2 =
EndArrow.toQPainterPath(true);
- //QRectF br2 = pa2.boundingRect();
- QTransform m2;
- FPoint
grOffset2(getMinClipF(&EndArrow));
- m2.translate(-grOffset2.x(),
-grOffset2.y());
- EndArrow.map(m2);
- refP = m2.map(refP);
- EndArrow.translate(-refP.x(),
-refP.y());
- QTransform arrowTrans;
-
arrowTrans.translate(-m_Doc->currentPage()->xOffset(),
-m_Doc->currentPage()->yOffset());
- arrowTrans.translate(Start.x() +
ite->xPos(), Start.y() + ite->yPos());
- EndArrow.map(arrowTrans);
- int zS =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, m_baseX, m_baseY, 10,
10, 0, m_currColorStroke, CommonStrings::None);
- PageItem *iteS = m_Doc->Items->at(zS);
- iteS->PoLine = EndArrow.copy();
- finishItem(iteS);
- break;
- }
- }
- }
+ applyStartArrow(ite);
+ applyEndArrow(ite);
+}
+
+void RawPainter::applyStartArrow(PageItem* ite)
+{
+ if (!m_style["draw:marker-start-path"])
+ return;
+
+ FPointArray startArrow;
+ double startArrowWidth;
+ QString params =
QString(m_style["draw:marker-start-path"]->getStr().cstr());
+ startArrowWidth = m_lineWidth;
+ startArrow.resize(0);
+ startArrow.svgInit();
+ startArrow.parseSVG(params);
+ QPainterPath pa = startArrow.toQPainterPath(true);
+ QRectF br = pa.boundingRect();
+ if (m_style["draw:marker-start-width"])
+ startArrowWidth =
valueAsPoint(m_style["draw:marker-start-width"]);
+ if (startArrowWidth <= 0)
+ return;
+
+ FPoint startPoint = ite->PoLine.point(0);
+ for (int xx = 1; xx < ite->PoLine.size(); xx += 2)
+ {
+ FPoint point = ite->PoLine.point(xx);
+ if ((startPoint.x() == point.x()) && (startPoint.y() ==
point.y()))
+ continue;
+
+ double r = atan2(startPoint.y() - point.y(), startPoint.x() -
point.x()) * (180.0 / M_PI);
+ QPointF refP = QPointF(br.width() / 2.0, 0);
+ QTransform m;
+ m.translate(br.width() / 2.0, br.height() / 2.0);
+ m.rotate(r + 90);
+ m.translate(-br.width() / 2.0, -br.height() / 2.0);
+ m.scale(startArrowWidth / br.width(), startArrowWidth /
br.width());
+ startArrow.map(m);
+ refP = m.map(refP);
+ QTransform m2;
+ FPoint grOffset2(getMinClipF(&startArrow));
+ m2.translate(-grOffset2.x(), -grOffset2.y());
+ startArrow.map(m2);
+ refP = m2.map(refP);
+ startArrow.translate(-refP.x(), -refP.y());
+ QTransform arrowTrans;
+ arrowTrans.translate(-m_Doc->currentPage()->xOffset(),
-m_Doc->currentPage()->yOffset());
+ arrowTrans.translate(startPoint.x() + ite->xPos(),
startPoint.y() + ite->yPos());
+ startArrow.map(arrowTrans);
+ int zS = m_Doc->itemAdd(PageItem::Polygon,
PageItem::Unspecified, m_baseX, m_baseY, 10, 10, 0, m_currColorStroke,
CommonStrings::None);
+ PageItem *iteS = m_Doc->Items->at(zS);
+ iteS->PoLine = startArrow.copy();
+ finishItem(iteS);
+ break;
+ }
+}
+
+void RawPainter::applyEndArrow(PageItem* ite)
+{
+ if (!m_style["draw:marker-end-path"])
+ return;
+
+ FPointArray endArrow;
+ double endArrowWidth;
+ QString params =
QString(m_style["draw:marker-end-path"]->getStr().cstr());
+ endArrowWidth = m_lineWidth;
+ endArrow.resize(0);
+ endArrow.svgInit();
+ endArrow.parseSVG(params);
+ QPainterPath pa = endArrow.toQPainterPath(true);
+ QRectF br = pa.boundingRect();
+ if (m_style["draw:marker-end-width"])
+ endArrowWidth = valueAsPoint(m_style["draw:marker-end-width"]);
+ if (endArrowWidth <= 0)
+ return;
+
+ FPoint endPoint = ite->PoLine.point(ite->PoLine.size()-2);
+ for (int xx = ite->PoLine.size() - 1; xx > 0; xx -= 2)
+ {
+ FPoint point = ite->PoLine.point(xx);
+ if ((endPoint.x() == point.x()) && (endPoint.y() == point.y()))
+ return;
+
+ double r = atan2(endPoint.y() - point.y(), endPoint.x() -
point.x()) * (180.0 / M_PI);
+ QPointF refP = QPointF(br.width() / 2.0, 0);
+ QTransform m;
+ m.translate(br.width() / 2.0, br.height() / 2.0);
+ m.rotate(r + 90);
+ m.translate(-br.width() / 2.0, -br.height() / 2.0);
+ m.scale(endArrowWidth / br.width(), endArrowWidth / br.width());
+ endArrow.map(m);
+ refP = m.map(refP);
+ QTransform m2;
+ FPoint grOffset2(getMinClipF(&endArrow));
+ m2.translate(-grOffset2.x(), -grOffset2.y());
+ endArrow.map(m2);
+ refP = m2.map(refP);
+ endArrow.translate(-refP.x(), -refP.y());
+ QTransform arrowTrans;
+ arrowTrans.translate(-m_Doc->currentPage()->xOffset(),
-m_Doc->currentPage()->yOffset());
+ arrowTrans.translate(endPoint.x() + ite->xPos(), endPoint.y() +
ite->yPos());
+ endArrow.map(arrowTrans);
+ int zE = m_Doc->itemAdd(PageItem::Polygon,
PageItem::Unspecified, m_baseX, m_baseY, 10, 10, 0, m_currColorStroke,
CommonStrings::None);
+ PageItem *iteE = m_Doc->Items->at(zE);
+ iteE->PoLine = endArrow.copy();
+ finishItem(iteE);
+ break;
}
}
Modified:
branches/Version15x/Scribus/scribus/plugins/import/revenge/rawpainter.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24932&path=/branches/Version15x/Scribus/scribus/plugins/import/revenge/rawpainter.h
==============================================================================
--- branches/Version15x/Scribus/scribus/plugins/import/revenge/rawpainter.h
(original)
+++ branches/Version15x/Scribus/scribus/plugins/import/revenge/rawpainter.h
Wed Feb 9 20:52:05 2022
@@ -106,6 +106,8 @@
void applyFlip(PageItem* ite);
void recolorItem(PageItem* ite, const QString& efVal);
void applyArrows(PageItem* ite);
+ void applyStartArrow(PageItem* ite);
+ void applyEndArrow(PageItem* ite);
void finishItem(PageItem* ite);
private:
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
